openatc-components 0.2.7 → 0.2.8

package/package/kisscomps/components/StageBord/StageBord.vue

@@ -1,20 +1,9 @@
-/**
- * Copyright (c) 2020 kedacom
- * OpenATC is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- **/
 <template>
 <div class="components-container board">
   <div class="common-board-column">
     <div class="common-board-column-header" style="position:relative">
       <span>{{$t('openatccomponents.pattern.stage')+(subIndex+1)}}</span>
-      <span v-if="isRing" style="position: absolute;right: 0;">
+      <span v-if="this.contrloType === 'stage'" style="position: absolute;right: 0;">
         <el-button type="primary" @click="deleteStage(subIndex)" icon="el-icon-close"></el-button>
       </span>
     </div>
@@ -28,8 +17,7 @@
           </el-col>
           <el-col :span="12">
             <el-input-number
-              v-if="isRing"
-              class="stage-value"
+              v-if="this.contrloType === 'stage'"
               :controls="false"
               size="small"
               :disabled="true"
@@ -37,8 +25,7 @@
               v-model.number="stage.stageSplit">
             </el-input-number>
             <el-input-number
-              v-if="!isRing"
-              class="stage-value"
+              v-if="this.contrloType === 'ring' || !this.contrloType"
               :controls="false"
               size="small"
               v-model.number="stage.split"
@@ -53,74 +40,57 @@
             {{this.$t('openatccomponents.pattern.phase')}}
           </el-col>
           <el-col :span="12">
-            <SelectCrossPhase
-            v-if="isRing"
-            type="phases"
-            :pattern="false"
-            :phaseOption="coordphaseOption"
-            multiple
-            :row="stage"
-            style="width:100%;">
-          </SelectCrossPhase>
-            <!-- <el-select v-if="isRing" v-model="stage.phases" multiple :placeholder="$t('openatccomponents.common.select')">
+            <el-select v-if="this.contrloType === 'stage'" v-model="stage.stages" multiple :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
                 :key="item.value"
                 :label="$t('openatccomponents.pattern.phase') + item.value"
                 :value="item.value">
               </el-option>
-            </el-select> -->
+            </el-select>
             <el-input
-              v-if="!isRing"
-              class="stage-value"
+              v-if="this.contrloType === 'ring' || !this.contrloType"
               size="small"
-              :value="stage.phases.join(',')"
+              :value="stage.stageKanban?stage.stageKanban.join(','):''"
               ref="type"
-              style="width:100%;align:left;"
               :disabled="true">
             </el-input>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="isRing">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.green')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
-              class="stage-value"
               size="small"
               :controls="false"
-              :min="0"
               v-model.number="stage.green"
               @change="stageSplitChange">
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="isRing">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.yellow')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
-              class="stage-value"
               size="small"
               :controls="false"
-              :min="0"
               v-model.number="stage.yellow"
               @change="stageSplitChange">
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="isRing">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.red')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
-              class="stage-value"
               size="small"
               :controls="false"
-              :min="0"
               v-model.number="stage.red"
               @change="stageSplitChange">
             </el-input-number>
@@ -133,12 +103,11 @@
 </template>
 <script>
 import draggable from 'vuedraggable'
-import SelectCrossPhase from '../SelectCrossPhase/index.vue'
+
 export default {
-  name: 'stage-bord',
+  name: 'stage-board',
   components: {
-    draggable,
-    SelectCrossPhase
+    draggable
   },
   data () {
     return {
@@ -158,8 +127,8 @@ export default {
         return []
       }
     },
-    isRing: {
-      type: Boolean
+    contrloType: {
+      type: String
     },
     options: {
       type: Object,
@@ -172,7 +141,7 @@ export default {
       default () {
         return {
           split: 0,
-          // stages: [],
+          stages: [],
           phases: [],
           stageSplit: 0,
           green: 0,
@@ -193,30 +162,23 @@ export default {
   created () {
   },
   watch: {
-    // stage: {
-    //   handler: function () {
-    //     if (this.isRing) {
-    //       let n = this.rowIndex
-    //       const globalParamModel = this.$store.getters.globalParamModel
-    //       let pattern = globalParamModel.getParamsByType('patternList')[n]
-    //       globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-    //     }
-    //   },
-    //   deep: true
-    // }
+    stage: {
+      handler: function () {
+        if (this.contrloType) {
+          let n = this.rowIndex
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')[n]
+          globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
+        }
+      },
+      deep: true
+    }
   },
   mounted () {
   },
   methods: {
     deleteStage (index) {
       this.stageInfo.splice(index, 1)
-      this.stageInfo.forEach((item, index) => {
-        item.key = index
-      })
-      // let n = this.rowIndex
-      // const globalParamModel = this.$store.getters.globalParamModel
-      // let pattern = globalParamModel.getParamsByType('patternList')[n]
-      // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
     },
     getMaxCycle (pattern) {
       let rings = pattern.stagesList
@@ -265,23 +227,16 @@ export default {
     width: 100%;
     height: auto;
     margin: 5px 0;
-    text-align: left;
     line-height: 40px;
+    // color: #FFFFFF;
     padding: 1px 1px;
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #299BCC;
     border-color: #299BCC;
-    color: #FFFFFF;
-  }
-  .stage-value {
-    text-align: left;
-    width: 100%;
+    // color: #FFFFFF;
   }
 </style>
 <style lang="scss">
-.stage-value .el-input__inner {
-    text-align: center;
-  }
 </style>

package/package/kisscomps/components/patternList/patternList.vue

@@ -11,7 +11,6 @@
     :patternList="patternList"
     :controlPhase="controlPhase"
     :showCondition="showCondition"
-    :allPatternList="allPatternList"
     :localPatternList="localPatternList"
     :phaseList="phaseList"
     :showBarrier="showBarrier"
@@ -508,9 +507,6 @@ export default {
       type: Boolean,
       default: false
     },
-    allPatternList: {
-      type: Array
-    },
     controlPhase: {
       type: Object
     },