修改联锁和样式等问题

src/assets/less/interLock.css

@@ -247,6 +247,19 @@
 .iotmenu-modal-box .ant-table .edit-btn:hover {
   background: url(../edit-hover.svg);
 }
+.iotmenu-content-container .ant-table .copy-btn,
+.iotmenu-modal-box .ant-table .copy-btn {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  margin: 4px 3px;
+  cursor: pointer;
+  background: url(../copy.svg);
+}
+.iotmenu-content-container .ant-table .copy-btn:hover,
+.iotmenu-modal-box .ant-table .copy-btn:hover {
+  background: url(../copy-hover.svg);
+}
 .iotmenu-content-container .ant-table .delete-btn,
 .iotmenu-modal-box .ant-table .delete-btn {
   display: inline-block;
@@ -361,22 +374,25 @@
 .iotmenu-modal-box .ant-modal .ant-modal-body .ant-form .ant-form-item .ant-form-item-control {
   font-size: 15px !important;
 }
-.iotmenu-modal-box .ant-modal .ant-divider {
-  font-size: 14px;
-}
-.iotmenu-modal-box .ant-modal .ant-table .ant-table-thead tr th {
-  color: #323233 !important;
+.iotmenu-modal-box .ant-modal .ant-input,
+.iotmenu-modal-box .ant-modal .ant-cascader-picker,
+.iotmenu-modal-box .ant-modal .ant-select {
   font-size: 15px !important;
-  font-weight: 700 !important;
 }
-.iotmenu-modal-box .ant-modal .ant-table .ant-table-tbody tr td {
-  color: #323233 !important;
-  font-size: 15px;
+.iotmenu-modal-box .ant-modal .ant-divider {
+  font-size: 16px;
+  font-weight: 600;
 }
 .iotmenu-modal-box .ant-modal .ant-table-fixed-left table,
 .iotmenu-modal-box .ant-modal .ant-table-fixed-right table {
   background: #fff;
 }
+.iotmenu-modal-box .ant-modal .ant-modal-footer {
+  padding-right: 34px;
+}
+.iotmenu-modal-box .ant-modal .ant-modal-footer .ant-btn {
+  font-size: 17px;
+}
 ::-webkit-scrollbar {
   width: 6px !important;
 }

src/assets/less/interLock.less

@@ -221,6 +221,17 @@
     .edit-btn:hover{
       background: url(../edit-hover.svg);
     }
+    .copy-btn{
+      display: inline-block;
+      width: 24px;
+      height: 24px;
+      margin: 4px 3px;
+      cursor: pointer;
+      background: url(../copy.svg);
+    }
+    .copy-btn:hover{
+      background: url(../copy-hover.svg);
+    }
     .delete-btn{
       display: inline-block;
       width: 24px;
@@ -375,34 +386,44 @@
         }
       }
     }
+    .ant-input, .ant-cascader-picker, .ant-select{
+      font-size: 15px !important;
+    }
     // 分割线
     .ant-divider{
-      font-size: 14px;
-    }
-    // 表格
-    .ant-table{
-      // background: transparent !important;
-      .ant-table-thead{
-        tr{
-          th{
-            color: @iotTpmFontColor !important;
-            font-size: 15px !important;
-            font-weight: 700 !important;
-          }
-        }
-      }
-      .ant-table-tbody{
-        tr{
-          td{
-            color: @iotTpmFontColor !important;
-            font-size: 15px;
-          }
-        }
-      }
+      font-size: 16px;
+      font-weight: 600;
     }
+    // // 表格
+    // .ant-table{
+    //   // background: transparent !important;
+    //   .ant-table-thead{
+    //     tr{
+    //       th{
+    //         color: @iotTpmFontColor !important;
+    //         font-size: 15px !important;
+    //         font-weight: 700 !important;
+    //       }
+    //     }
+    //   }
+    //   .ant-table-tbody{
+    //     tr{
+    //       td{
+    //         color: @iotTpmFontColor !important;
+    //         font-size: 15px;
+    //       }
+    //     }
+    //   }
+    // }
     .ant-table-fixed-left table, .ant-table-fixed-right table{
       background: #fff;
     }
+    .ant-modal-footer{
+      padding-right: 34px;
+      .ant-btn{
+        font-size: 17px;
+      }
+    }
   }
 }
 // 滚动条样式

