Browse Source

详细信息优化

wyh 3 months ago
parent
commit
11231a4cb5

+ 15 - 14
src/views/module_interLock/InterlockDetail/InterlockDetailList.vue

@@ -9,14 +9,14 @@
               <a-input placeholder="请输入联锁总表id" v-model="queryParam.summaryid"></a-input>
             </a-form-item>
           </a-col> -->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="联锁名称">
               <a-input placeholder="请输入联锁名称" v-model="queryParam.interlockname"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="联锁条件">
-                <a-input placeholder="请输入联锁条件" v-model="queryParam.interlockCondition"></a-input>
+                <a-input placeholder="请输入联锁条件" v-model="queryParam.interlockConditionTag"></a-input>
               </a-form-item>
             </a-col>
           <!-- <template v-if="toggleSearchStatus">
@@ -168,17 +168,18 @@
               return {children: t,attrs: {rowSpan:r.rowSpan}};
             },
           },
+          // {
+          //   // title:'联锁条件值',
+          //   title:'联锁条件',
+          //   align:"center",
+          //   dataIndex: 'interlockCondition'
+          // },
           {
-            // title:'联锁条件值',
+            // title:'联锁条件点位',
             title:'联锁条件',
             align:"center",
-            dataIndex: 'interlockCondition'
+            dataIndex: 'interlockConditionTag'
           },
-          // {
-          //   title:'联锁条件点位',
-          //   align:"center",
-          //   dataIndex: 'interlockConditionTag'
-          // },
           {
             title:'描述',
             align:"center",
@@ -252,7 +253,7 @@
       }
     },
     created() {
-      this.queryParam.interlockname = this.$route.query.interlockname
+      // this.queryParam.summaryid = this.$route.query.summaryid
       this.getSuperFieldList();
     },
     computed: {
@@ -271,9 +272,9 @@
         if (arg === 1) {
           this.ipagination.current = 1;
         }
-        // if (this.$route.query.interlockname) {
-        //   this.queryParam.interlockname = this.$route.query.interlockname
-        // }
+        if (this.$route.query.summaryid) {
+          this.queryParam.summaryid = this.$route.query.summaryid
+        }
         var params = this.getQueryParams();//查询条件
         this.loading = true;
         getAction(this.url.list, params).then((res) => {

+ 1 - 1
src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -486,7 +486,7 @@
       },
       handleDetail(record){
         console.log(record)
-        this.$router.push({path: '/interLock/detail',query:{interlockname:record.interlockname}})
+        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid}})
       },
       initDictConfig(){
       },