zc

api/request/config.js

@@ -9,11 +9,11 @@ const config = {
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
+    base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//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/', //矿大文昌地址
 
 	//视频地址
 	video_url:'https://lab.sxitdlc.com',

component/topWarn.vue

@@ -15,6 +15,7 @@
 				pageType:false,
 				text:"",
 				subjectId:"",
+				buildingId:"",
 				subjectName:"",
 				closePlan:false,
 				closeId:"",
@@ -107,6 +108,7 @@
 			//页面跳转
 			goPage(){
 				let obj = {
+					buildingId:this.buildingId,
 					subId:this.subjectId,
 					text:this.subjectName,
 					type:"1",
@@ -126,9 +128,9 @@
 						num++;
 						self.text = data.data[i].buildName + data.data[i].floorName + data.data[i].roomName + data.data[i].subjectName + '发生应急预案.';
 						self.subjectId = data.data[i].subjectId;
+						self.buildingId = data.data[i].buildId;
 						self.subjectName = data.data[i].subjectName;
 						self.pageType = true;
-						self.subjectId = data.data[i].subjectId;
 						self.closePlan =data.data[i].closePlan;
 						self.closeId = data.data[i].id;
 					  }

pages/emergencyEvacuationBig.vue

@@ -269,6 +269,8 @@
 			if(option.item){
 				let item = JSON.parse(decodeURIComponent(option.item));
 				this.subId = item.subId;
+				this.buildingId = item.buildingId;
+				this.deptId = item.buildingId;
 				this.title = item.title;
 				this.type = item.type;
 				this.evacuateTwo();
@@ -276,13 +278,13 @@
 				//判断入口(首页按钮)
 				this.getRedis();
 			}
-		},
-		onShow(){
 			this.treeselectByUser();
 			this.getAppExitLine();
-			this.lablayout();
 			getApp().watch(this.getMqttLineData,'lineData');
-			this.getCameraByFloor();
+		},
+		onShow(){
+			// this.lablayout();
+			// this.getCameraByFloor();
 		},
 		methods: {
 			//根据账户信息查询学院楼栋数据
@@ -298,6 +300,7 @@
 						list.push(obj);
 						if(i==0&&o==0){
 							this.$set(this,'buildingId',obj.value);
+							this.$set(this,'deptId',obj.value);
 							this.$set(this,'buildingName',obj.label);
 						}
 					}
@@ -353,6 +356,7 @@
 				this.$set(this,'buildingIndex',e.detail.value);
 				this.$set(this,'buildingName',this.buildingList[e.detail.value].label);
 				this.$set(this,'buildingId',this.buildingList[e.detail.value].value);
+				this.$set(this,'deptId',this.buildingList[e.detail.value].value);
 				this.getBuilding(this.buildingList[e.detail.value].value);
 			},
 			//楼层选中
@@ -366,7 +370,6 @@
 			fjListChange(e){
 				this.$set(this,'subName',this.fjListArray[e.detail.value].subjectName);
 				this.$set(this,'subId',this.fjListArray[e.detail.value].subjectId);
-				this.$set(this,'deptId',this.fjListArray[e.detail.value].deptId);
 				this.itemData.name=this.fjListArray[e.detail.value].subjectName
 				this.itemData.floorId=this.fjListArray[e.detail.value].floorId
 				this.itemData.id=this.fjListArray[e.detail.value].id
@@ -648,6 +651,7 @@
 						this.address = data.data.deptName+'-'+data.data.buildName+'-'+data.data.floorName
 						// this.lablayout(data.data.buildId,data.data.floorId);
 						this.evacuate();
+						this.getBuilding(this.buildingId);
 					}else{
 						this.pageType = 1;
 						this.isEvacuate=true;
@@ -718,6 +722,7 @@
 				}
 				this.address = this.buildingName+''+this.floorName
 				this.lineEvacuateTow();
+				this.getCameraByFloor();
 			},
 			/* 2.5获取疏散线路 */
 			async lineEvacuateTow(){