openatc-components 0.0.62 → 0.0.63

package/package.json

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

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

@@ -22,7 +22,7 @@
                :modelList="modelList"
                :patternSelect="patternSelect"
                :patternAll="patternAll"
-               :crossStatusData="realtimeStage"
+               :crossStatusData="crossStatusData"
                :phaseList="phaseList"
                :specialcontrolList="specialcontrolList"
                :currModel="currModel"
@@ -297,7 +297,6 @@ export default {
       ignoredFault: [],
       untreatedFault: [],
       patternAll: [],
-      realtimeStage: {},
       patternSelect: [], // 所有方案id
       specialPage: '' // 哪一个特殊控制页面
     }
@@ -344,7 +343,6 @@ export default {
     await this.getPhase()
     this.getFault()
     this.initData()
-    this.realtimeStages()
   },
   methods: {
     setHost (host) {
@@ -381,9 +379,6 @@ export default {
         this.faultTimer = null
       }
     },
-    realtimeStages () {
-      this.realtimeStage = JSON.parse(JSON.stringify(this.statusData))
-    },
     initData () {
       this.crossStatusData = JSON.parse(JSON.stringify(this.statusData))
       let TscData = JSON.parse(JSON.stringify(this.crossStatusData))

package/src/kisscomps/components/SchemeConfig/manualControlModal/index.vue

@@ -59,7 +59,7 @@
         </div>
         <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;">
-          <Stages :crossStatusData="crossStatusData"
+          <Stages :crossStatusData="realtimeStage"
                   :phaseList="phaseList"
                   :isShowCurrentStage="false"
                   @onSelectStages="selectStages"></Stages>
@@ -149,10 +149,20 @@ export default {
       type: String
     }
   },
+  watch: {
+    crossStatusData: {
+      handler: function (val) {
+        this.realtimeStage = JSON.parse(JSON.stringify(this.crossStatusData))
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
   data () {
     return {
       basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
+      realtimeStage: {},
       manualInfo: {
         tempPatternid: '', // 控制方式手动操作的情况下的控制编号的临时值。
         tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
@@ -166,7 +176,7 @@ export default {
       stages = this.patternAll.filter(item => {
         return item.id === value
       })[0].stages
-      this.crossStatusData.stages = stages
+      this.realtimeStage.stages = stages
     },
     handleClose () {
       this.$emit('closeManualModal')

package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -296,6 +296,7 @@ export default {
       //   }
       // ],
       max: '',
+      patternCycleEqual: true,
       activeList: 'ring',
       ringCount: 1,
       ringCounts: 1,
@@ -1401,6 +1402,48 @@ export default {
     sortNumbers (a, b) {
       return a - b
     },
+    isRingCycleEqual (rings) {
+      let isequal = true
+      this.patternmsg = []
+      let maxCycle = 0
+      for (let ring of rings) {
+        if (ring.length === 0) continue
+        let cycle = 0
+        for (let r of ring) {
+          if (r.mode === 7) { // 忽略相位不计周期
+            continue
+          }
+          cycle = cycle + r.value
+        }
+        if (cycle > maxCycle && maxCycle === 0) {
+          maxCycle = cycle
+        }
+        if (cycle !== maxCycle) {
+          this.patternmsg.push(rings.id)
+          isequal = false
+        }
+      }
+      return isequal
+    },
+    checkPatternRules (rings) {
+      if (!this.isRingCycleEqual(rings)) {
+        this.patternCycleEqual = false
+      } else {
+        this.patternCycleEqual = true
+      }
+      if (!this.patternCycleEqual) {
+        let mess = `方案${this.patternmsg.toString()}中存在环周期时长不一致`
+        if (this.$i18n.locale === 'en') {
+          mess = `The cycle of each ring is inconsistent in scheme${this.patternmsg.toString()}`
+        }
+        this.$message({
+          message: mess,
+          type: 'error',
+          dangerouslyUseHTMLString: true
+        })
+        return false
+      }
+    },
     handleManualControl () {
       let submitdata = {
         control: 100,
@@ -1412,7 +1455,10 @@ export default {
       submitdata.data.offset = this.offset
       submitdata.data.cycle = this.cycle
       submitdata.data.rings = this.rings
-      this.$emit('closePhaseControl', submitdata)
+      this.checkPatternRules(submitdata.data.rings)
+      if (this.patternCycleEqual) {
+        this.$emit('closePhaseControl', submitdata)
+      }
     }
   }
 }