yuhan пре 2 месеци
родитељ
комит
6809f60e5f

+ 7 - 4
src/views/module_interLock/interlockSummarySet/InterlockSummarySet.vue

@@ -101,10 +101,13 @@
               <span v-if="record.ifBypass === '0'">{{ (record.bypassYesName?record.bypassYesName:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
               <!-- 是 -->
               <span v-if="record.ifBypass === '1'">{{ record.bypassTag }}</span>
-              <!-- 现场旁路+正常 -->
-              <span v-if="record.ifBypass === '2' && record.bypass === '0'">{{ (record.bypassYesName?record.bypassYesName:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
-              <!-- 现场旁路+异常 -->
-              <span v-if="record.ifBypass === '2' && record.bypass === '1'">{{ (record.bypassNoName?record.bypassNoName:itSystemDefaultValue.bypassNoName)+'('+record.bypass+')' }}</span>
+              <!-- 现场旁路 -->
+              <template v-if="record.ifBypass === '2'">
+                <!-- 选择为正常状态 -->
+                <span v-if="record.bypass === itSystemDefaultValue.bypassYes">{{ (record.bypassYesName?record.bypassYesName:itSystemDefaultValue.bypassYesName)+'('+record.bypass+')' }}</span>
+                <!-- 选择为异常状态 -->
+                <span v-else>{{ (record.bypassNoName?record.bypassNoName:itSystemDefaultValue.bypassNoName)+'('+record.bypass+')' }}</span>
+              </template>
             </span>
             <!-- 操作 -->
             <span slot="action" slot-scope="text, record, index">