Merge branch 'nhkd-web' into web-zhanHui

src/layout/components/AppMain.vue

@@ -99,23 +99,23 @@ export default {
         password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
-        console.log("连接成功");
+        // console.log("连接成功");
         this.client.subscribe(this.mtopic, (err) => {
           if (!err) {
-            console.log("警报通道订阅成功:" + this.mtopic);
+            // console.log("警报通道订阅成功:" + this.mtopic);
           }
         });
         this.client.subscribe(this.mtopicTwo, (err) => {
           if (!err) {
-            console.log("工作通道订阅成功:" + this.mtopicTwo);
+            // console.log("工作通道订阅成功:" + this.mtopicTwo);
           }
         });
       });
       this.client.on("message", (topic, message) => {
         if (message){
-          console.log("topic",topic);
+          // console.log("topic",topic);
           let data = JSON.parse(message)
-          console.log("data",data);
+          // console.log("data",data);
           if(topic == this.mtopic){
             //报警
             store.dispatch('settings/setPlanData', data)
@@ -123,7 +123,7 @@ export default {
           }
           if(topic == this.mtopicTwo){
             //工作通知
-            console.log("工作通知",data);
+            // console.log("工作通知",data);
             this.textWork = data.msg;
             this.workType = data.type;
           }

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -171,6 +171,7 @@
                     <img src="@/assets/ZDimages/subject/lvqi.png" v-if="item.funNum == 'lvqi'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
+                    <img src="@/assets/ZDimages/subject/yique.png" v-if="item.funNum == 'c2h2'">
                     <div>
                       <el-tooltip class="item" effect="dark" :content="item.describe" placement="bottom">
                         <p>{{item.describe|ellipsis}}</p>
@@ -619,7 +620,7 @@ export default {
     //报警器开启关闭方法
     changeIsNeedCaptchaAlarm(row){
       let self = this;
-      console.log(row.status)
+      // console.log(row.status)
       if(row.status!=3 && row.status!=4){
         return
       }
@@ -723,7 +724,7 @@ export default {
       let self = this;
       let type = 0; //硬件 //0全部
       subjectInfo(row.id,type).then(response => {
-        console.log(response.data)
+        // console.log(response.data)
         this.$set(this,'subjectData',response.data)
         this.pageType = 2;
       })
@@ -848,7 +849,7 @@ export default {
     // 开启关闭验证
     async changeIsNeedCaptcha (row) {
       let self = this;
-      console.log(row)
+      // console.log(row)
       if(row.state.code!=3 && row.state.code!=4){
         return
       }
@@ -1049,23 +1050,23 @@ export default {
     handleCommand(command, row){
       switch (command) {
         case "1":
-          console.log('关联配置');
+          // console.log('关联配置');
           this.clickPage(6,row);
           break;
         case "2":
-          console.log('物联配置');
+          // console.log('物联配置');
           this.clickPage(4,row);
           break;
         case "3":
-          console.log('准入配置');
+          // console.log('准入配置');
           this.clickPage(5,row);
           break;
         case "4":
-          console.log('编辑');
+          // console.log('编辑');
           this.clickPage(3,row);
           break;
         case "5":
-          console.log('删除');
+          // console.log('删除');
           break;
         default:
           break;
@@ -1152,15 +1153,15 @@ export default {
         password:localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
-        console.log("连接成功");
+        // 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);
           }
         });
       });
@@ -1193,7 +1194,7 @@ export default {
             }
           }else{
             //硬件
-             console.log("硬件",data);
+            //  console.log("硬件",data);
             for (let i = 0; i < data.data.length; i++) {
               if (self.checkedSubject.VOlist) {
                 for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
@@ -1290,7 +1291,7 @@ export default {
         );
         self.videoList.push(obj);
         // }
-        console.log("i",i)
+        // console.log("i",i)
       }
 
       for(let i=0;i<self.videoList.length;i++){
@@ -1321,7 +1322,7 @@ export default {
     getListClassifiedAll(){
       listClassifiedAll().then(response=>{
         if(response.code==200){
-          console.log(response)
+          // console.log(response)
           this.levelList=response.data
         }
       })
@@ -1349,7 +1350,7 @@ export default {
     },
     beforeAvatarUpload(file) {
       let type = false;
-      console.log('file',file);
+      // console.log('file',file);
       if (file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' || file.type == 'application/vnd.ms-excel') {
         if(file.size> 5250000){
           this.msgError('上传大小不能超过5M')
@@ -1379,7 +1380,7 @@ export default {
         this.download('/laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
       }else if(item.command == 2){
         //  导入数据
-        console.log('导入数据');
+        // console.log('导入数据');
         this.importOpen = true;
       }
     },

src/views/comprehensive/laboratoryManagement/subject/indexOne.vue

@@ -814,15 +814,15 @@ export default {
         password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
-        console.log("连接成功");
+        // 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);
           }
         });
       });

src/views/comprehensive/laboratoryManagement/subject/indexTwo.vue

@@ -838,15 +838,15 @@ export default {
         password: localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
-        console.log("连接成功");
+        // 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++){

src/views/emergencyEvacuationBig.vue

@@ -313,10 +313,10 @@
           password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
-          console.log("连接成功");
+          // 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();

src/views/emergencyEvacuationBigOne.vue

@@ -314,10 +314,10 @@
           password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
-          console.log("连接成功");
+          // 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();
@@ -359,7 +359,7 @@
             this.getDeviceList();
           }else{
             if(localStorage.getItem('evacuationSubId')){
-              console.log("1=================>")
+              // console.log("1=================>")
               this.subId = localStorage.getItem('evacuationSubId');
               this.title = localStorage.getItem('evacuationTitel');
               this.buttonId = localStorage.getItem('evacuationButtonId');
@@ -389,7 +389,7 @@
         let self = this;
         let id = this.buildingId;
         lablayout(id).then(response => {
-          console.log("response.dataresponse.dataresponse.dataresponse.data",response.data)
+          // console.log("response.dataresponse.dataresponse.dataresponse.data",response.data)
           for(let i=0;i<response.data.length;i++){
             if(response.data[i].id == this.buttonId){
               self.fjList = response.data[i].list;

src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -443,11 +443,11 @@
           password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
-          console.log("连接成功");
+          // console.log("连接成功");
           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]);
               }
             });
           }

src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -439,11 +439,11 @@
           password: localStorage.getItem('mqttPassword')
         });
         this.client.on("connect", e =>{
-          console.log("连接成功");
+          // console.log("连接成功");
           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]);
               }
             });
           }

src/views/medicUniversity-3_1/chemicalManagement/chemicalInventory/index.vue

@@ -192,5 +192,6 @@
         padding:20px;
       }
     }
+
   }
 </style>

src/views/newEvacuationBigData.vue

@@ -2234,6 +2234,8 @@
           huoyan_yc : require('@/assets/ZDimages/bigData3_2/icon_zdmh_hyjc_yc.png'),
           hwcw_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw.png'),
           hwcw_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw_yc.png'),
+          yique_zc : require('@/assets/ZDimages/bigData3_2/yique_zc.png'),
+          yique_yc : require('@/assets/ZDimages/bigData3_2/yique_yc.png'),
           nullClass : require('@/assets/ZDimages/evacuation3_2/icon_znwl_sybz.png'),
           });
         }
