Browse Source

联锁总表合并单元格优化

wyh 9 months ago
parent
commit
a781827c65
1 changed files with 12 additions and 3 deletions
  1. 12 3
      src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

+ 12 - 3
src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -372,15 +372,23 @@
 
               }
               // 回路健康级别合并
-              if (loopHealthLevel == '') {
+              if (loopHealthLevel === '') {
+                console.log('第一层')
                 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
                 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(99,i,interlocknamePD,that.dataSource[i].interlockname)
+                  if (interlocknamePD == that.dataSource[i].interlockname) {
                     console.log(11111)
                     that.dataSource[i].rowSpan3 = 0
                     rowSpan3++
@@ -393,6 +401,7 @@
                     interlocknamePD = that.dataSource[i].interlockname
                   }
                 }else{
+                  console.log('第二层else')
                   that.dataSource[i+1].rowSpan3 = rowSpan3
                   that.dataSource[i].rowSpan3 = 0
                   rowSpan3 = 1