历史记录时间合并错行问题修改

src/views/module_interLock/interlockHistoryData/InterlockHistoryList.vue

@@ -502,7 +502,7 @@
               let rowSpan3 = 0
               let rowSpan4 = 0
               let interlockname = ''
-              let interlocknamePD = ''
+              let interlocknameShiJian = ''
               let interlocknameZhuangTai = ''
               let interlocknameJiBie = ''
               let interlockStatus = ''
@@ -523,7 +523,7 @@
                   summaryidMingCheng = that.dataSource[i].summaryid
                   rowSpan++
                 } else {
-                  if(interlockname == that.dataSource[i].interlockname && tagTime == that.dataSource[i].tagTime && 
+                  if(interlockname == that.dataSource[i].interlockname && tagTimeMingCheng == that.dataSource[i].tagTime && 
                       summaryidMingCheng == that.dataSource[i].summaryid){
                     that.dataSource[i].rowSpan = 0
                     rowSpan++
@@ -537,7 +537,6 @@
                   }
                 }
                 // 联锁状态合并
-                // 联锁状态合并
                 if (interlockStatus == '') {
                   that.dataSource[i].rowSpan2 = 0
                   interlockStatus = that.dataSource[i].interlockStatus
@@ -591,14 +590,14 @@
                   // if (that.dataSource[i].tagTime != '') {
                   //   console.log('走不走这步')
                   //   tagTime = that.dataSource[i].tagTime
-                  //   interlocknamePD = that.dataSource[i].interlockname
+                  //   interlocknameShiJian = that.dataSource[i].interlockname
                   //   rowSpan4++
                   // }
                   tagTime = that.dataSource[i].tagTime
-                  interlocknamePD = that.dataSource[i].interlockname
+                  interlocknameShiJian = that.dataSource[i].interlockname
                   rowSpan4++
                 } else {
-                  if(tagTime == that.dataSource[i].tagTime && interlocknamePD == that.dataSource[i+1].interlockname) {
+                  if(tagTime == that.dataSource[i].tagTime && interlocknameShiJian == that.dataSource[i].interlockname) {
                     // console.log(11111)
                     that.dataSource[i].rowSpan4 = 0
                     rowSpan4++
@@ -608,7 +607,7 @@
                     that.dataSource[i].rowSpan4 = 0
                     rowSpan4 = 1
                     tagTime = that.dataSource[i].tagTime
-                    interlocknamePD = that.dataSource[i].interlockname
+                    interlocknameShiJian = that.dataSource[i].interlockname
                   }
 
                 }