@@ -2340,6 +2342,10 @@
               obj.zcImg = this.sensorIconData.hwcw_zc;
               obj.ycImg = this.sensorIconData.hwcw_yc;
               break;
+            case 'c2h2':
+              obj.zcImg = this.sensorIconData.yique_zc;
+              obj.ycImg = this.sensorIconData.yique_yc;
+              break;
             default:
               obj.zcImg = this.sensorIconData.nullClass;
               obj.ycImg = this.sensorIconData.nullClass;

src/views/safetyEducationExam/trainingCourse/addDialog.vue

@@ -92,7 +92,7 @@
         </el-form-item>
         <p class="inquire-button-one"
            style="margin-left:20px;width:140px;border-radius:4px;" @click="subTypeClick">
-          {{dialogForm.selectType==1?'手动输入上课场所':(dialogForm.selectType==2?'选择学校':'')}}
+          {{dialogForm.selectType==1?'手动输入上课场所':(dialogForm.selectType==2?'选择实验室':'')}}
         </p>
       </div>
       <div class="dialogFormFlex">
@@ -292,7 +292,7 @@
           position:"",
           selectType:1,
           content:"",
-          courseTime:["00:00","00:00"],
+          courseTime:["00:00","23:00"],
           courseDate:[],
         },
         //验证