openatc-components 0.0.64 → 0.0.67

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -41,7 +41,7 @@ export default {
   },
   props: {
     contrloType: {
-      type: Boolean
+      type: String
     },
     localPatternList: {
       type: Array

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="overLap" v-if="checked" :style="{'width':tentative?'100%':'852px','margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 0 0 377px'}">
+<div class="overLap" v-if="checked" :style="{'width':tentative?'100%':'852px','margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40 0 327px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
             <div class="first-2">

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

@@ -12,7 +12,7 @@
 <template>
     <div class="main-patternstatus">
       <!-- 环模式true -->
-      <div v-if="!contrloType">
+      <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <div v-for="(item,index2) in list" :key="index2" :class="item.controltype===99?'direction': ''">
             <div class="first-1" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
@@ -51,7 +51,7 @@
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
-      <div v-if="contrloType">
+      <div v-if="this.contrloType === 'stage'">
         <div v-for="(list, index1) in stageLists" :key="index1">
           <!-- <div> -->
             <div class="first-1" :style="{'width':list.greenWidth,'height':'34px','background':'#7ccc66'}">
@@ -115,7 +115,7 @@ export default {
       type: Array
     },
     contrloType: {
-      type: Boolean
+      type: String
     },
     phaseList: {
       type: Array
@@ -175,7 +175,7 @@ export default {
   watch: {
     controlData: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getIndexStage()
         }
         // this.controlDatas = this.controlData
@@ -217,7 +217,7 @@ export default {
     },
     contrloType: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getStage()
         }
       },
@@ -226,7 +226,7 @@ export default {
     },
     stagesChange: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getStage()
         }
       },
@@ -261,7 +261,7 @@ export default {
     this.CrossDiagramMgr = new CrossDiagramMgr()
     this.getPedPhasePos()
     this.getBusPos()
-    if (this.contrloType) {
+    if (this.contrloType === 'stage') {
       this.getStage()
     }
   },
@@ -743,6 +743,7 @@ export default {
 <style lang="scss" scoped>
 .main-patternstatus {
   position: relative;
+  margin-bottom: 20px;
 }
 .main-patternstatus {
   position: relative;

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

@@ -357,7 +357,8 @@ export default {
         this.patternAll = res.data.data.param.patternList
         this.patternSelect = res.data.data.param.patternList.map(item => {
           return {
-            value: item.id
+            value: item.id,
+            desc: item.desc ? item.desc : '' + item.id ? item.id : ''
           }
         })
       })

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

@@ -27,7 +27,7 @@
                   <el-option
                     v-for="item in patternSelect"
                     :key="item.value"
-                    :value="item.value">
+                    :value="item.desc">
                   </el-option>
                 </el-select>
             </el-form-item>
@@ -174,10 +174,12 @@ export default {
   },
   methods: {
     changeStage (value) {
+      this.manualsStage = {}
       this.manuals = true
       let stages = []
+      let secletIds = isNaN(parseInt(value)) ? Number(value.replace(/[^0-9]/ig, '')) : value
       stages = this.patternAll.filter(item => {
-        return item.id === value
+        return item.id === secletIds
       })[0].stages
       this.manualsStage.stages = stages
     },