openatc-components 0.2.16 → 0.2.18

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

@@ -53,7 +53,7 @@
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
-      <div v-if="this.contrloType === 'stage'">
+      <div v-if="this.contrloType === 'stage'" class="ring-first">
         <div v-for="(list, index1) in stageLists" :key="index1">
           <!-- <div> -->
             <div class="first-1" :style="{'width':list.greenWidth,'height':'34px','position':'relative','background':'#7ccc66'}">
@@ -215,7 +215,7 @@ export default {
       handler: function (val, oldVal) {
         if (val && val.curTime) {
           this.curtime = val.curTime
-          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+          if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
           } else {
             this.isControl = true
@@ -244,7 +244,7 @@ export default {
         }
         if (val && val.curTime) {
           this.curtime = val.curTime
-          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+          if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
           } else {
             this.isControl = true

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

@@ -510,9 +510,9 @@ export default {
               data[key] = that.ParamsModeEn.get(0)
             }
           }
-          if (key === 'control') {
-            data[key] = that.ParamsControlEn.get(data[key])
-          }
+          // if (key === 'control') {
+          //   data[key] = that.ParamsControlEn.get(data[key])
+          // }
           if (key === 'phase') {
             for (let val of data[key]) {
               val.type = that.phaseTypeEn.get(val.type)

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

@@ -94,7 +94,6 @@
     </el-row>
     <el-row>
       <el-radio
-        style="margin-left: 30px"
         v-model="isRing"
         :label="false"
         @change="changeRing"
@@ -113,7 +112,7 @@
       <pattern-list
         :key="keyChange"
         :allPatternList="allPatternList"
-        :contrloType="!this.isRing ? 'ring' : 'stage'"
+        :contrloType="contrloType"
         :stagesChange="
           patternOne.length === 0
             ? planPattern.stagesList
@@ -390,6 +389,7 @@ export default {
         group: 'pattern'
       },
       max: '',
+      contrloType: '',
       patternCycleEqual: true,
       activeList: 'ring',
       isRing: false,
@@ -417,6 +417,25 @@ export default {
       this.handleStageData(this.planPattern.rings)
     }
     this.initData()
+    if (!this.allPatternList[0].contrloType && this.allPatternList[0].rings.length > 0) {
+      this.contrloType = 'ring'
+    } else if (!this.allPatternList[0].contrloType && this.allPatternList[0].rings.length === 0) {
+      this.contrloType = 'stage'
+    } else {
+      this.contrloType = this.allPatternList[0].contrloType
+    }
+    for (let i = 0; i < this.allPatternList.length; i++) {
+      if (this.allPatternList[i].contrloType === 'stage' || (this.isRing && !this.allPatternList[i].contrloType)) {
+        this.isRing = true
+        // this.setStageList(this.allPatternList[i].stagesList, this.allPatternList[i].id)
+      } else if (this.allPatternList[i].contrloType === 'ring' || (!this.isRing && !this.allPatternList[i].contrloType && this.allPatternList[i].rings.length > 0)) {
+        this.isRing = false
+        // this.handleStageData(this.allPatternList[i].rings)
+      } else if (this.allPatternList[i].rings.length === 0 && this.allPatternList[i].stagesList.length > 0) {
+        this.isRing = true
+        // this.setStageList(this.allPatternList[i].stagesList, this.allPatternList[i].id)
+      }
+    }
   },
   methods: {
     addStage (row) {
@@ -448,7 +467,7 @@ export default {
       }
     },
     changeRing () {
-      // this.contrloType = 'stage'
+      this.contrloType = 'ring'
       this.isRing = false
       // const globalParamModel = this.$store.getters.globalParamModel
       // let pattern = globalParamModel.getParamsByType('patternList')
@@ -468,6 +487,7 @@ export default {
       // }
     },
     changeStage () {
+      this.contrloType = 'stage'
       this.isRing = true
       this.patternOne = this.allPatternList.filter(item => {
         return item.id === Number(this.manualInfo.tempPatternid)