openatc-components 0.0.32 → 0.0.35

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

@@ -46,7 +46,7 @@
         <div v-for="(item, index) in barrierList" :key="index + '1'">
           <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
         </div>
-        <div v-show="syncTime && cycle && cycle > 0">
+        <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
           <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#409EFF'}">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
@@ -152,6 +152,10 @@ export default {
   computed: {
     paddingLeft () {
       let res = '0%'
+      if (this.newCycle && this.newCycle > 0) {
+        let curPercent = (this.newCycle - this.syncTime) / this.newCycle
+        res = curPercent * 100 + '%'
+      }
       if (this.cycle && this.cycle > 0) {
         let curPercent = (this.cycle - this.syncTime) / this.cycle
         res = curPercent * 100 + '%'
@@ -159,8 +163,14 @@ export default {
       return res
     },
     timeNumDevide () {
-      let res = (this.cycle - this.syncTime) + '/' + this.cycle
-      return res
+      if (this.newCycle && this.newCycle > 0) {
+        let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
+        return res
+      }
+      if (this.cycle && this.cycle > 0) {
+        let res = (this.cycle - this.syncTime) + '/' + this.cycle
+        return res
+      }
     }
   },
   watch: {
@@ -171,6 +181,7 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.handlePatternData()
+        this.handleBarrierHeight()
       },
       // 深度观察监听
       deep: true
@@ -243,7 +254,7 @@ export default {
       setTimeout(() => {
         this.handleCurrentChange(this.patternStatusList)
         this.handleBarrierHeight()
-      }, 200)
+      }, 400)
     } else {
       this.handlePatternData()
     }
@@ -384,6 +395,7 @@ export default {
       })
     },
     handlePatternData () {
+      if (!this.controlData) return
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -154,7 +154,7 @@ export default {
       type: Array
     },
     planPattern: {
-      type: Array
+      type: Object
     },
     allPatternList: {
       type: Array
@@ -574,7 +574,7 @@ export default {
       }
       if (!this.realtimeStatusModalvisible) {
         console.log(control)
-        this.$emit('patternCommit', control)
+        this.$emit('patternCommitCallback', control)
         return
       }
       this.lockScreen()
@@ -695,7 +695,7 @@ export default {
     },
     closePhaseControl (controldata) {
       if (!this.realtimeStatusModalvisible) {
-        this.$emit('closePhaseControl', controldata)
+        this.$emit('patternCommitCallback', controldata)
         return
       }
       this.lockScreen()