Browse Source

修改了实验室硬编码 预警字段null时给与[]

dedsudiyu 1 week ago
parent
commit
44354bd725
2 changed files with 11 additions and 6 deletions
  1. 10 5
      src/App.vue
  2. 1 1
      src/components/LabStats/videoStats.vue

+ 10 - 5
src/App.vue

@@ -127,13 +127,18 @@ export default {
       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
+        if(res.data[0].bindingSensorList){
+          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
+              }
             }
           }
+        }else{
+          res.data[0].bindingSensor=[];
+          res.data[0].bindingSensorList=[];
         }
         this.$set(this,'alarmData', res.data[0]);
         this.$set(this,'showAlarm',true);

+ 1 - 1
src/components/LabStats/videoStats.vue

@@ -58,7 +58,7 @@
           buildId:'',
           floorId:'',
           passageway:'',
-          subIds:['1993942741459181568'],
+          subIds:['2067514255432413184'],
           protocol:window.location.href.indexOf('https') !== -1?'wss':'ws',
           streamType:1,
           source:1,