|
|
@@ -124,21 +124,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)
|
|
|
- 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
|
|
|
+ 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
|
|
|
}
|
|
|
- }else{
|
|
|
- res.data[0].bindingSensor=[];
|
|
|
- res.data[0].bindingSensorList=[];
|
|
|
}
|
|
|
- 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);
|