openatc-components 0.0.78 → 0.0.81

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

@@ -187,6 +187,7 @@ export default {
     },
     phaseList: {
       handler: function (val, oldVal) {
+        this.handlePatternData()
         this.getPedPhasePos()
         this.getBusPos()
         this.getStage()

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

@@ -155,12 +155,12 @@ export default {
     ip: {
       type: String
     },
-    allPatternList: {
-      type: Array
-    },
-    overlap: {
-      type: Array
-    },
+    // allPatternList: {
+    //   type: Array
+    // },
+    // overlap: {
+    //   type: Array
+    // },
     platform: {
       type: String
     },
@@ -189,6 +189,8 @@ export default {
       crossStatusData: null,
       controlData: {},
       control: '',
+      allPatternList: [],
+      overlap: [],
       sidewalkPhaseData: [],
       list: [{
         iconClass: 'model',
@@ -351,6 +353,8 @@ export default {
       // 获取路口信息
       getIntersectionInfo(agentid).then(res => {
         this.patternAll = res.data.data.param.patternList
+        this.allPatternList = res.data.data.param.patternList
+        this.overlap = res.data.data.param.overlaplList
         this.patternSelect = res.data.data.param.patternList.map(item => {
           return {
             value: item.id,

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div id="intersection-stages" class="intersection-stages">
+  <div id="intersection-stages" class="intersection-stages" :style="stageStyle">
     <!-- <div class="cross-content"><div style="float: left;" class="cross-name">{{'当前阶段'}}:</div> -->
       <div style="margin-left: 10PX;" >
         <div style="width: 100%; height: auto;">
@@ -40,6 +40,7 @@
                   </div>
                   <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 3"></i>
                   <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 5"></i>
+                  <div v-if="presetIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
                 </div>
               </div>
             </div>
@@ -71,6 +72,18 @@ export default {
       type: Array,
       default: () => []
     },
+    presetText: {
+      type: String,
+      default: '预置'
+    },
+    presetIndex: {
+      type: Number,
+      default: -1
+    },
+    zoom: {
+      type: Number,
+      default: 1
+    },
     StageWidth: {
       type: String,
       default: '70px'
@@ -104,6 +117,11 @@ export default {
         }
       }
       return list
+    },
+    stageStyle () {
+      return {
+        zoom: this.zoom
+      }
     }
   },
   methods: {