Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/components/TabBar.vue

@@ -3,9 +3,8 @@
     <van-tabbar v-model="active" @change="onChange">
       <van-tabbar-item
         v-for="(item,index) in tabBarList"
-        :key="item.key"
-        :icon="active == index?item.imgUrlActive: item.imgUrl"
-        :to="item.path"
+        :key="index"
+        :icon="active==item.name?item.imgUrlActive: item.imgUrl"
         >{{ item.text }}</van-tabbar-item
       >
     </van-tabbar>
@@ -54,15 +53,18 @@ export default {
   },
   mounted() {
     this.active = this.index
-    this.tabBarList.forEach((item)=>{
-        if(item.name==this.active){
-            this.$router.push(item.path)
-        }
-    })
   },
   methods: {
     onChange(index) {
       this.active = index;
+      if(this.active==index){
+            this.tabBarList.forEach((item)=>{
+                if(item.name==this.active){
+                    this.$router.push(item.path)
+                }
+            })
+      }else{
+      }
     }
   }
 };

src/views/checked/index.vue

@@ -29,16 +29,19 @@
             <div>检查地点：{{item.address}}</div>
             <div>是否提交：{{item.finish?'已提交':'未提交'}}</div>
         </div>
+        <tab-bar :index="1"></tab-bar>
     </div>
 </template>
 
 <script>
+import tabBar from "@/components/TabBar";
 import LHeader from '@/components/header.vue'
 import { getFun,postFun } from '@/service/table'
 export default {
     name: 'checked',
     components: {
-        "LHeader":LHeader
+        "LHeader":LHeader,
+        "tabBar":tabBar
     },
     data() {
         return {

src/views/checked/problem/index.vue

@@ -19,9 +19,9 @@
             <div>检查地点：{{nums.address}}</div>
         </div>
         <div class="button-more">
-            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">检查问题上报{{nums.addTroubleNumber}}</van-button>
-            <van-button type="primary" round size="large" @click="formwork">检查清单模板{{nums.listNumber}}</van-button>
-            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{nums.troubleNumber}}</van-button>
+            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">检查问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>
+            <van-button type="primary" round size="large" @click="formwork">检查清单模板{{'('+nums.listNumber+')'}}</van-button>
+            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{'('+nums.troubleNumber+')'}}</van-button>
             <van-button type="primary" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>
         </div>
     </div>