dedsudiyu пре 1 година
родитељ
комит
438f6e63fe

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -1041,12 +1041,12 @@ export default {
         console.log("连接成功");
         this.client.subscribe(this.mtopic+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopic+self.subId);
+            // console.log("订阅成功:" + this.mtopic+self.subId);
           }
         });
         this.client.subscribe(this.mtopicOne+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopicOne+self.subId);
+            // console.log("订阅成功:" + this.mtopicOne+self.subId);
           }
         });
         // for(let i = 0; i< self.mqttIdList.length;i++){

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/indexOne.vue

@@ -815,12 +815,12 @@ export default {
         console.log("连接成功");
         this.client.subscribe(this.mtopic+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopic+self.subId);
+            // console.log("订阅成功:" + this.mtopic+self.subId);
           }
         });
         this.client.subscribe(this.mtopicOne+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopicOne+self.subId);
+            // console.log("订阅成功:" + this.mtopicOne+self.subId);
           }
         });
         // for(let i = 0; i< self.mqttIdList.length;i++){

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/indexTwo.vue

@@ -839,12 +839,12 @@ export default {
         console.log("连接成功");
         this.client.subscribe(this.mtopic+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopic+self.subId);
+            // console.log("订阅成功:" + this.mtopic+self.subId);
           }
         });
         this.client.subscribe(this.mtopicOne+self.subId, (err) => {
           if (!err) {
-            console.log("订阅成功:" + this.mtopicOne+self.subId);
+            // console.log("订阅成功:" + this.mtopicOne+self.subId);
           }
         });
         // for(let i = 0; i< self.mqttIdList.length;i++){

+ 7 - 5
src/views/comprehensive/message/addContent/index.vue

@@ -208,11 +208,13 @@
         listDepartments(){
           listDepartments().then(response => {
             let list = response.data;
-            let obj = {
-              deptName:"全部学院",
-              deptId:"allMax"
-            };
-            list.unshift(obj)
+            if(localStorage.getItem('tenantId') == 0){
+              let obj = {
+                deptName:"全部学院",
+                deptId:"allMax"
+              };
+              list.unshift(obj)
+            }
             this.listDepartmentsList = list;
           });
         },

+ 2 - 2
src/views/emergencyEvacuationBig.vue

@@ -316,7 +316,7 @@
           console.log("连接成功");
           this.client.subscribe(this.mtopic, (err) => {
             if (!err) {
-              console.log("订阅成功:" + this.mtopic);
+              // console.log("订阅成功:" + this.mtopic);
             }
           });
         });
