openatc-components 0.1.183 → 0.1.185

package/package.json

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

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

@@ -803,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) {
@@ -1406,26 +1416,26 @@ export default {
     width: 3px;
     // height: 99px;
     z-index: 999;
-    background-color:black;
-  }
-  .curTimeLine {
-    position: absolute;
-    top: -10px;
-    width: 4px;
-    background-color: black;
-  }
-  .curTimeDiv {
-    position: absolute;
-    z-index:50;
-    top: -21px;
-    margin-left: -10px;
-    text-align:center;
-    vertical-align: middle;
-    width: 60px;
-    height: 19px;
-    color:#FFFFFF;
-    background-color: black;
+    background-color:#B9BABF;
   }
+  // .curTimeLine {
+  //   position: absolute;
+  //   top: -10px;
+  //   width: 4px;
+  //   background-color: black;
+  // }
+  // .curTimeDiv {
+  //   position: absolute;
+  //   z-index:50;
+  //   top: -21px;
+  //   margin-left: -10px;
+  //   text-align:center;
+  //   vertical-align: middle;
+  //   width: 60px;
+  //   height: 19px;
+  //   color:black;
+  //   // background-color: black;
+  // }
 }
 .ring-first {
   margin-top: 1px;

package/static/styles/overview.scss

@@ -44,7 +44,26 @@
     position: relative;
     overflow-x: auto;
   }
-
+  .main-patternstatus{
+    .curTimeLine {
+      position: absolute;
+      top: -10px;
+      width: 3px;
+      background-color: $--color-text-primary;
+    }
+    .curTimeDiv {
+      position: absolute;
+      z-index:50;
+      top: -21px;
+      margin-left: -10px;
+      text-align:center;
+      vertical-align: middle;
+      width: 60px;
+      height: 19px;
+      color:$--color-text-primary;
+      // background-color: black;
+    }
+  }
   .pattern-status {
     min-height: 200PX;
     margin-left: 20PX;