zc

api/index.js

@@ -1671,3 +1671,20 @@ export const getDeviceListBySub  = (data) => {
         data: data,
     })
 };
+
+//根据账户查询学院与楼栋
+export const treeselectByUser  = (data) => {
+    return apiResquest({
+        url: `/system/dept/treeselectByUser`,
+        method: 'GET',
+        data: data,
+    })
+};
+
+//根据账户查询学院与楼栋
+export const getBuilding  = (id) => {
+    return apiResquest({
+        url: `/laboratory/building/lablayout?showHazard=false&deptId=`+id,
+        method: 'GET',
+    })
+};

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	// base_url: 'http://192.168.1.9:8080',//柴
+	base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
@@ -12,7 +12,7 @@ const config = {
     // 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/jndxlabSystem/', //暨大地址
 
 	//视频地址
 	video_url:'https://lab.sxitdlc.com',
@@ -21,7 +21,8 @@ const config = {
 	// mqtt_url :'192.168.1.43:1883', //43MQTT
 	// mqtt_url: 'lab.sxitdlc.com/nhmqtt', //矿大MQTT
 	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //矿大MQTT
-	  mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
+	mqtt_url:'ws://192.168.1.43:1884',
+	// mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
     username: 'mqtt',
     password: 'mqtt@zd1883',
 }

component/topWarn.vue

@@ -122,7 +122,7 @@
 				if(data.code == 200){
 					let num = 0;
 					for(let i=0;i<data.data.length;i++){
-					  if(data.data[i].floorId == 5){
+					  if(data.data[i].floorId != 7){
 						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;

pages.json

@@ -114,7 +114,7 @@
 			}
 		},
 		{
-			"path": "pages/emergencyEvacuationBig",//扫码识别
+			"path": "pages/emergencyEvacuationBigOne",//应急疏散
 			"style": {
 				"navigationBarTitleText": "应急疏散"
 			}