openatc-components 0.1.43 → 0.1.45

package/package.json

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

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

@@ -133,7 +133,7 @@
                     :overlap="overlap"
                     :checked="true"
                     :tentative="true"
-                    :cycle="patternOne.length===0?planPattern.cycle:patternOne[0].cycle"
+                    :cycle="overLapCycle"
                     >
                     </over-lap>
                 </el-col>
@@ -200,6 +200,7 @@ export default {
     return {
       stagesList: [],
       phaseRings: [],
+      overLapCycle: 0,
       options: {
         group: 'pattern'
       },
@@ -470,6 +471,7 @@ export default {
             let stageItem = this.getStageItem(stage, rings, i)
             stagesList.push(JSON.parse(JSON.stringify(stageItem)))
           }
+          this.overLapCycle = stagesList.reduce((prev, curr) => prev + parseInt(curr.split), 0)
           this.stagesList = JSON.parse(JSON.stringify(stagesList))
         }
       }
@@ -576,25 +578,25 @@ export default {
       }
       return maxCycle
     },
-    checkPatternRules (rings) {
-      if (!this.isRingCycleEqual(rings)) {
-        this.patternCycleEqual = false
-      } else {
-        this.patternCycleEqual = true
-      }
-      if (!this.patternCycleEqual) {
-        let mess = `方案中存在环周期时长不一致`
-        if (this.$i18n.locale === 'en') {
-          mess = `Inconsistent loop cycle durations exist in the scheme`
-        }
-        this.$message({
-          message: mess,
-          type: 'error',
-          dangerouslyUseHTMLString: true
-        })
-        return false
-      }
-    },
+    // checkPatternRules (rings) {
+    //   if (!this.isRingCycleEqual(rings)) {
+    //     this.patternCycleEqual = false
+    //   } else {
+    //     this.patternCycleEqual = true
+    //   }
+    //   if (!this.patternCycleEqual) {
+    //     let mess = `方案中存在环周期时长不一致`
+    //     if (this.$i18n.locale === 'en') {
+    //       mess = `Inconsistent loop cycle durations exist in the scheme`
+    //     }
+    //     this.$message({
+    //       message: mess,
+    //       type: 'error',
+    //       dangerouslyUseHTMLString: true
+    //     })
+    //     return false
+    //   }
+    // },
     handleManualControl () {
       let submitdata = {
         control: 100,
@@ -610,7 +612,7 @@ export default {
       }
       submitdata.data.offset = this.offset
       submitdata.data.rings = this.rings
-      this.checkPatternRules(submitdata.data.rings)
+      // this.checkPatternRules(submitdata.data.rings)
       if (this.patternCycleEqual) {
         this.$emit('closePhaseControl', submitdata)
       }