Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppMonitoringObject/AppMonitoringObject.vue

@@ -4,7 +4,7 @@
       <AiTopFixed>
         <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bar-width="150" @change="change"></u-tabs>
         <div class="search-obj">
-          <div class="selectBox" @click="showType = true" v-if="currentTabs == 0">
+          <div class="selectBox" @click="showType = true">
             <span v-if="!status">全部类型</span>
             <span v-else>{{ $dict.getLabel('fpPrtpStatus', status)}}</span>
             <u-icon name="arrow-down"></u-icon>
@@ -112,6 +112,8 @@ export default {
     confirmTypeSelect(val) {
       this.status = val?.[0].value
       this.$nextTick(()=>{
+        this.current = 1,
+        this.list = []
         this.getList()
       })
     },
@@ -146,8 +148,16 @@ export default {
 
     change(index) {
       this.currentTabs = index
+      if(this.currentTabs == 1) {
+        this.typelist = this.$dict.getDict('fpPrtpStatus')
+        this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
+      } else if (this.currentTabs == 0) {
+        this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
+        this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
+      }
       this.status = ''
       this.getListInit()
+      
     },
 
     toDetail(item) {