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

src/views/danger/dangerPatrol/index.vue

@@ -11,11 +11,11 @@
                 <div @click="onSearch" >搜索</div>
             </template>
         </van-search>
-        <van-cell-group inset v-if="finalDangerList.length > 0">
+        <van-cell-group inset v-if="dangerList.length > 0">
             <van-grid :column-num="4">
                 <van-grid-item
                     @click="dangerJump(item.path)"
-                    v-for="item in finalDangerList"
+                    v-for="item in dangerList"
                     :key="item.key"
                     :icon="item.imgUrl"
                     :text="item.text"
@@ -60,6 +60,7 @@ export default {
         return {
             text: "隐患巡查",
             finalDangerList:[],
+            value:"",
             dangerList:[
                 {
                     key: "1",
@@ -86,7 +87,7 @@ export default {
                     path: "/approval-patrol",
                 },
                 {
-                    key: "4",
+                    key: "5",
                     imgUrl: require("@/assets/workbench/danger-acceptance.png"),
                     text: "巡查统计",
                     path: "/statistics",
@@ -143,7 +144,7 @@ export default {
     },
     created() {
         //  根据权限显示对应的图标
-        this.getWorkList();
+        // this.getWorkList();
     },
     mounted() {},
     methods: {

src/views/danger/dangerPatrol/recordPatrol/index.vue

@@ -14,7 +14,7 @@
             <!-- v-for="(item, index) in messageList"
         :key="index"
             @click="touchstart(index, item)"-->
-            <van-cell-group inset>
+            <van-cell-group inset @click="touchstart"> 
                 <van-row gutte>
                     <van-col span="12">
                         <span class="record-time">2022年4月8日</span>
@@ -36,9 +36,9 @@
                 </van-row>
                 <!-- 长按显示遮罩层 -->
                 <!-- :show="showIndex == index" -->
-                <van-overlay :show="true">
+                <van-overlay :show="showIndex">
                     <div class="wrapper" @click.stop="showIndex = null">
-                        <van-button round type="primary" @click="goDetail(item)">详情</van-button>
+                        <van-button round type="primary" @click="goDetail()">详情</van-button>
                     </div>
                 </van-overlay>
             </van-cell-group>
@@ -90,7 +90,7 @@ export default {
         };
     },
     created() {
-        this.getList();
+        // this.getList();
     },
     methods: {
         getList(select = "") {
@@ -122,11 +122,12 @@ export default {
         },
 
         touchstart(index, item) {
-            if (this.showIndex != null) {
-                this.showIndex = null;
-                return;
-            }
-            this.showIndex = index;
+            // if (this.showIndex != null) {
+            //     this.showIndex = null;
+            //     return;
+            // }
+            // this.showIndex = index;
+            this.showIndex = true
         },
 
         // 详情