openatc-components 0.1.176 → 0.1.178

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -9,6 +9,7 @@
         </StageStatus>
         <PatternStatus
         :showBarrier="showBarrier"
+        :controlPhase="controlPhase"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
         :contrloType="contrloType"
@@ -50,6 +51,9 @@ export default {
       type: Boolean,
       default: false
     },
+    controlPhase: {
+      type: Object
+    },
     localPatternList: {
       type: Array
     },

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

@@ -48,7 +48,7 @@
             <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
           </div>
         </div>
-        <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
+        <div v-show="(this.curtime>0 && cycle && cycle>0) || (this.curtime>0 && newCycle && newCycle>0)">
           <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#299BCC'}">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
@@ -112,6 +112,8 @@ export default {
       sidewalkPhaseData: [],
       // controlDatas: this.controlData,
       max: '',
+      fixCycle: '',
+      curtime: 0,
       stageLists: [],
       busPhaseData: [], // 公交相位数据
       patternInfo: []
@@ -125,6 +127,9 @@ export default {
     stagesChange: {
       type: Array
     },
+    controlPhase: {
+      type: Object
+    },
     contrloType: {
       type: String
     },
@@ -171,27 +176,38 @@ export default {
     paddingLeft () {
       let res = '0%'
       if (this.contrloCycle > 0) {
-        let curPercent = (this.contrloCycle - this.syncTime) / (this.max ? this.max : this.contrloCycle)
+        let curPercent = this.curtime / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
         res = curPercent * 100 + '%'
       }
       if (this.cycles > 0) {
-        let curPercent = (this.cycles - this.syncTime) / (this.max ? this.max : this.cycles)
+        let curPercent = this.curtime / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
         res = curPercent * 100 + '%'
       }
       return res
     },
     timeNumDevide () {
       if (this.contrloCycle > 0) {
-        let res = (this.contrloCycle - this.syncTime) + '/' + this.contrloCycle
+        // let res = (this.contrloCycle - this.syncTime) + '/' + this.contrloCycle
+        let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
         return res
       }
       if (this.cycles > 0) {
-        let res = (this.cycles - this.syncTime) + '/' + this.cycles
+        // let res = (this.cycles - this.syncTime) + '/' + this.cycles
+        let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
         return res
       }
     }
   },
   watch: {
+    controlPhase: {
+      handler: function (val, oldVal) {
+        if (this.controlPhase && this.controlPhase.curTime) {
+          this.curtime = this.controlPhase.curTime
+        }
+      },
+      // 深度观察监听
+      deep: true
+    },
     controlData: {
       handler: function (val, oldVal) {
         if (this.contrloType === 'stage') {
@@ -209,6 +225,8 @@ export default {
           }
           this.handleBarrierHeight()
         }
+        if (!this.controlData.curTime) return
+        this.curtime = this.controlData.curTime
       },
       // 深度观察监听
       deep: true
@@ -855,6 +873,13 @@ export default {
     },
     handleCurrentChange (val) { // 两个ring的数据
       if (val === null || val.length === 0) return
+      if (this.controlPhase.phase && this.controlPhase.phase[0].split) {
+        val.map(i => {
+          i.map(j => {
+            j.value = this.controlPhase.phase.filter(item => item.id === j.id)[0].split
+          })
+        })
+      }
       // 按环序分组
       let ringlength = []
       let ringsequence = val.map(item => {
@@ -875,6 +900,7 @@ export default {
         }) : 0
       }) : 0
       let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      this.fixCycle = cycle// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组