@@ -324,7 +324,7 @@
           if (message){
             let data = JSON.parse(message)
             if(topic == this.mtopic){
-              console.log("应急疏散数据变更",data);
+              // console.log("应急疏散数据变更",data);
               //应急疏散数据变更
               if(data.data.EXIT_LINE_MESSAGE){
                 this.evacuate();

+ 2 - 2
src/views/emergencyEvacuationBigOne.vue

@@ -317,7 +317,7 @@
           console.log("连接成功");
           this.client.subscribe(this.mtopic, (err) => {
             if (!err) {
-              console.log("订阅成功:" + this.mtopic);
+              // console.log("订阅成功:" + this.mtopic);
             }
           });
         });
@@ -325,7 +325,7 @@
           if (message){
             let data = JSON.parse(message)
             if(topic == this.mtopic){
-              console.log("应急疏散数据变更",data);
+              // console.log("应急疏散数据变更",data);
               //应急疏散数据变更
               if(data.data.EXIT_LINE_MESSAGE){
                 this.evacuate();

+ 1 - 1
src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -447,7 +447,7 @@
           for(let i=0;i<self.mqttIdList.length;i++){
             this.client.subscribe(this.mtopic+self.mqttIdList[i], (err) => {
               if (!err) {
-                console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
+                // console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
               }
             });
           }

+ 1 - 1
src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -443,7 +443,7 @@
           for(let i=0;i<self.mqttIdList.length;i++){
             this.client.subscribe(this.mtopic+self.mqttIdList[i], (err) => {
               if (!err) {
-                console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
+                // console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
               }
             });
           }

+ 9 - 9
src/views/newEvacuationBigData.vue

@@ -1912,7 +1912,7 @@
           console.log("连接成功");
           this.allClient.subscribe(self.planTopic, (err) => {
             if (!err) {
-              console.log("预案-订阅成功:" + self.planTopic);
+              // console.log("预案-订阅成功:" + self.planTopic);
             }
           });
         });
@@ -1940,19 +1940,19 @@
           console.log("连接成功");
           this.floorClient.subscribe(self.messageTopic+self.floorId, (err) => {
             if (!err) {
-              console.log("消息订阅成功:" + self.messageTopic+self.floorId);
+              // console.log("消息订阅成功:" + self.messageTopic+self.floorId);
             }
           });
         });
         this.floorClient.subscribe(self.evacuationTopic+self.floorId, (err) => {
           if (!err) {
-            console.log("疏散-订阅成功:" + self.evacuationTopic+self.floorId);
+            // console.log("疏散-订阅成功:" + self.evacuationTopic+self.floorId);
             self.getRedisEvacuation();
           }
         });
         this.floorClient.subscribe(self.userTopic+self.floorId, (err) => {
           if (!err) {
-            console.log("实验室人数-订阅成功:" + self.userTopic+self.floorId);
+            // console.log("实验室人数-订阅成功:" + self.userTopic+self.floorId);
           }
         });
         this.floorClient.on("message", (topic, message) => {
@@ -1994,12 +1994,12 @@
           console.log("连接成功");
           this.subClient.subscribe(self.sensorTopic+self.subId, (err) => {
             if (!err) {
-              console.log("传感器-订阅成功:" + self.sensorTopic+self.subId);
+              // console.log("传感器-订阅成功:" + self.sensorTopic+self.subId);
             }
           });
           this.subClient.subscribe(self.switchTopic+self.subId, (err) => {
             if (!err) {
-              console.log("设备-订阅成功:" + self.switchTopic+self.subId);
+              // console.log("设备-订阅成功:" + self.switchTopic+self.subId);
             }
           });
         });
@@ -2047,17 +2047,17 @@
             console.log("连接成功");
             this.fireClient.subscribe(self.fireTopic+self.fireCode, (err) => {
               if (!err) {
-                console.log("火灾传感器状态-订阅成功:" + self.fireTopic+self.fireCode);
+                // console.log("火灾传感器状态-订阅成功:" + self.fireTopic+self.fireCode);
               }
             });
             this.fireClient.subscribe(self.fireOnlineTopic+self.fireCode, (err) => {
               if (!err) {
-                console.log("火灾设备是否在线-订阅成功:" + self.fireOnlineTopic+self.fireCode);
+                // console.log("火灾设备是否在线-订阅成功:" + self.fireOnlineTopic+self.fireCode);
               }
             });
             this.fireClient.subscribe(self.firePerformTopic+self.fireCode, (err) => {
               if (!err) {
-                console.log("火灾是否正在执行灭火操作-订阅成功:" + self.firePerformTopic+self.fireCode);
+                // console.log("火灾是否正在执行灭火操作-订阅成功:" + self.firePerformTopic+self.fireCode);
               }
             });
           });

+ 2 - 2
src/views/newEvacuationBigDataHome.vue

@@ -1105,7 +1105,7 @@
           console.log("连接成功");
           this.allClient.subscribe(self.planTopic, (err) => {
             if (!err) {
-              console.log("预案-订阅成功:" + self.planTopic);
+              // console.log("预案-订阅成功:" + self.planTopic);
             }
           });
         });
@@ -1132,7 +1132,7 @@
         });
         this.buildingClient.subscribe(self.userTopic+self.buildingId, (err) => {
           if (!err) {
-            console.log("实验室人数-订阅成功:" + self.userTopic+self.buildingId);
+            // console.log("实验室人数-订阅成功:" + self.userTopic+self.buildingId);
           }
         });
         this.buildingClient.on("message", (topic, message) => {