openatc-components 0.1.182 → 0.1.184

package/package.json

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

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

@@ -49,7 +49,7 @@
           </div>
         </div>
         <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="curTimeDiv" :style="{'left':paddingLeft }">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
@@ -188,12 +188,14 @@ export default {
     timeNumDevide () {
       if (this.contrloCycle > 0) {
         // let res = (this.contrloCycle - this.syncTime) + '/' + this.contrloCycle
-        let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
+        // let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
+        let res = this.curtime
         return res
       }
       if (this.cycles > 0) {
         // let res = (this.cycles - this.syncTime) + '/' + this.cycles
-        let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
+        // let res = this.curtime + '/' + (this.fixCycle ? this.fixCycle : this.max ? this.max : this.contrloCycle)
+        let res = this.curtime
         return res
       }
     }
@@ -801,6 +803,16 @@ export default {
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         this.fillGap(ringTeams, val)
+        // 总览添加屏障
+        let newPattern = []
+        val.map(i => {
+          newPattern.push(...i)
+        })
+        let barrier = this.step2(ringTeams, newPattern)
+        let barrierLeft = barrier.map(item => item - 0.3)
+        this.barrierList = barrierLeft.map(j => {
+          return (j / (this.max ? this.max : this.contrloCycle) * 100) + '%'
+        })
       }
       // let cycle = this.controlData.cycle
       for (let rings of val) {
@@ -1404,25 +1416,25 @@ export default {
     width: 3px;
     // height: 99px;
     z-index: 999;
-    background-color:#B9BABF;
+    background-color:black;
   }
   .curTimeLine {
     position: absolute;
     top: -10px;
-    width: 2px;
-    background-color: #299BCC;
+    width: 4px;
+    background-color: black;
   }
   .curTimeDiv {
     position: absolute;
     z-index:50;
     top: -21px;
-    margin-left: -30px;
+    margin-left: -10px;
     text-align:center;
     vertical-align: middle;
     width: 60px;
     height: 19px;
-    color:#FFFFFF;
-    background-color: #299BCC;
+    color:black;
+    // background-color: black;
   }
 }
 .ring-first {