openatc-components 0.1.79 → 0.1.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -826,6 +826,17 @@ export default {
           return k.id
         })
       })
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.value + (val.sum ? val.sum : 0)
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -923,7 +934,9 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        this.fillGap(ringTeams, val)
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         this.barrierList = barrier.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
@@ -993,14 +1006,14 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
           obj.mode = ring.mode
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示

package/src/kisscomps/components/SchemeConfig/priorityControl/index.vue

@@ -182,14 +182,10 @@ export default {
         control: 24,
         delay: this.manualInfo.delay,
         duration: this.manualInfo.duration,
-        data: {
-          type: this.manualInfo.type,
-          phase: this.manualInfo.phase,
-          level: this.manualInfo.level
-        }
-
+        type: this.manualInfo.type,
+        phase: this.manualInfo.phase,
+        level: this.manualInfo.level
       }
-      console.log(submitdata, 'submitdata')
       this.$emit('closePhaseControl', submitdata)
     }
   }

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/static/styles/channelizatioon.scss

@@ -74,7 +74,6 @@
           .lock-map {
             cursor: pointer;
             margin: 0 5PX;
-            font-size: 18PX;
           }
           .el-icon-lock {
             color: $--color-text-secondary;