|
@@ -314,13 +314,11 @@
|
|
if(self.sensorList[i].hardwareTypeCode == val){
|
|
if(self.sensorList[i].hardwareTypeCode == val){
|
|
this.$set(self.dialogForm.riskPlanSensorList[index],'funNum',self.sensorList[i].hardwareTypeName);
|
|
this.$set(self.dialogForm.riskPlanSensorList[index],'funNum',self.sensorList[i].hardwareTypeName);
|
|
if(self.sensorList[i].enumName == "FLAME"){
|
|
if(self.sensorList[i].enumName == "FLAME"){
|
|
- console.log('self.sensorList[i].enumName',self.sensorList[i].enumName)
|
|
|
|
self.dialogForm.riskPlanSensorList[index].minMonitor = 1;
|
|
self.dialogForm.riskPlanSensorList[index].minMonitor = 1;
|
|
self.dialogForm.riskPlanSensorList[index].maxMonitor = 2;
|
|
self.dialogForm.riskPlanSensorList[index].maxMonitor = 2;
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'minMonitor',1);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'minMonitor',1);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'maxMonitor',2);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'maxMonitor',2);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',true);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',true);
|
|
- console.log('self.dialogForm.riskPlanSensorList.riskPlanSensorList',self.dialogForm.riskPlanSensorList)
|
|
|
|
}else{
|
|
}else{
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',false);
|
|
self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',false);
|
|
}
|
|
}
|
|
@@ -406,7 +404,6 @@
|
|
//查询设备功能
|
|
//查询设备功能
|
|
controlTypeList(val,index) {
|
|
controlTypeList(val,index) {
|
|
let self = this;
|
|
let self = this;
|
|
- console.log('hardwareList',this.hardwareList);
|
|
|
|
for(let i=0;i<self.hardwareList.length;i++){
|
|
for(let i=0;i<self.hardwareList.length;i++){
|
|
if(self.hardwareList[i].hardwareTypeEnum.code == val){
|
|
if(self.hardwareList[i].hardwareTypeEnum.code == val){
|
|
this.$set(self.dialogForm.riskPlanHardwareList[index],'hardwareList',self.hardwareList[i].functionStatusList);
|
|
this.$set(self.dialogForm.riskPlanHardwareList[index],'hardwareList',self.hardwareList[i].functionStatusList);
|
|
@@ -579,19 +576,15 @@
|
|
if(self.dialogForm.riskPlanSensorList[x].minMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
if(self.dialogForm.riskPlanSensorList[x].minMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
self.dialogForm.riskPlanSensorList[x].minMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
self.dialogForm.riskPlanSensorList[x].minMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
age++
|
|
age++
|
|
- console.log('1')
|
|
|
|
}else if(self.dialogForm.riskPlanSensorList[x].maxMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
}else if(self.dialogForm.riskPlanSensorList[x].maxMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
self.dialogForm.riskPlanSensorList[x].maxMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
self.dialogForm.riskPlanSensorList[x].maxMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
age++
|
|
age++
|
|
- console.log('2')
|
|
|
|
}else if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
|
|
}else if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
|
|
self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
|
|
self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
|
|
age++
|
|
age++
|
|
- console.log('3')
|
|
|
|
}else if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
|
|
}else if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
|
|
self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
|
|
self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
|
|
age++
|
|
age++
|
|
- console.log('4')
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -629,7 +622,6 @@
|
|
text = Array.from(new Set(text));
|
|
text = Array.from(new Set(text));
|
|
text = text+''
|
|
text = text+''
|
|
text = text.replace(",","+")
|
|
text = text.replace(",","+")
|
|
- console.log(text);
|
|
|
|
let obj = JSON.parse(JSON.stringify(this.dialogForm))
|
|
let obj = JSON.parse(JSON.stringify(this.dialogForm))
|
|
obj.riskAutoOff =Number(obj.riskAutoOff);
|
|
obj.riskAutoOff =Number(obj.riskAutoOff);
|
|
obj.alarmType =obj.alarmType.toString();
|
|
obj.alarmType =obj.alarmType.toString();
|
|
@@ -661,7 +653,6 @@
|
|
text = Array.from(new Set(text));
|
|
text = Array.from(new Set(text));
|
|
text = text+''
|
|
text = text+''
|
|
text = text.replace(",","+")
|
|
text = text.replace(",","+")
|
|
- console.log(text);
|
|
|
|
let obj = JSON.parse(JSON.stringify(this.dialogForm))
|
|
let obj = JSON.parse(JSON.stringify(this.dialogForm))
|
|
obj.riskAutoOff =Number(obj.riskAutoOff);
|
|
obj.riskAutoOff =Number(obj.riskAutoOff);
|
|
obj.alarmType =obj.alarmType.toString();
|
|
obj.alarmType =obj.alarmType.toString();
|