openatc-components 0.2.4 → 0.2.5

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="(this.curtime>0 && cycle && cycle>0) || (this.curtime>0 && newCycle && newCycle>0)">
+        <div v-show="(this.curtime>0 && cycle && cycle>0 && this.isControl) || (this.curtime>0 && newCycle && newCycle>0 && this.isControl)">
           <div class="curTimeDiv" :style="{'left':paddingLeft }">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
@@ -108,6 +108,7 @@ export default {
       patternIds: this.patternId,
       newPatterns: [],
       newList: [],
+      isControl: true,
       contrloCycle: 0,
       sidewalkPhaseData: [],
       // controlDatas: this.controlData,
@@ -209,8 +210,13 @@ export default {
   watch: {
     controlPhase: {
       handler: function (val, oldVal) {
-        if (this.controlPhase && this.controlPhase.curTime) {
-          this.curtime = this.controlPhase.curTime
+        if (val && val.curTime) {
+          this.curtime = val.curTime
+          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+            this.isControl = false
+          } else {
+            this.isControl = true
+          }
         }
       },
       // 深度观察监听
@@ -233,8 +239,14 @@ export default {
           }
           this.handleBarrierHeight()
         }
-        if (!this.controlData.curTime) return
-        this.curtime = this.controlData.curTime
+        if (val && val.curTime) {
+          this.curtime = val.curTime
+          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+            this.isControl = false
+          } else {
+            this.isControl = true
+          }
+        }
       },
       // 深度观察监听
       deep: true