openatc-components 0.2.9 → 0.2.11

package/package.json

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

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

@@ -47,7 +47,8 @@ export default {
   },
   data () {
     return {
-      overlapDatas: []
+      overlapDatas: [],
+      max: ''
     }
   },
   props: {
@@ -67,6 +68,10 @@ export default {
       type: Boolean,
       default: false
     },
+    cycleChange: {
+      type: Boolean,
+      default: true
+    },
     cycle: {
       type: Number
     },
@@ -82,6 +87,13 @@ export default {
       // 深度观察监听
       deep: true
     },
+    cycleChange: {
+      handler: function (val, oldVal) {
+        this.doAdd(this.stageList, this.overlap)
+      },
+      // 深度观察监听
+      deep: true
+    },
     stageList: {
       handler: function (val, oldVal) {
         this.doAdd(this.stageList, this.overlap)
@@ -140,6 +152,15 @@ export default {
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
         findIndexs = Array.from(new Set(findIndexs))
+        if (this.cycleChange) {
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = pattern.map(item => item.cycle)
+          let cycle = Math.max(...allCycle)
+          this.max = cycle
+        } else {
+          this.max = ''
+        }
         return {
           ...item,
           peddirection: this.getPedPhasePos(item.peddirection),
@@ -150,8 +171,8 @@ export default {
               ...sta,
               direction: this.getRoad(item),
               // peddirection: this.getPedPhasePos(item.peddirection),
-              greenWidth: find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%',
-              redWidth: !find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%'
+              greenWidth: find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%',
+              redWidth: !find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%'
             }
           })
         }

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

@@ -1051,9 +1051,9 @@ export default {
           this.fillGap(ringTeams, val)
         }
         if (this.cycleChange) {
-          // const globalParamModel = this.$store.getters.globalParamModel
-          // let pattern = globalParamModel.getParamsByType('patternList')
-          const allCycle = this.patternList.map(item => item.cycle)
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = pattern.map(item => item.cycle)
           let cycle = Math.max(...allCycle)
           this.max = cycle
         } else {

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

@@ -212,7 +212,7 @@
               @onStageAdvanceendChange="onStageAdvanceendChange"
             >
             </stage-bord>
-            <div v-if="isRing" style="margin-left: 10px">
+            <div v-if="isRing" style="margin-left: 20px">
               <el-button
                 type="primary"
                 @click="

package/static/styles/index.scss

@@ -80,6 +80,6 @@
  }
  
  .components-container {
-   margin: 12px 12px;
+   margin: 30px 50px;
    position: relative;
  }

package/static/styles/schemeconfig.scss

@@ -345,9 +345,6 @@
   .optimizetype {
     color: $--color-text-primary;
   }
-  .todo {
-    float: left;
-  }
   .stage-item {
     cursor: pointer;
     width: 100%;
@@ -435,7 +432,7 @@
     margin-bottom: 13PX;
   }
   .common-board-column {
-    // max-width: unset !important;
+    max-width: unset !important;
     .el-select {
       width: 100% !important;
     }