Merge remote-tracking branch 'origin/master'

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -11,13 +11,15 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="联锁状态">
-              <a-input placeholder="请输入联锁状态" v-model="queryParam.interlockStatus"></a-input>
+              <!-- <a-input placeholder="请输入联锁状态" v-model="queryParam.interlockStatus"></a-input> -->
+              <j-dict-select-tag v-model="queryParam.interlockStatus" placeholder="请输入联锁状态" dictCode="interlock_status"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="回路健康级别">
-                <a-input placeholder="请输入回路健康级别" v-model="queryParam.loopHealthLevel"></a-input>
+                <!-- <a-input placeholder="请输入回路健康级别" v-model="queryParam.loopHealthLevel"></a-input> -->
+                <a-select placeholder="请输入回路健康级别" v-model="queryParam.loopHealthLevel" allowClear :options="healthLevelOption"></a-select>
               </a-form-item>
             </a-col>
           </template>
@@ -275,6 +277,13 @@
           importExcelUrl: "summary/interlockSummary/importExcel",
 
         },
+        // 回路健康级别下拉列表
+        healthLevelOption: [
+          {value: 'A', label: 'A'},
+          {value: 'B', label: 'B'},
+          {value: 'C', label: 'C'},
+          {value: 'D', label: 'D'},
+        ],
         dictOptions:{},
         superFieldList:[],
         mouseSummaryid: '',
@@ -317,12 +326,18 @@
       getDataList(){
         console.log(111,this.selectData)
         if (this.selectData.num == 5) {
+          this.queryParam.interlockApparatusId = ''
           this.queryParam.interlockSystemId = this.selectData.id
         } else {
+          this.queryParam.interlockSystemId = ''
           this.queryParam.interlockApparatusId = this.selectData.id
         }
         this.loadData()
       },
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(1);
+      },
       loadData(arg) {
         let that = this
         if(!this.url.list){

src/views/module_interLock/InterlockSummary/index.vue

@@ -24,15 +24,19 @@ import InterlockSummaryList from './InterlockSummaryList.vue';
         methods: {
             selectEquipment(selectedKeys,e){
                 console.log(99,selectedKeys,e)
-                let str = selectedKeys[0].length
-                // console.log(88,str)
-                // if (str == 5) {
+                if (selectedKeys.length == 0) {
+                    this.$nextTick(()=>{
+                        this.$refs.realForm.searchReset();
+                    })
+                } else {
+                    let str = selectedKeys[0].length
+                    // console.log(88,str)
                     this.selectData.num = str
                     this.selectData.id = e.selectedNodes[0].data.props.id
                     this.$nextTick(()=>{
                         this.$refs.realForm.getDataList();
                     })
-                // }
+                }
             }
         },
     })