heyang

api/request/config.js

@@ -9,9 +9,9 @@ const config = {
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
     //base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+	//base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
-    //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
+    base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
    // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
    // base_url: 'https://lab.zjznai.com/api/', //暨大化材

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) {