dedsudiyu 2 年之前
父節點
當前提交
7b559ea4a7
共有 2 個文件被更改,包括 25 次插入4 次删除
  1. 2 2
      api/request/config.js
  2. 23 2
      pages/emergencyEvacuationBig.vue

+ 2 - 2
api/request/config.js

@@ -5,7 +5,7 @@ const config = {
      //base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
-    //base_url: 'http://192.168.1.43:9800',//43服务器
+    // base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
@@ -14,7 +14,7 @@ const config = {
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
-     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
+    //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
     base_url: 'https://lab.sxitdlc.com/sudalabSystem/', //苏大临时地址
 }
 export { config }

+ 23 - 2
pages/emergencyEvacuationBig.vue

@@ -356,6 +356,7 @@ export default {
       this.$set(this,'deptId',obj.buildId);
       this.$set(this,'floorId',obj.floorId);
       this.$set(this,'subId',obj.subId);
+      this.$set(this.itemData,'subjectId',obj.subId);
       this.$set(this,'pageType',2);
       this.getBuildingData();
       this.confirmBtn();
@@ -708,6 +709,9 @@ export default {
     },
     async GetStartList(rows) {
       let self = this;
+	  if(!rows[0]){
+		return
+	  }
       let list = "";
       for (let i = 0; i < rows.length; i++) {
         list = list + rows[i] + ","
@@ -952,8 +956,12 @@ export default {
         });
         return
       }
-      this.$set(this,'checkSubName',this.subName.replace('(预案发生) ',""));
-      this.$set(this,'address',this.buildingName.replace('(预案发生) ',"") + '' + this.floorName.replace('(预案发生) ',""));
+	 //  if(this.subName){
+		//   this.$set(this,'checkSubName',this.subName.replace('(预案发生) ',""));
+	 //  }
+	 //  if(this.buildingName){
+		// this.$set(this,'address',this.buildingName.replace('(预案发生) ',"") + '' + this.floorName.replace('(预案发生) ',""));
+	 //  }
       this.$set(this,'pageType',2);
       this.getDeviceList();
       this.laboratoryInfo();
@@ -1036,6 +1044,10 @@ export default {
             if(data.data.buildFloorLayoutVoList[o].loginAdmin){
               subList.push(data.data.buildFloorLayoutVoList[o])
             }
+			if(self.subId == data.data.buildFloorLayoutVoList[o].subId){
+				self.$set(self,'checkSubName',data.data.buildFloorLayoutVoList[o].subName);
+				self.$set(self,'address',data.data.labExitLineVertex.buildName + '' + data.data.labExitLineVertex.floorName);
+			}
           }
           this.$set(this,'fjListArray', subList);
           this.$set(this, 'mapList', JSON.parse(JSON.stringify(list)));
@@ -1375,6 +1387,15 @@ export default {
         this.onMQTT();
       }
     },
+	videoErrorCallback(e){
+	  console.log("播放失败",e);
+	  // uni.showToast({
+	  //     title: '视频播放失败',
+	  //     icon:"none",
+	  //     mask:true,
+	  //     duration: 3000
+	  // });
+	},
   },
   beforeDestroy() {
     this.offMQTT();