历史记录合并单元格修改

src/components/module_interLock/UEquipmentTree/UEquipmentTreeDrag.vue

@@ -32,7 +32,21 @@
                 <div>
                   <a-icon slot="icon" :type="nodeData.interlockType==='0'?'cluster':'project'" />
                   <!-- carry-out  apartment cluster -->
-                  <span class="item-node-name">{{nodeData.interlockName}}</span>
+                  
+                  <span class="item-node-name">
+                    
+                    <template>
+                      <a-tooltip>
+                        <template slot="title">
+                          {{ nodeData.interlockName }}
+                        </template>
+                        <span>
+                          {{nodeData.interlockName}}
+                        </span>
+                      </a-tooltip>
+                    </template>
+                    
+                  </span>
                 </div>
                 <template v-if="hasHandleBtn">
                 <!-- <div v-if="hasHandleBtn" v-has="'edit:tree'"> -->
@@ -497,6 +511,17 @@
           }
           .item-node-name{
             padding-left: 8px;
+            // width: 100px;
+            // white-space: nowrap; /* 防止文本换行 */
+            // overflow: hidden; /* 超出部分隐藏 */
+            // text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+            // // display: block; /* 确保块级显示 */
+            // word-break: break-all;
+            display: inline-block;
+            white-space: nowrap;
+            overflow: hidden; /*超出的文本隐藏*/
+            text-overflow: ellipsis; /* 溢出用省略号*/
+            vertical-align: top; //设置基准线，解决display inline-block造成的错位问题
           }
         }
         // 节点折叠时

src/views/module_interLock/interlockHistoryData/InterlockHistoryList.vue

@@ -212,7 +212,9 @@
             align:"center",
             dataIndex: 'tagTime',
             customRender:function (t,r,index) {
-              return {children: t,attrs: {rowSpan:r.rowSpan4}};
+              return {children: t,
+                attrs: {rowSpan:r.rowSpan4}
+              };
             },
           },
           {
@@ -307,7 +309,9 @@
               if(text === 'D'){
                 children = (<span style="color: #FF0000;font-weight: 600;">{text}</span>)
               }
-              return {children: children, attrs: {rowSpan:record.rowSpan3}};
+              return {children: children, 
+                attrs: {rowSpan:record.rowSpan3}
+              };
             },
           },
           
@@ -499,17 +503,28 @@
               let rowSpan4 = 0
               let interlockname = ''
               let interlocknamePD = ''
+              let interlocknameZhuangTai = ''
+              let interlocknameJiBie = ''
               let interlockStatus = ''
               let loopHealthLevel = ''
               let tagTime = ''
