openatc-components 0.1.181 → 0.1.183

package/package/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>
@@ -122,7 +122,7 @@ export default {
   props: {
     cycleChange: {
       type: Boolean,
-      default: false
+      default: true
     },
     stagesChange: {
       type: Array
@@ -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
       }
     }
@@ -233,6 +235,7 @@ export default {
     },
     cycleChange: {
       handler: function (val, oldVal) {
+        this.getStage()
         this.handleCurrentChange(this.patternStatusList)
         this.handleBarrierHeight()
       },
@@ -407,15 +410,27 @@ export default {
     },
     getStage () {
       if (!this.stagesChange) return
-      let stageCycleList = this.stagesChange.map(item => {
-        return item.stageSplit ? item.stageSplit : 0
+      const globalParamModel = this.$store.getters.globalParamModel
+      let pattern = globalParamModel.getParamsByType('patternList')
+      let mapAdd = pattern.map(item => item.stagesList).map(item => {
+        return item.map(val => {
+          return val.stageSplit
+        })
       })
-      let stageMaxCyle = stageCycleList.reduce((a, b) => {
-        return a + b
-      }, 0)
-      // if (this.cycleChange) {
-      //   stageMaxCyle = this.max
-      // }
+      let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let stageMaxCyle = Math.max(...maxCycle)// 每个环的周期最大值
+      if (!this.cycleChange) {
+        let stageCycleList = this.stagesChange.map(item => {
+          return item.stageSplit ? item.stageSplit : 0
+        })
+        stageMaxCyle = stageCycleList.reduce((a, b) => {
+          return a + b
+        }, 0)
+      }
       this.stageLists = this.stagesChange.map(item => {
         return {
           ...item,
@@ -1391,25 +1406,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;
+    background-color: black;
   }
 }
 .ring-first {