1、旁路状态显示不对，更改

src/views/module_interLock/interlockHistoryDetail/InterlockHistoryDetailList.vue

@@ -61,12 +61,27 @@
                   <template slot="title">
                     {{ record.bypassTag }}
                   </template>
+                  <span :class="record.bypass === record.bypassYes ? 'normal-tag':'abnormal-tag'">
+                    {{ text }}
+                  </span>
+                </a-tooltip>
+              </template>
+              <template v-else>
+                <span :class="record.bypass === record.bypassYes ? 'normal-tag':'abnormal-tag'">
+                  {{ text }}
+                </span>
+              </template>
+              <!-- <template v-if="record.bypassTag">
+                <a-tooltip placement="top">
+                  <template slot="title">
+                    {{ record.bypassTag }}
+                  </template>
                   {{ text }}
                 </a-tooltip>
               </template>
               <template v-else>
                 {{ text }}
-              </template>
+              </template> -->
             </span>
             <!-- 仪表状态 -->
             <span slot="instrumentStatus" slot-scope="text, record">
@@ -246,13 +261,16 @@
             align:"center",
             dataIndex: 'interlockCondition',
             customRender:(text,record,index)=> {
-              var interlockCondition = record.interlockSetUnit ? text + record.interlockSetUnit : text
+              var interlockCondition = record.interlockSetUnit ? text + record.interlockSetUnit : text              
               var children = (
                 <a-tooltip>
                   <template slot="title">
                     { record.interlockConditionTag }
                   </template>
-                  { interlockCondition }
+                  { text }
+                  <span class="normal-tag">
+                    { record.interlockSetUnit ? record.interlockSetUnit : '' }
+                  </span>
                 </a-tooltip>
               )
               return children
@@ -277,7 +295,15 @@
             dataIndex: 'interlockSetValue',
             customRender:function (t,r,index) {
               var data = r.interlockSetUnit ? t + r.interlockSetUnit : t
-              return data
+              var children = (
+                <a-tooltip>
+                  { t }
+                  <span class="normal-tag">
+                    { r.interlockSetUnit ? r.interlockSetUnit : '' }
+                  </span>
+                </a-tooltip>
+              )
+              return children
             },
           },
           // {

src/views/module_interLock/interlockSummaryDetail/InterlockSummaryDetailList.vue

@@ -83,13 +83,13 @@
                   <template slot="title">
                     {{ record.bypassTag }}
                   </template>
-                  <span :class="record.bypass === record.instrumentStatusNormal ? 'normal-tag':'abnormal-tag'">
+                  <span :class="record.bypass === record.bypassYes ? 'normal-tag':'abnormal-tag'">
                     {{ text }}
                   </span>
                 </a-tooltip>
               </template>
               <template v-else>
-                <span :class="record.bypass === record.instrumentStatusNormal ? 'normal-tag':'abnormal-tag'">
+                <span :class="record.bypass === record.bypassYes ? 'normal-tag':'abnormal-tag'">
                   {{ text }}
                 </span>
               </template>

src/views/module_interLock/interlockSummarySet/InterlockSummarySet.vue

@@ -138,7 +138,8 @@
                     v-model="model.interlockOutValueData"
                     :options="tagDataOptions"
                     :fieldNames="customFieldNames"
-                    :show-search="{ filter }"
+                    :show-search="true"
+                    :filter-option="filter"
                     expand-trigger="hover"
                     placeholder="请选择"
                     @change="changeCascader"