修改联锁编辑显示bug

src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

@@ -95,7 +95,8 @@
           <a-divider orientation="left"> <span>仪表状态</span> </a-divider>
           <a-col :span="24">
             <a-form-model-item label="仪表状态判定依据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusJuge">
-              <a-radio-group name="radioGroup" v-model="model.instrumentStatusJuge" @change="instrumentStatusJugeChange">
+              <a-radio-group name="radioGroup" v-model="model.instrumentStatusJuge">
+                <!-- @change="instrumentStatusJugeChange" -->
                 <a-radio :value="'0'"> 位号读取 </a-radio>
                 <a-radio :value="'1'"> 高低限判断 </a-radio>
                 <a-radio :value="'2'"> 突变超限判断 </a-radio>

src/views/module_interLock/InterlockSummary/modules/InterlockSummaryForm.vue

@@ -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+')' }}</span>
+              <span v-if="record.ifBypass === '0'">{{ (record.bypass_dictText?record.bypass_dictText:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
             </span>
             <!-- 操作 -->
             <span slot="action" slot-scope="text, record, index">
@@ -295,7 +295,8 @@
               if(record.inputStatusTag){
                 return record.inputStatusTag
               } else {
-                return record.inputStatus_dictText +'('+ record.inputStatus+')'
+                var name = record.inputStatus_dictText ? record.inputStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
+                return name +'('+ record.inputStatus+')'
               }
             }
           },
@@ -307,7 +308,8 @@
               if(record.outputStatusTag){
                 return record.outputStatusTag
               } else {
-                return record.outputStatus_dictText +'('+ record.outputStatus+')'
+                var name = record.outputStatus_dictText ? record.outputStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
+                return name +'('+ record.outputStatus+')'
               }
             }
           },
@@ -319,7 +321,8 @@
               if(record.mpStatusTag){
                 return record.mpStatusTag
               } else {
-                return record.mpStatus_dictText +'('+ record.mpStatus+')'
+                var name = record.mpStatus_dictText ? record.mpStatus_dictText : this.itSystemDefaultValue.instrumentStatusNormalName
+                return name +'('+ record.mpStatus+')'
               }
             }
           },