zc

src/App.vue

@@ -74,6 +74,11 @@ export default {
           localStorage.setItem('mqttPassword', Decrypt(config.mqttExtranetPassword))
           localStorage.setItem('fileBrowseEnvironment',urlText+Decrypt(config.fileBrowseEnvironmentExtranet))
           localStorage.setItem('fileBrowseEnvironmentExtranet',urlText+Decrypt(config.fileBrowseEnvironmentExtranet))
+          // localStorage.setItem('mqttUrl', 'ws://'+Decrypt(config.mqttIntranetUrl))
+          // localStorage.setItem('mqttUser', Decrypt(config.mqttIntranetUser))
+          // localStorage.setItem('mqttPassword', Decrypt(config.mqttIntranetPassword))
+          // localStorage.setItem('fileBrowseEnvironment',urlText+Decrypt(config.fileBrowseEnvironment))
+          // localStorage.setItem('fileBrowseEnvironmentExtranet',urlText+Decrypt(config.fileBrowseEnvironmentExtranet))
         }else{
           localStorage.setItem('mqttUrl', 'ws://'+Decrypt(config.mqttIntranetUrl))
           localStorage.setItem('mqttUser', Decrypt(config.mqttIntranetUser))
@@ -126,16 +131,33 @@ export default {
     async getTriggerInfo() {
       const res = await getTriggerInfo()
       if (res.code === 200 && res.data && res.data.length) {
-        res.data[0].triggerUploadData = JSON.parse(res.data[0].triggerUploadData)
-        for(let i=0;i<res.data[0].bindingSensorList.length;i++){
-          for(let o=0;o<res.data[0].triggerUploadData.length;o++){
-            if(res.data[0].bindingSensorList[i].code == res.data[0].triggerUploadData[o].code){
-              res.data[0].triggerUploadData[o].max = res.data[0].bindingSensorList[i].max
-              res.data[0].triggerUploadData[o].min = res.data[0].bindingSensorList[i].min
+        let newObj = {};
+        for(let x=0;x<res.data.length;x++){
+          if(res.data[x].bindingSensorList){
+            res.data[x].triggerUploadData = JSON.parse(res.data[x].triggerUploadData);
+            for(let i=0;i<res.data[x].bindingSensorList.length;i++){
+              for(let o=0;o<res.data[x].triggerUploadData.length;o++){
+                if(res.data[x].bindingSensorList[i].code == res.data[x].triggerUploadData[o].code){
+                  res.data[x].triggerUploadData[o].max = res.data[x].bindingSensorList[i].max
+                  res.data[x].triggerUploadData[o].min = res.data[x].bindingSensorList[i].min
+                }
+              }
             }
+            newObj = res.data[x];
+            break
           }
         }
-        this.$set(this,'alarmData', res.data[0]);
+        this.$set(this,'alarmData', newObj);
+        // res.data[0].triggerUploadData = JSON.parse(res.data[0].triggerUploadData)
+        // for(let i=0;i<res.data[0].bindingSensorList.length;i++){
+        //   for(let o=0;o<res.data[0].triggerUploadData.length;o++){
+        //     if(res.data[0].bindingSensorList[i].code == res.data[0].triggerUploadData[o].code){
+        //       res.data[0].triggerUploadData[o].max = res.data[0].bindingSensorList[i].max
+        //       res.data[0].triggerUploadData[o].min = res.data[0].bindingSensorList[i].min
+        //     }
+        //   }
+        // }
+        // this.$set(this,'alarmData', res.data[0]);
         this.$set(this,'showAlarm',true);
       }else{
         this.$set(this,'showAlarm',false);

src/components/alarmWindow/index.vue

@@ -38,6 +38,7 @@ export default {
     emergencyButton(val){
       if(val == 1){
         const e = this.alarmData;
+        console.log('e',e)
         const obj = e.triggerUploadData[0];
         const deviceValue = obj.deviceValue;
         const unit = obj.unit;
@@ -46,7 +47,7 @@ export default {
           building: [e.schoolName, e.buildName, e.floorName].filter(Boolean).join(' · '),
           unit: e.deptName,
           param: e.eventName,
-          value: deviceValue+''+(unit=='-'?'':unit),
+          value: obj.source == 'kunyun'?'--':(deviceValue+''+(unit=='-'?'':unit)),
           person: e.adminName,
           phone: e.adminPhone,
           time: e.eventStartTime ? e.eventStartTime.replace('T', ' ') : '',