dedsudiyu 4 月之前
父節點
當前提交
eedddec167
共有 3 個文件被更改,包括 16 次插入13 次删除
  1. 1 1
      manifest.json
  2. 6 4
      pages_manage/emergencyEvacuationBig.vue
  3. 9 8
      pages_safetyExamine/inforSign.vue

+ 1 - 1
manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx0cbc02ca7f6e7f25",
+        "appid" : "wx12ad6016ed6b001d",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

+ 6 - 4
pages_manage/emergencyEvacuationBig.vue

@@ -1056,7 +1056,7 @@ export default {
 	    this.$set(this,'conductCountdown',null);
 	  }
       this.firedeviceStatus();
-
+	  this.getRedisEvacuation();
     },
     //执行疏散
     async lineEvacuate() {
@@ -1143,12 +1143,13 @@ export default {
           this.$set(this, 'mapList', JSON.parse(JSON.stringify(list)));
           // this.$set(this, 'shadeMapList', JSON.parse(JSON.stringify(list)));
           this.$set(this, 'mapType', true);
-          setTimeout(function() {
-            self.getRedisEvacuation();
-          }, 500);
+         
           this.selectTriggerInfo(3);
 
         }
+		setTimeout(function() {
+		  self.getRedisEvacuation();
+		}, 500);
       }
     },
     //获取疏散数据
@@ -1162,6 +1163,7 @@ export default {
         data
       } = await getRedisEvacuation(obj)
       if (data.code == 200) {
+		  console.log('疏散数据',data.data)
         if (data.data.doorPointNames) {
           for (let o = 0; o < self.mapList.length; o++) {
             if (self.mapList[o].type == 2) {

+ 9 - 8
pages_safetyExamine/inforSign.vue

@@ -40,9 +40,9 @@
 			<view class="title">{{item.classifyName}}</view>
 			<view class="telephone_li" v-for="(item3,index3) in item.privateList" :key="index3">{{item3.infoContent}}</view>
 		</view>
-		
+
 	</scroll-view>
-	<view  class="bottom_btn" @click="handleClick('start')">开展检查</view>
+	<view  v-if="!rectifyGentle" class="bottom_btn" @click="handleClick('start')">开展检查</view>
   </view>
 
 </template>
@@ -53,10 +53,11 @@ import { getSelectInfoByRoom,getInforSign} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
-   
+
   },
   data() {
     return {
+    rectifyGentle:uni.getStorageSync('gentleIdentifierData').rectifyGentle,
 		baseUrl:config.base_url,
 		pageType:2,
 		id:'',
@@ -69,7 +70,7 @@ export default {
 	 }
   },
   onShow() {
-	  
+
   },
   mounted(){
 	  this.getInforSign()
@@ -153,7 +154,7 @@ export default {
 			justify-content: flex-start;
 			align-items: center;
 			margin-right: 26rpx;
-			
+
 			>text:nth-of-type(1){
 				font-size: 24rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
@@ -243,7 +244,7 @@ export default {
 				}
 			}
 		}
-		
+
 	}
 	.category{
 		width: 690rpx;
@@ -312,7 +313,7 @@ export default {
 		}
 	}
 	/* 待整改 */
-		
+
     .bottom_btn{
 		position: fixed;
 		bottom: 26rpx;
@@ -327,7 +328,7 @@ export default {
 		background: #0183FA;
 		border-radius: 20rpx;
 		text-align: center;
-		
+
 	}
 }
 </style>