+              let tagTimeZhuangTai = ''
+              let tagTimeJiBie = ''
+              let tagTimeMingCheng = ''
+              let summaryidZhuangTai = ''
+              let summaryidJiBie = ''
+              let summaryidMingCheng = ''
               for (let i = that.dataSource.length-1; i >= 0; i--) {
                 // 联锁名称合并
                 if (interlockname == '') {
                   that.dataSource[i].rowSpan = 0
                   interlockname = that.dataSource[i].interlockname
+                  tagTimeMingCheng = that.dataSource[i].tagTime
+                  summaryidMingCheng = that.dataSource[i].summaryid
                   rowSpan++
                 } else {
-                  if(interlockname == that.dataSource[i].interlockname){
+                  if(interlockname == that.dataSource[i].interlockname && tagTime == that.dataSource[i].tagTime && 
+                      summaryidMingCheng == that.dataSource[i].summaryid){
                     that.dataSource[i].rowSpan = 0
                     rowSpan++
                   }else{
@@ -517,75 +532,56 @@
                     that.dataSource[i].rowSpan = 0
                     rowSpan = 1
                     interlockname = that.dataSource[i].interlockname
+                    tagTimeMingCheng = that.dataSource[i].tagTime
+                    summaryidMingCheng = that.dataSource[i].summaryid
                   }
                 }
                 // 联锁状态合并
+                // 联锁状态合并
                 if (interlockStatus == '') {
                   that.dataSource[i].rowSpan2 = 0
                   interlockStatus = that.dataSource[i].interlockStatus
-                  interlocknamePD = that.dataSource[i].interlockname
+                  interlocknameZhuangTai = that.dataSource[i].interlockname
+                  tagTimeZhuangTai = that.dataSource[i].tagTime
+                  summaryidZhuangTai = that.dataSource[i].summaryid
                   rowSpan2++
                 } else {
-                  if(interlockStatus == that.dataSource[i].interlockStatus){
-                    // that.dataSource[i].rowSpan2 = 0
-                    // rowSpan2++
-                    if (interlocknamePD == that.dataSource[i].interlockname) {
-                      that.dataSource[i].rowSpan2 = 0
-                      rowSpan2++
-                    } else {
-                      that.dataSource[i+1].rowSpan2 = rowSpan2
-                      that.dataSource[i].rowSpan2 = 0
-                      rowSpan2 = 1
-                      interlockStatus = that.dataSource[i].interlockStatus
-                      interlocknamePD = that.dataSource[i].interlockname
-                    }
+                  if(interlockStatus == that.dataSource[i].interlockStatus && tagTimeZhuangTai == that.dataSource[i].tagTime && 
+                      interlocknameZhuangTai == that.dataSource[i].interlockname && summaryidZhuangTai == that.dataSource[i].summaryid) {
+                    that.dataSource[i].rowSpan2 = 0
+                    rowSpan2++
                   }else{
                     that.dataSource[i+1].rowSpan2 = rowSpan2
                     that.dataSource[i].rowSpan2 = 0
                     rowSpan2 = 1
                     interlockStatus = that.dataSource[i].interlockStatus
-                    interlocknamePD = that.dataSource[i].interlockname
+                    interlocknameZhuangTai = that.dataSource[i].interlockname
+                    tagTimeZhuangTai = that.dataSource[i].tagTime
+                    summaryidZhuangTai = that.dataSource[i].summaryid
                   }
-
                 }
                 // 回路健康级别合并
-                if (loopHealthLevel === '') {
-                  // console.log('第一层')
+                if (loopHealthLevel == '') {
                   that.dataSource[i].rowSpan3 = 0
-                  // // 判断回路健康级别是否为空（不会出现此类问题）
-                  // if (that.dataSource[i].loopHealthLevel != '') {
-                  //   console.log('走不走这步')
-                  //   loopHealthLevel = that.dataSource[i].loopHealthLevel
-                  //   interlocknamePD = that.dataSource[i].interlockname
-                  //   rowSpan3++
-                  // }
                   loopHealthLevel = that.dataSource[i].loopHealthLevel
-                  interlocknamePD = that.dataSource[i].interlockname
+                  interlocknameJiBie = that.dataSource[i].interlockname
+                  tagTimeJiBie = that.dataSource[i].tagTime
+                  summaryidJiBie = that.dataSource[i].summaryid
                   rowSpan3++
                 } else {
-                  if(loopHealthLevel == that.dataSource[i].loopHealthLevel){
-                    // console.log(99,i,interlocknamePD,that.dataSource[i+1].interlockname)
-                    if (interlocknamePD == that.dataSource[i+1].interlockname) {
-                      // console.log(11111)
-                      that.dataSource[i].rowSpan3 = 0
-                      rowSpan3++
-                    } else {
-                      // console.log(22222)
-                      that.dataSource[i+1].rowSpan3 = rowSpan3
-                      that.dataSource[i].rowSpan3 = 0
-                      rowSpan3 = 1
-                      loopHealthLevel = that.dataSource[i].loopHealthLevel
-                      interlocknamePD = that.dataSource[i].interlockname
-                    }
+                  if(loopHealthLevel == that.dataSource[i].loopHealthLevel && tagTimeJiBie == that.dataSource[i].tagTime && 
+                      interlocknameJiBie == that.dataSource[i].interlockname && summaryidJiBie == that.dataSource[i].summaryid) {
+                    that.dataSource[i].rowSpan3 = 0
+                    rowSpan3++
                   }else{
-                    // console.log('第二层else')
                     that.dataSource[i+1].rowSpan3 = rowSpan3
                     that.dataSource[i].rowSpan3 = 0
                     rowSpan3 = 1
                     loopHealthLevel = that.dataSource[i].loopHealthLevel
-                    interlocknamePD = that.dataSource[i].interlockname
+                    interlocknameJiBie = that.dataSource[i].interlockname
+                    tagTimeJiBie = that.dataSource[i].tagTime
+                    summaryidJiBie = that.dataSource[i].summaryid
                   }
-
                 }
                 // 时间合并
                 if (tagTime === '') {
@@ -602,20 +598,10 @@
                   interlocknamePD = that.dataSource[i].interlockname
                   rowSpan4++
                 } else {
-                  if(tagTime == that.dataSource[i].tagTime){
-                    // console.log(99,i,interlocknamePD,that.dataSource[i+1].interlockname)
-                    if (interlocknamePD == that.dataSource[i+1].interlockname) {
-                      // console.log(11111)
-                      that.dataSource[i].rowSpan4 = 0
-                      rowSpan4++
-                    } else {
-                      // console.log(22222)
-                      that.dataSource[i+1].rowSpan4 = rowSpan4
-                      that.dataSource[i].rowSpan4 = 0
-                      rowSpan4 = 1
-                      tagTime = that.dataSource[i].tagTime
-                      interlocknamePD = that.dataSource[i].interlockname
-                    }
+                  if(tagTime == that.dataSource[i].tagTime && interlocknamePD == that.dataSource[i+1].interlockname) {
+                    // console.log(11111)
+                    that.dataSource[i].rowSpan4 = 0
+                    rowSpan4++
                   }else{
                     // console.log('第二层else')
                     that.dataSource[i+1].rowSpan4 = rowSpan4