联锁上添加装置系统名称

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -193,28 +193,42 @@
           //     return parseInt(index)+1;
           //   }
           // },
-          {
-            title:'装置',
-            align:"center",
-            dataIndex: 'interlockApparatusName',
-            customRender:(text,record,index)=> {
-              return {children: record.interlockApparatusName,attrs: {rowSpan:record.rowSpan}};
-            },
-          },
-          {
-            title:'系统',
-            align:"center",
-            dataIndex: 'interlockSystemName',
-            customRender:(text,record,index)=> {
-              return {children: record.interlockSystemName,attrs: {rowSpan:record.rowSpan}};
-            },
-          },
+          // {
+          //   title:'装置',
+          //   align:"center",
+          //   // width: 100,
+          //   dataIndex: 'interlockApparatusName',
+          //   customRender:(text,record,index)=> {
+          //     return {children: record.interlockApparatusName,attrs: {rowSpan:record.rowSpan}};
+          //   },
+          // },
+          // {
+          //   title:'系统',
+          //   align:"center",
+          //   // width: 100,
+          //   dataIndex: 'interlockSystemName',
+          //   customRender:(text,record,index)=> {
+          //     return {children: record.interlockSystemName,attrs: {rowSpan:record.rowSpan}};
+          //   },
+          // },
           {
             title:'联锁名称',
             align:"center",
+            // width: 100,
             dataIndex: 'interlockname',
             customRender:(text,record,index)=> {
-              return {children: record.interlockname,attrs: {rowSpan:record.rowSpan}};
+              var children = (
+                <a-tooltip>
+                  <template slot="title">
+                    { record.interlockApparatusName } -- { record.interlockSystemName }
+                  </template>
+                  { record.interlockname }
+                </a-tooltip>
+              )
+              return {
+                children: [children],
+                attrs: {rowSpan:record.rowSpan}
+              }
             },
             customCell: (record, index)=>{ return this.customCellDetail(record, index)}
             // sorter: (a, b) => a.interlockname - b.interlockname,
@@ -222,11 +236,13 @@
           {
             title:'联锁条件',
             align:"center",
+            // width: 100,
             dataIndex: 'interlockConditionTag'
           },
           {
             title:'仪表状态',
             align:"center",
+            // width: 100,
             dataIndex: 'instrumentStatusName',
             scopedSlots: { customRender: 'instrumentStatus' }
           },
@@ -243,18 +259,21 @@
           {
             title:'控制系统状态',
             align:"center",
+            // width: 120,
             dataIndex: 'controlSystemStatusName',
             scopedSlots: { customRender: 'controlSystemStatus' }
           },
           {
             title:'旁路状态',
             align:"center",
+            // width: 100,
             dataIndex: 'bypassName',
             scopedSlots: { customRender: 'bypassStatus' }
           },
           {
             title:'联锁状态',
             align:"center",
+            // width: 100,
             dataIndex: 'interlockStatusName',
             customRender:function (text,record,index) {
               let classTag = {
@@ -271,6 +290,7 @@
           {
             // title:'回路健康级别',
             align:"center",
+            // width: 150,
             dataIndex: 'loopHealthLevel',
             slots: { title: 'loopHealthLevelTitle' },
             customRender:(text,record,index)=> {
@@ -317,7 +337,7 @@
             align:"center",
             fixed:"right",
             width: 100,
-            auth: 'testdemo:action',
+            // auth: 'testdemo:action',
             // scopedSlots: { customRender: 'action' },
             customRender: (text,record,index)=> {
               if(this.isSysManage || record.limitType === '0'){
@@ -704,4 +724,25 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  //    ::v-deep(.ant-table-header) {
+  //    // 手动的添加隐藏样式
+  //    overflow-y: hidden !important;
+  //    // 设置表头右侧内边距 手动对齐
+  //    padding-right: 6px;
+  //  }
+  // /deep/.ant-table-body::-webkit-scrollbar {
+  //   display: none;
+  // }
+  // /deep/.ant-table-header{
+  //   overflow-y: hidden!important;
+  // }
+  // .ant-table-cell {
+  //   white-space: nowrap
+  // }
+  /* 设置表格宽度自适应 */
+  // .ant-table-body {
+  //   overflow-x: auto;
+  // }
 </style>

src/views/module_interLock/interlockHistoryData/InterlockHistoryList.vue

@@ -219,8 +219,22 @@
             title:'联锁名称',
             align:"center",
             dataIndex: 'interlockname',
-            customRender:(t,record,index)=> {
-              return {children: record.interlockname,attrs: {rowSpan:record.rowSpan4}};
+            // customRender:(t,record,index)=> {
+            //   return {children: record.interlockname,attrs: {rowSpan:record.rowSpan4}};
+            // },
+            customRender:(text,record,index)=> {
+              var children = (
+                <a-tooltip>
+                  <template slot="title">
+                    { record.interlockApparatusName } -- { record.interlockSystemName }
+                  </template>
+                  { record.interlockname }
+                </a-tooltip>
+              )
+              return {
+                children: [children],
+                attrs: {rowSpan:record.rowSpan}
+              }
             },
             customCell: (record, index)=>{ return this.customCellDetail(record, index)}
           },

src/views/module_interLock/interlockSummarySet/InterlockSummarySet.vue

@@ -389,6 +389,8 @@
       },
       // 获取所有位号
       getTagInfo(groupId){
+        // console.log('this.clickSystemNode', this.clickSystemNode)
+        // console.log('groupId', groupId)
         postAction(this.url.getTagInfo, {groupId: groupId}).then(res => {
           this.tagDataOptions = res.result
           this.confirmLoading = false