wyh 2 kuukautta sitten
vanhempi
commit
d5ca090083

+ 1 - 0
src/views/module_interLock/InterlockDetail/InterlockDetailList.vue

@@ -275,6 +275,7 @@
         if (this.$route.query.summaryid) {
           this.queryParam.summaryid = this.$route.query.summaryid
         }
+        this.queryParam.interlockSystemId = this.$route.query.interlockSystemId
         var params = this.getQueryParams();//查询条件
         this.loading = true;
         getAction(this.url.list, params).then((res) => {

+ 20 - 4
src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -58,7 +58,7 @@
     <!-- table区域-begin -->
     <div>
       <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <span style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div> -->
 
@@ -217,8 +217,24 @@
             title:'回路健康级别',
             align:"center",
             dataIndex: 'loopHealthLevel',
-            customRender:function (t,r,index) {
-              return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            // customRender:function (t,r,index) {
+            //   return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            // },
+            customRender:(t,record,index)=> {
+              console.log('t是什么',t)
+              const text = record.loopHealthLevel
+              var childrenMore = (
+                // <a-tooltip>
+                //   <template slot="title">
+                //     A:全部正常;
+                //     B:有一个有问题;
+                //     C:有两个有问题;
+                //     D:全部故障
+                //   </template>
+                  <span >{{ text }}</span>
+                // </a-tooltip>
+              )
+              return {children: childrenMore,attrs: {rowSpan:record.rowSpan3}};
             },
           },
           // {
@@ -501,7 +517,7 @@
       },
       handleDetail(record){
         console.log(record)
-        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid}})
+        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid,interlockSystemId:record.interlockSystemId}})
       },
       initDictConfig(){
       },