isv-robot 2 years ago
parent
commit
924abbaa39
1 changed files with 13 additions and 6 deletions
  1. 13 6
      src/views/dashboard-screen/jryl/index.vue

+ 13 - 6
src/views/dashboard-screen/jryl/index.vue

@@ -117,21 +117,28 @@ export default {
         if (index > 0) {
           sealingBeforeItem = sealingData[index - 1][1]
           sealingStart = sealingBeforeItem.map((d) => {
-            return d + gapPerSize
+            if (d > 0) {
+              return d + gapPerSize
+            } else {
+              return d
+            }
           })
           sealingEnd = sealingBeforeItem.map((d, dIndex) => {
-            return d + gapPerSize + item[dIndex]
+            if (d > 0) {
+              return d + gapPerSize + item[dIndex]
+            } else {
+              return d + item[dIndex]
+            }
           })
         }
         sealingData[index] = [sealingStart, sealingEnd]
       })
 
-      console.log('sealingData1', sealingData)
       // 三条数据变两条
       sealingData = JSON.parse(JSON.stringify(sealingData))
       sealingData.forEach((item, index) => {
-        const start = item[0].splice(0, 2)
-        const end = item[1].splice(0, 2)
+        const start = item[0].splice(0, data[0].length)
+        const end = item[1].splice(0, data[0].length)
         sealingData[index] = [start, end]
       })
       console.log('sealingData2', sealingData)
@@ -425,7 +432,7 @@ export default {
               //     return 'ssss'
               // }
             },
-            'symbolPosition': 'start',
+            'symbolPosition': 'end',
             'data': sealingData[1][0]
           },
           { // 封口4