src/components/layouts/UserLayout.vue

@@ -5,7 +5,7 @@
         <div class="header">
           <a href="/">
             <!-- 修改框架 -->
-            <img src="~@/assets/logo.png" class="logo" alt="logo">
+            <!-- <img src="~@/assets/logo.png" class="logo" alt="logo"> -->
             <!-- <img src="~@/assets/logo.svg" class="logo" alt="logo"> -->
             <!-- 修改框架 -->
             <span class="title">联锁管理平台</span>
@@ -29,7 +29,7 @@
         </div> -->
         <div class="copyright">
           <!-- 修改框架 -->
-          Copyright &copy; 2024 山东研讯智能科技有限公司 出品
+          <!-- Copyright &copy; 2024 山东研讯智能科技有限公司 出品 -->
           <!-- Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品 -->
         </div>
       </div>

src/components/page/GlobalFooter.vue

@@ -11,7 +11,7 @@
     </div> -->
     <div class="copyright">
       <!-- 修改框架 -->
-      Copyright &copy; 2024 山东研讯智能科技有限公司 出品
+      <!-- Copyright &copy; 2024 山东研讯智能科技有限公司 出品 -->
       <!-- Copyright
       <a-icon type="copyright"/>
       2019 <span>JEECG开源社区 出品</span> -->

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -98,7 +98,8 @@
           回路健康级别
           <a-tooltip placement="top">
             <template slot="title">
-              <span> A代表回路健康；B代表回路有故障；C代表回路有严重故障；D代表回路失效； </span>
+              <span> A-健康；B-故障；C-严重故障；D-失效 </span>
+              <!-- <span> A代表回路健康；B代表回路有故障；C代表回路有严重故障；D代表回路失效； </span> -->
             </template>
             <a-icon type="question-circle" />
           </a-tooltip>
