联锁条件仪表状态和是否旁路优化

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

@@ -138,8 +138,8 @@
           <template v-if="model.ifBypass === '0'">
             <a-col :span="24">
               <a-form-model-item label="旁路状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypassNo">
-                <a-input v-model="model.bypassNo" default-value="无旁路"></a-input>
-                <!-- placeholder="无旁路" -->
+                <a-input v-model="model.bypassNo"></a-input>
+                <!-- placeholder="无旁路" :default-value="bypassNo" -->
               </a-form-model-item>
             </a-col>
           </template>
@@ -203,6 +203,7 @@
         model:{
           instrumentStatusJuge: '0',
           ifBypass: '1',
+          bypassNo: '无旁路',
         },
         labelCol: {
           xs: { span: 24 },
@@ -346,6 +347,7 @@
           this.model.bypassNo = record.bypass
         }
         if(record.ifBypass === '1'){
+          this.model.bypassNo = '无旁路'
           this.model.bypassData = [record.bypassDeviceId, record.bypassModuleName, record.bypassTag+'&'+record.bypass]
         }
         // 输入卡件状态

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

@@ -76,6 +76,38 @@
           <!-- :pagination="ipagination" -->
           <!-- :loading="loading" -->
           <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
+          <!-- 仪表状态依据 -->
+          <span slot="instrumentStatusJuge" slot-scope="text, record">
+            <template v-if="record.instrumentStatusJuge === '0'">
+              <span>位号读取</span>
+            </template>
+            <template v-if="record.instrumentStatusJuge === '1'">
+              <span>高低限判断</span>
+            </template>
+            <template v-if="record.instrumentStatusJuge === '2'">
+              <span>突变超限判断</span>
+            </template>
+          </span>
+          <!-- 仪表状态内容 -->
+          <span slot="instrumentStatusContent" slot-scope="text, record">
+            <template v-if="record.instrumentStatusJuge === '0'">
+              <span>位号：{{ record.instrumentStatusTag }}</span>
+            </template>
+            <template v-if="record.instrumentStatusJuge === '1'">
+              <span>位号：{{ record.ysmnlTag }}</span><br/>
+              <span>
+                <span>高限值：{{ record.upperLimit }}</span>
+                <span>低限值：{{ record.lowerLimit }}</span>
+              </span>
+            </template>
+            <template v-if="record.instrumentStatusJuge === '2'">
+              <span>位号：{{ record.ysmnlTag }}</span>
+              <span>
+                <span>时间：{{ record.thresholdTime }}</span>
+                <span>阈值：{{ record.thresholdValue }}</span>
+              </span>
+            </template>
+          </span>
           <!-- 是否旁路 -->
           <span slot="ifBypass" slot-scope="text, record">
             <span v-if="record.ifBypass === '1'">{{ record.bypassTag }}</span>
@@ -195,12 +227,14 @@
           {
             title:'仪表状态依据',
             align:"center",
-            dataIndex: 'instrumentStatusJuge'
+            // dataIndex: 'instrumentStatusJuge',
+            scopedSlots: { customRender: 'instrumentStatusJuge' }
           },
           {
             title:'仪表状态内容',
             align:"center",
-            dataIndex: 'instrumentStatusTag'
+            // dataIndex: 'instrumentStatusTag',
+            scopedSlots: { customRender: 'instrumentStatusContent' }
           },
           {
             title:'描述',