|
@@ -106,7 +106,7 @@
|
|
|
<!-- 是否旁路 -->
|
|
|
<span slot="ifBypass" slot-scope="text, record">
|
|
|
<span v-if="record.ifBypass === '1'">{{ record.bypassTag }}</span>
|
|
|
- <span v-if="record.ifBypass === '0'">{{ (record.bypass_dictText?record.bypass_dictText:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
|
|
|
+ <span v-if="record.ifBypass === '0'">{{ (record.bypassYesName?record.bypassYesName:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
|
|
|
</span>
|
|
|
<!-- 操作 -->
|
|
|
<span slot="action" slot-scope="text, record, index">
|
|
@@ -295,7 +295,7 @@
|
|
|
if(record.inputStatusTag){
|
|
|
return record.inputStatusTag
|
|
|
} else {
|
|
|
- var name = record.inputStatus_dictText ? record.inputStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
|
|
|
+ var name = record.controlSystemStatusNormalName ? record.controlSystemStatusNormalName : this.itSystemDefaultValue.controlSystemStatusNormalName
|
|
|
return name +'('+ record.inputStatus+')'
|
|
|
}
|
|
|
}
|
|
@@ -308,7 +308,7 @@
|
|
|
if(record.outputStatusTag){
|
|
|
return record.outputStatusTag
|
|
|
} else {
|
|
|
- var name = record.outputStatus_dictText ? record.outputStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
|
|
|
+ var name = record.controlSystemStatusNormalName ? record.controlSystemStatusNormalName : this.itSystemDefaultValue.controlSystemStatusNormalName
|
|
|
return name +'('+ record.outputStatus+')'
|
|
|
}
|
|
|
}
|
|
@@ -321,7 +321,7 @@
|
|
|
if(record.mpStatusTag){
|
|
|
return record.mpStatusTag
|
|
|
} else {
|
|
|
- var name = record.mpStatus_dictText ? record.mpStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
|
|
|
+ var name = record.controlSystemStatusNormalName ? record.controlSystemStatusNormalName : this.itSystemDefaultValue.controlSystemStatusNormalName
|
|
|
return name +'('+ record.mpStatus+')'
|
|
|
}
|
|
|
}
|