openatc-components 0.2.42 → 0.2.44

package/package/kisscomps/components/ExpendConfig/ExpendConfig.vue

@@ -5,14 +5,14 @@
       {{headerText}}
     </div>
     <div class="common-board-table-header">
-      <el-row :gutter="13">
-        <el-col :span="3">{{this.$t('openatccomponents.pattern.phase')}}
+      <el-row :gutter="10">
+        <el-col :span="4">{{this.$t('openatccomponents.pattern.phase')}}
         </el-col>
-        <el-col :span="11">{{this.$t('openatccomponents.pattern.property')}}
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
         </el-col>
-        <el-col :span="5">{{this.$t('openatccomponents.pattern.delaystart')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
         </el-col>
-        <el-col :span="5">{{this.$t('openatccomponents.pattern.advanceend')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.advanceend')}}
         </el-col>
       </el-row>
     </div>
@@ -21,8 +21,8 @@
       :list="list"
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="13" >
-          <el-col :span="3">
+        <el-row :gutter="10" >
+          <el-col :span="4">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
@@ -30,7 +30,7 @@
               </div>
             </el-tooltip>
         </el-col>
-          <el-col :span="11">
+          <el-col :span="8">
             <el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
@@ -40,10 +40,10 @@
               </el-option>
             </el-select>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
           </el-col>
         </el-row>

package/package/kisscomps/components/KanBan/kanban.vue

@@ -5,11 +5,11 @@
     </div>
     <div class="common-board-table-header">
       <el-row :gutter="13">
-        <el-col :span="6">{{this.$t('openatccomponents.overview.phase')}}
+        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
         </el-col>
-        <el-col :span="9">{{this.$t('openatccomponents.overview.phasesplit')}}
+        <el-col :span="10">{{this.$t('openatccomponents.overview.phasesplit')}}
         </el-col>
-        <el-col :span="9">{{this.$t('openatccomponents.detector.mode')}}
+        <el-col :span="10">{{this.$t('openatccomponents.detector.mode')}}
         </el-col>
       </el-row>
     </div>
@@ -19,7 +19,7 @@
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
         <el-row :gutter="13">
-          <el-col :span="6">
+          <el-col :span="4">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
@@ -27,10 +27,10 @@
               </div>
             </el-tooltip>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-select v-model="element.mode" class="col-content"  size="small" @change="doChange(element)" :placeholder="$t('openatccomponents.common.select')">
             <el-option
               v-for="item in modeOption"

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

@@ -557,7 +557,7 @@ export default {
       this.changeStatus()
     }
     this.setPropsToken(this.Token)
-    // await this.getPhase()
+    await this.getPhase()
     this.getFault()
     this.initData()
   },

package/package/kisscomps/components/Stages/index.vue

@@ -98,7 +98,7 @@ export default {
       type: Number,
       default: 1
     },
-    StageWidth: {
+    StageWidth: { // 图的大小样式
       type: String,
       default: '70px'
     },
@@ -122,23 +122,26 @@ export default {
       type: String,
       default: '65PX'
     },
-    showStyle: {
+    showStyle: { // 图内部方向的位置
       type: Object,
       default: () => ({
         top:'7PX',
         left:'13px'
       })
     },
-    showStyles: {
+    showStyles: { // 图内部人行道的位置
       type: Object,
       default: () => ({
         top:'5PX',
         left:'12px'
       })
     },
-    noClick: {
+    noClick: { // 图是否可以点击
       type: Boolean,
       default: false
+    },
+    showDataType: { // 图展示的数据类型：默认按阶段展示，如果传phase则按相位维度展示
+      type: String
     }
   },
   data () {
@@ -162,7 +165,11 @@ export default {
       let list = []
       if (this.crossStatusData && this.crossStatusData.stages && this.phaseList && this.phaseList.length > 0) {
         let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
-        list = ringDataModel.getStageData()
+        if (this.showDataType === 'phase') {
+          list = ringDataModel.getStageData('phase')
+        } else {
+          list = ringDataModel.getStageData()
+        }
         if (this.isShowCurrentStage) {
           this.currentStage = this.crossStatusData.current_stage
         }