openatc-components 0.1.92 → 0.1.94

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

@@ -566,6 +566,7 @@ export default {
           obj.split = split
           obj.cycle = cycle
           if (ring.sum) {
+            obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
@@ -591,13 +592,23 @@ export default {
       let nowPattern = this.localPatternList.filter(item => {
         return item.id === this.controlData.patternid
       })[0].rings
+      // 信号机忽略相位，更新最新的相位信息
+      let filterPattern = []
+      for (let i of nowPattern) {
+        for (let j of this.controlData.rings) {
+          let filterSequence = i.filter(item => j.sequence.includes(item.id))
+          if (filterSequence.length > 0) {
+            filterPattern.push(filterSequence)
+          }
+        }
+      }
       for (let rings of this.controlData.rings) {
         for (let sequ of rings.sequence) {
           let split = this.controlData.phase.filter((item) => {
             return item.id === sequ
           })[0].split
-          nowPattern.map(d => {
-            d.map(r => {
+          filterPattern.map(d => {
+            return d.map(r => {
               if (r.id === sequ) {
                 r.value = split
               }
@@ -605,7 +616,7 @@ export default {
           })
         }
       }
-      this.handleOverViewChange(nowPattern)
+      this.handleOverViewChange(filterPattern)
     },
     handleBarrierHeight () { // 屏障高度
       if (!this.patternInfo) return
@@ -796,6 +807,7 @@ export default {
           obj.split = split
           obj.cycle = cycle
           if (ring.sum) {
+            obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
@@ -1002,6 +1014,7 @@ export default {
             }
           }
           obj.split = split
+          obj.cycle = cycle
           if (ring.sum) {
             obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
@@ -1340,7 +1353,7 @@ export default {
   height: 34px;
 }
 .direction {
-  opacity: 0.6;
+  filter: brightness(70%);
 }
 .mask {
   background: rgb(242, 121, 121) !important;