@@ -187,16 +188,16 @@
         description: '联锁总表管理页面',
         // 表头
         columns: [
-          {
-            title: '序号',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '序号',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
           {
             title:'联锁名称',
             align:"center",
@@ -370,7 +371,6 @@
       this.loadData();
       this.initDictConfig();
       this.getSuperFieldList();
-      this.getSystemDefaulOptions()
     },
     computed: {
       importExcelUrl: function(){

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

@@ -9,10 +9,10 @@
               <a-cascader
                 v-model="model.interlockConditionData"
                 :options="tagDataOptions"
-                :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
                 placeholder="请选择点位"/>
+                <!-- :display-render="displayRender" -->
                 <!-- @change="dianwerChange" -->
             </a-form-model-item>
           </a-col>
@@ -26,7 +26,6 @@
               <a-cascader
                 v-model="model.currentValueData"
                 :options="tagDataOptions"
-                :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
                 placeholder="请选择当前值"/>
@@ -34,47 +33,37 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="输入卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inputStatusData">
-              <a-radio-group name="radioGroup" v-model="model.inputStatusRadio">
-                <a-radio :value="'0'"> 默认值 </a-radio>
+              <a-radio-group name="radioGroup" v-model="model.inputStatusRadio" @change="statusRadioChange">
+                <a-radio :value="'0'"> 默认正常 </a-radio>
                 <a-radio :value="'1'"> 位号读取 </a-radio>
               </a-radio-group>
               <template v-if="model.inputStatusRadio === '0'">
-                <!-- <a-select v-model="model.bypassNo">
-                  <a-select-option value="0"> 0 </a-select-option>
-                  <a-select-option value="1"> 1 </a-select-option>
-                </a-select> -->
                 <a-input v-model="model.inputStatusDefault" disabled></a-input>
               </template>
               <template v-if="model.inputStatusRadio === '1'">
                 <a-cascader
                   v-model="model.inputStatusData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择输入卡件状态"
-                />
+                  />
               </template>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="输出卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outputStatusData">
-              <a-radio-group name="radioGroup" v-model="model.outputStatusRadio">
-                <a-radio :value="'0'"> 默认值 </a-radio>
+              <a-radio-group name="radioGroup" v-model="model.outputStatusRadio" @change="statusRadioChange">
+                <a-radio :value="'0'"> 默认正常 </a-radio>
                 <a-radio :value="'1'"> 位号读取 </a-radio>
               </a-radio-group>
               <template v-if="model.outputStatusRadio === '0'">
-                <!-- <a-select v-model="model.bypassNo">
-                  <a-select-option value="0"> 0 </a-select-option>
-                  <a-select-option value="1"> 1 </a-select-option>
-                </a-select> -->
                 <a-input v-model="model.outputStatusDefault" disabled></a-input>
               </template>
               <template v-if="model.outputStatusRadio === '1'">
                 <a-cascader
                   v-model="model.outputStatusData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择输出卡件状态"
@@ -84,22 +73,17 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="MP状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mpStatusData">
-              <a-radio-group name="radioGroup" v-model="model.mpStatusRadio">
-                <a-radio :value="'0'"> 默认值 </a-radio>
+              <a-radio-group name="radioGroup" v-model="model.mpStatusRadio" @change="statusRadioChange">
+                <a-radio :value="'0'"> 默认正常 </a-radio>
                 <a-radio :value="'1'"> 位号读取 </a-radio>
               </a-radio-group>
               <template v-if="model.mpStatusRadio === '0'">
-                <!-- <a-select v-model="model.bypassNo">
-                  <a-select-option value="0"> 0 </a-select-option>
-                  <a-select-option value="1"> 1 </a-select-option>
-                </a-select> -->
                 <a-input v-model="model.mpStatusDefault" disabled></a-input>
               </template>
               <template v-if="model.mpStatusRadio === '1'">
                 <a-cascader
                   v-model="model.mpStatusData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择MP状态"
@@ -120,14 +104,13 @@
           </a-col>
           <template v-if="model.instrumentStatusJuge === '0'">
             <a-col :span="24">
-              <a-form-model-item label="仪表状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusData">
+              <a-form-model-item label="仪表位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusData">
                 <a-cascader
                 v-model="model.instrumentStatusData"
                 :options="tagDataOptions"
-                :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择仪表状态"/>
+                placeholder="请选择仪表位号"/>
               </a-form-model-item>
             </a-col>
           </template>
@@ -137,7 +120,6 @@
                 <a-cascader
                   v-model="model.ysmnlData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择原始模拟量"
@@ -145,6 +127,14 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
+              <a-form-model-item label="系统" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentGDXT">
+                <a-radio-group name="radioGroup" v-model="model.instrumentGDXT" @change="instrumentGDXTChange">
+                  <a-radio value="Tricon"> Tricon </a-radio>
+                  <a-radio value="TSxPlus"> TSxPlus </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
               <a-form-model-item label="高限值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
                 <a-auto-complete :data-source="['4258', '61948']" v-model="model.upperLimit" placeholder="请输入高限"></a-auto-complete>
               </a-form-model-item>
@@ -161,7 +151,6 @@
                 <a-cascader
                   v-model="model.ysmnlData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择原始模拟量"
@@ -169,6 +158,14 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
+              <a-form-model-item label="系统" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentTBXT">
+                <a-radio-group name="radioGroup" v-model="model.instrumentTBXT" @change="instrumentTBXTChange">
+                  <a-radio value="Tricon"> Tricon </a-radio>
+                  <a-radio value="TSxPlus"> TSxPlus </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
               <a-form-model-item label="突变判断公式" :labelCol="labelCol" :wrapperCol="wrapperCol" class="red-star-form-item">
                 <div style="display: flex;">
                   <div style="width: 30px;text-align: center;">( </div>
@@ -181,7 +178,8 @@
                   </a-form-model-item>
                   <div style="width: 60px;text-align: center;">）* </div>
                   <a-form-model-item prop="thresholdValueN">
-                    <a-auto-complete :data-source="['1']" v-model="model.thresholdValueN" placeholder="请输入阈值"></a-auto-complete>
+                    <a-input v-model="model.thresholdValueN" placeholder="请输入阈值"></a-input>
+                    <!-- <a-auto-complete :data-source="['1']" v-model="model.thresholdValueN" placeholder="请输入阈值"></a-auto-complete> -->
                   </a-form-model-item>
                   <div style="width: 30px;text-align: center;"> % </div>
                 </div>
@@ -234,7 +232,6 @@
                 <a-cascader
                 v-model="model.bypassData"
                 :options="tagDataOptions"
-                :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
                 placeholder="请选择旁路"/>
@@ -244,12 +241,12 @@
           <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"></a-input> -->
+                <a-input v-model="model.bypassNo" disabled></a-input>
                 <!-- placeholder="无旁路" :default-value="bypassNo" -->
-                <a-select v-model="model.bypassNo">
+                <!-- <a-select v-model="model.bypassNo">
                   <a-select-option value="0"> 0 </a-select-option>
                   <a-select-option value="1"> 1 </a-select-option>
-                </a-select>
+                </a-select> -->
               </a-form-model-item>
             </a-col>
           </template>
@@ -290,12 +287,14 @@
           mpStatusRadio: '0', // MP状态单选默认-默认值
           mpStatusDefault: null, // MP状态默认值默认参数
           instrumentStatusJuge: '0', // 仪表判定依据-位号读取
-          instrumentStatus: null, // 仪表状态默认值默认参数
+          // instrumentStatus: null, // 仪表状态默认值默认参数
+          instrumentGDXT: 'Tricon',
+          instrumentTBXT: 'Tricon',
           upperLimit: null,
           lowerLimit: null,
-          thresholdValueN: null,
+          thresholdValueN: '1',
           ifBypass: '1', // 是否有旁路-是
-          bypassNo: '0', // 旁路默认值
+          bypassNo: null, // 旁路默认值
           bypass: null, // MP状态默认值默认参数
         },
         labelCol: {
@@ -341,9 +340,6 @@
             required: true, message: '请输入阈值!',
           }],
 
-          description: [{
-            required: true, message: '请输入描述!',
-          }],
           interlockSetValue: [{
             required: true, message: '请输入联锁设定值!',
           }],
@@ -385,19 +381,25 @@
       }
     },
     created () {
-      // 设置状态默认值
-      this.setDefaultValue()
       // this.getTagInfo()
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      statusRadioChange(e){
+      //   console.log(e)
+      //   console.log(this.model.inputStatusRadio)
+        // this.$set(this.model, 'inputStatusRadio', e.target.value)
+        this.model = {...this.model}
+      },
       // 设置状态默认值
       setDefaultValue(){
-        console.log(this.itSystemDefaultValue)
+        console.log('set',this.itSystemDefaultValue, this.model)
+        // this.$set(this.model, 'inputStatusDefault', this.itSystemDefaultValue.controlSystemStatusNormal)
         this.model.inputStatusDefault = this.itSystemDefaultValue.controlSystemStatusNormal
         this.model.outputStatusDefault = this.itSystemDefaultValue.controlSystemStatusNormal
         this.model.mpStatusDefault = this.itSystemDefaultValue.controlSystemStatusNormal
+        this.model.bypassNo = this.itSystemDefaultValue.bypassYes
       },
       // 获取所有位号
       // getTagInfo(){
@@ -407,9 +409,10 @@
       //     this.confirmLoading = false
       //   })
       // },
-      displayRender({ labels }) {
-        return labels[labels.length - 1];
-      },
+      // displayRender({ labels }) {
+      //   // 设置显示最有一位
+      //   return labels[labels.length - 1];
+      // },
       // 点位选择改变
       dianwerChange(e){
         console.log(e)
@@ -419,10 +422,31 @@
         console.log(e)
         this.model.upperLimit = null
         this.model.lowerLimit = null
-        this.model.thresholdValueN = null
       },
-      add () {  
-        // this.edit(this.modelDefault);
+      // 高低限判断系统参考改变
+      instrumentGDXTChange(e){
+        if(e.target.value === 'Tricon'){
+          this.model.upperLimit = '4258'
+          this.model.lowerLimit = '737'
+        }
+        if(e.target.value === 'TSxPlus'){
+          this.model.upperLimit = '61948'
+          this.model.lowerLimit = '10722'
+        }
+      },
+      instrumentTBXTChange(e){
+        if(e.target.value === 'Tricon'){
+          this.model.upperLimit = '4095'
+          this.model.lowerLimit = '819'
+        }
+        if(e.target.value === 'TSxPlus'){
+          this.model.upperLimit = '59577'
+          this.model.lowerLimit = '11915'
+        }
+      },
+      add () {
+        // 设置状态默认值
+        this.setDefaultValue()
       },
       edit (record) {
         console.log(record)
@@ -455,15 +479,21 @@
         }
         // 输入卡件状态
         this.model.inputStatusRadio = record.inputStatusTag ? '1' : '0'
-        this.model.inputStatusData = [record.inputStatusDeviceId, record.inputStatusModuleName, record.inputStatusTag+'&'+record.inputStatus]
+        if(record.inputStatusTag){
+          this.model.inputStatusData = [record.inputStatusDeviceId, record.inputStatusModuleName, record.inputStatusTag+'&'+record.inputStatus]
+        }
         // 输出卡件状态
         this.model.outputStatusRadio = record.outputStatusTag ? '1' : '0'
-        this.model.outputStatusData = [record.outputStatusDeviceId, record.outputStatusModuleName, record.outputStatusTag+'&'+record.outputStatus]
+        if(record.outputStatusTag){
+          this.model.outputStatusData = [record.outputStatusDeviceId, record.outputStatusModuleName, record.outputStatusTag+'&'+record.outputStatus]
+        }
         // MP状态
         this.model.mpStatusRadio = record.mpStatusTag ? '1' : '0'
-        this.model.mpStatusData = [record.mpStatusDeviceId, record.mpStatusModuleName, record.mpStatusTag+'&'+record.mpStatus]
-
-        this.visible = true;
+        if(record.mpStatusTag){
+          this.model.mpStatusRadio = '1'
+          this.model.mpStatusData = [record.mpStatusDeviceId, record.mpStatusModuleName, record.mpStatusTag+'&'+record.mpStatus]
+        }
+        this.setDefaultValue()
       },
       submitForm () {
         // const that = this;
@@ -524,7 +554,6 @@
               this.model.inputStatusTag = (this.model.inputStatusData[2].split('&'))[0]
               this.model.inputStatus = (this.model.inputStatusData[2].split('&'))[1]
             } else {
-              console.log(11111111111111)
               this.model.inputStatusDeviceId = null
               this.model.inputStatusModuleName = null
               this.model.inputStatusTag = null
@@ -538,7 +567,6 @@
               this.model.outputStatusTag = (this.model.outputStatusData[2].split('&'))[0]
               this.model.outputStatus = (this.model.outputStatusData[2].split('&'))[1]
             } else {
-              console.log(1222222222)
               this.model.outputStatusDeviceId = null
               this.model.outputStatusModuleName = null
               this.model.outputStatusTag = null
@@ -552,7 +580,6 @@
               this.model.mpStatusTag = (this.model.mpStatusData[2].split('&'))[0]
               this.model.mpStatus = (this.model.mpStatusData[2].split('&'))[1]
             } else {
-              console.log(33333333)
               this.model.mpStatusDeviceId = null
               this.model.mpStatusModuleName = null
               this.model.mpStatusTag = null

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

@@ -51,7 +51,8 @@
             <a-col :span="12">
               <a-form-model-item label="逻辑关系" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ljgx">
                 <!-- <a-input v-model="model.ljgx" placeholder="请输入逻辑关系"></a-input> -->
-                <j-dict-select-tag v-model="model.ljgx"  placeholder="请选择操作类型" dictCode="ljgx"/>
+                <!-- <j-dict-select-tag v-model="model.ljgx"  placeholder="请选择操作类型" dictCode="ljgx"/> -->
+                <a-auto-complete :data-source="ljgxOptions" v-model="model.ljgx" placeholder="请设置逻辑关系"></a-auto-complete>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -60,7 +61,6 @@
             ref="table"
             size="middle"
             :scroll="{x:true}"
-            bordered
             :pagination="false"
             :rowKey="(record,index)=>{return index}"
             :columns="columns"
@@ -106,12 +106,19 @@
             </span>
             <!-- 操作 -->
             <span slot="action" slot-scope="text, record, index">
-              <a @click="handleEditCondition(record, index)">编辑</a>
-              <a-divider type="vertical" />
-              <a @click="handleCopyCondition(record, index)">复制</a>
-              <a-divider type="vertical" />
+              <a-tooltip>
+                <template slot="title"> 设置 </template>
+                <span class="edit-btn" @click="handleEditCondition(record, index)"></span>
+              </a-tooltip>
+              <a-tooltip>
+                <template slot="title"> 复制 </template>
+                <span class="copy-btn" @click="handleCopyCondition(record, index)"></span>
+              </a-tooltip>
               <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteCondition(record, index)">
-                <a>删除</a>
+                <a-tooltip>
+                  <template slot="title"> 删除 </template>
+                  <span class="delete-btn"></span>
+                </a-tooltip>
               </a-popconfirm>
             </span>
           </a-table>
@@ -125,12 +132,12 @@
                 <a-cascader
                   v-model="model.interlockOutValueData"
                   :options="tagDataOptions"
-                  :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
                   placeholder="请选择"
                   @change="dianwerChange"
                   />
+                  <!-- :display-render="displayRender" -->
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -156,6 +163,7 @@
   import { httpAction, getAction, postAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import InterlockConditionForm from './InterlockConditionForm.vue'
+  import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
   // import { mixinDevice } from '@/utils/mixin'
   // import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
@@ -228,16 +236,16 @@
         // 联锁条件表格
         conditionDataSource: [],
         columns: [
-          {
-            title: '序号',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '序号',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
           {
             title:'联锁条件',
             align:"center",
@@ -322,6 +330,7 @@
         ],
         tableClickRowIndex: -1,
         itSystemDefaultValue: {}, // 该系统设置的默认值
+        ljgxOptions: [],
       }
     },
     computed: {
@@ -336,11 +345,28 @@
     // },
     created () {
       this.getTagInfo()
+      this.initDictData()
       // this.getData('0', 'apparatusData')
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      // 获取逻辑关系字典
+      initDictData() {
+        //优先从缓存中读取字典配置
+        if(getDictItemsFromCache('ljgx')){
+          var dicts = getDictItemsFromCache('ljgx');
+          this.ljgxOptions = dicts.map(item => item.label)
+          return
+        }
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('ljgx', null).then((res) => {
+          if (res.success) {
+            var dicts = res.result;
+            this.ljgxOptions = dicts.map(item => item.label)
+          }
+        })
+      },
       // 设置装置系统id并获取该系统默认设置值
       getZzXtData(){
         console.log('model', this.model)
@@ -381,9 +407,10 @@
         console.log(searchText)
         // this.interLockData = !searchText ? [] : [searchText, searchText.repeat(2), searchText.repeat(3)]
       },
-      displayRender({ labels }) {
-        return labels[labels.length - 1];
-      },
+      // displayRender({ labels }) {
+      //   // 设置选择最后一位
+      //   return labels[labels.length - 1];
+      // },
       // 位号选择改变
       dianwerChange(e){
         console.log(e)
@@ -392,6 +419,9 @@
       handleAddCondition(){
         this.tableClickRowIndex = -1
         this.conditionVisible = true
+        this.$nextTick(()=>{
+          this.$refs.conditionForm.add();
+        })
       },
       // 编辑联锁条件
       handleEditCondition(record, index){
@@ -515,9 +545,9 @@
   }
   .interlock-summary-item-title{
     background-color: #F5F7FA;
-    line-height: 40px;
+    line-height: 44px;
     font-size: 16px;
-    padding: 0 20px;
+    padding: 0 10px 0 20px;
     margin-bottom: 10px;
     border-bottom: 1px solid #f3f3f3;
     color: #323233;