openatc-components 0.2.3 → 0.2.5

package/package.json

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

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

@@ -23,7 +23,7 @@
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="position: absolute; left:40px;top: -1px;">
+                    <div class="box" style="position: absolute; left:40px; width:20px; top: -1px;">
                       <div class="ring-nums">P{{item.id}}</div>
                       <div class="ring-nums">{{item.split}}</div>
                     </div>
@@ -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>
@@ -68,7 +68,7 @@
                       <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector v-if="list.direction&&list.direction.length>0"  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="list.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="position: absolute; left:41px; top:-1px;">
+                    <div class="box" style="position: absolute; left:41px;  width:20px; top:-1px;">
                       <div class="ring-nums">S{{list.key+1}}</div>
                       <div class="ring-nums">{{list.stageSplit}}</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

package/static/styles/overview.scss

@@ -64,12 +64,12 @@
     .curTimeDiv {
       position: absolute;
       z-index:50;
-      top: -21PX;
+      top: -25PX;
       font-size: 14PX;
       margin-left: -10PX;
       text-align:center;
       vertical-align: middle;
-      width: 60PX;
+      width: 25PX;
       height: 19PX;
       color: $--color-text-primary;
       // background-color: black;