连锁总表页码优化

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -355,110 +355,113 @@
             //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
             this.dataSource = res.result.records||res.result;
 
-            // 合并单元格
-            //判断跨行
-            let rowSpan = 0
-            let rowSpan2 = 0
-            let rowSpan3 = 0
-            let interlockname = ''
-            let interlocknamePD = ''
-            let interlockStatus = ''
-            let loopHealthLevel = ''
-            for (let i = that.dataSource.length-1; i >= 0; i--) {
-              // 联锁名称合并
-              if (interlockname == '') {
-                that.dataSource[i].rowSpan = 0
-                interlockname = that.dataSource[i].interlockname
-                rowSpan++
-              } else {
-                if(interlockname == that.dataSource[i].interlockname){
-                  that.dataSource[i].rowSpan = 0
-                  rowSpan++
-                }else{
-                  that.dataSource[i+1].rowSpan = rowSpan
+
+            if(res.result.total)
+            {
+              // 合并单元格
+              //判断跨行
+              let rowSpan = 0
+              let rowSpan2 = 0
+              let rowSpan3 = 0
+              let interlockname = ''
+              let interlocknamePD = ''
+              let interlockStatus = ''
+              let loopHealthLevel = ''
+              for (let i = that.dataSource.length-1; i >= 0; i--) {
+                // 联锁名称合并
+                if (interlockname == '') {
                   that.dataSource[i].rowSpan = 0
-                  rowSpan = 1
                   interlockname = that.dataSource[i].interlockname
+                  rowSpan++
+                } else {
+                  if(interlockname == that.dataSource[i].interlockname){
+                    that.dataSource[i].rowSpan = 0
+                    rowSpan++
+                  }else{
+                    that.dataSource[i+1].rowSpan = rowSpan
+                    that.dataSource[i].rowSpan = 0
+                    rowSpan = 1
+                    interlockname = that.dataSource[i].interlockname
+                  }
                 }
-              }
-              // 联锁状态合并
-              if (interlockStatus == '') {
-                that.dataSource[i].rowSpan2 = 0
-                interlockStatus = that.dataSource[i].interlockStatus
-                interlocknamePD = that.dataSource[i].interlockname
-                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 {
+                // 联锁状态合并
+                if (interlockStatus == '') {
+                  that.dataSource[i].rowSpan2 = 0
+                  interlockStatus = that.dataSource[i].interlockStatus
+                  interlocknamePD = that.dataSource[i].interlockname
+                  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
+                    }
+                  }else{
                     that.dataSource[i+1].rowSpan2 = rowSpan2
                     that.dataSource[i].rowSpan2 = 0
                     rowSpan2 = 1
                     interlockStatus = that.dataSource[i].interlockStatus
                     interlocknamePD = that.dataSource[i].interlockname
                   }
-                }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 (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(11111)
-                    that.dataSource[i].rowSpan3 = 0
-                    rowSpan3++
-                  } else {
-                    // console.log(22222)
+                }
+                // 回路健康级别合并
+                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(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
+                    }
+                  }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
                   }
-                }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
-                }
 
+                }
               }
-            }
-            that.dataSource[0].rowSpan = rowSpan
-            that.dataSource[0].rowSpan2 = rowSpan2
-            that.dataSource[0].rowSpan3 = rowSpan3
-            // console.log(22222222222,that.dataSource)
+              that.dataSource[0].rowSpan = rowSpan
+              that.dataSource[0].rowSpan2 = rowSpan2
+              that.dataSource[0].rowSpan3 = rowSpan3
+              // console.log(22222222222,that.dataSource)
 
-
-            if(res.result.total)
-            {
+              
+              console.log('返回的是',res.result.total)
               this.ipagination.total = res.result.total;
+              console.log('页码',this.ipagination.total)
             }else{
               this.ipagination.total = 0;
             }