openatc-components 0.5.47 → 0.5.48

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -100,10 +100,10 @@
         </div>
         <!-- 车道灯 -->
         <div v-if="resetflag" class="roadwayLightIcon">
-          <div :key="item.id" v-for="item in roadwayLightData" :style="{position: 'absolute', left: item.lightx, top: item.lighty}">
+          <div :key="item.id" v-for="item in compRoadwayLightData" :style="{position: 'absolute', left: item.lightx, top: item.lighty}">
             <svg t="1773302927218" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22220" width="17.59" height="17.59"><path d="M868.018201 392.930029h-79.379804V252.956975C789.432195 101.34155 665.070503 0 512.13208 0S234.567366 102.664546 234.567366 254.279972v138.650057h-79.379804A68.266631 68.266631 0 0 0 87.450129 460.932062v495.065377a68.266631 68.266631 0 0 0 68.531231 68.002032H868.018201a68.266631 68.266631 0 0 0 68.531231-68.002032V460.932062a68.266631 68.266631 0 0 0-68.531231-68.002033z m-317.519215 328.367789v108.221133a8.996378 8.996378 0 0 1-8.996378 8.996378h-59.005655a8.996378 8.996378 0 0 1-8.996377-8.996378v-108.221133a84.407192 84.407192 0 0 1-46.834085-74.881615 85.465589 85.465589 0 0 1 170.666579 0 83.877993 83.877993 0 0 1-46.834084 74.881615z m132.299673-326.515593H341.200902V243.695998c0-79.379804 76.73381-144.735843 170.931178-144.735842s170.931178 65.091439 170.931178 144.735842z" fill="#fff" p-id="22221"></path></svg>
           </div>
-          <PhaseIconSvg v-for="(item, index) in roadwayLightData" :key="item.key + '-' + index" :Data="item" :clickMode="false" />
+          <PhaseIconSvg v-for="(item, index) in compRoadwayLightData" :key="item.key + '-' + index" :Data="item" :clickMode="false" />
         </div>
          <!-- 公交相位 -->
         <div v-if="resetflag && !isVipRoute" class="busIcon">
@@ -407,6 +407,7 @@ export default {
       comdireOverlapPhaseData: [], // 对比相同方向车道跟随相位数据后，被删减的唯一direction的数组
       busPhaseData: [], // 公交相位数据
       comdireBusPhaseData: [], //  对比相同方向公交车道数据后，被删减的唯一direction的数组
+      compRoadwayLightData: [], // 车道灯状态映射过的车道灯数据
       channelStatusMap: new Map(), // 通道实时状态映射
       channelStatusList: [], // 通道实时状态列表
       phaseDirMap: new Map(),
@@ -464,6 +465,9 @@ export default {
           this.SpecialControl(val)
         }
         this.isHasPhase = false
+        // 特殊控制拿不到状态数据，需要重置车道灯map，状态映射车道灯消失
+        this.roadwayLightStatusMap = new Map()
+        this.getRoadwayLightStatus()
         return
       }
       if (!val.phase && !this.overlapStatusList) {
@@ -789,7 +793,7 @@ export default {
         }
         curData.push(data)
       }
-      this.roadwayLightData = JSON.parse(JSON.stringify(curData))
+      this.compRoadwayLightData = JSON.parse(JSON.stringify(curData))
     },
     getBusPhaseStatus () {
       // 得到公交车道相位状态（颜色）
@@ -1211,7 +1215,7 @@ export default {
       })
       // 去掉重复方向的数据
       const ids = Array.from(new Set(this.roadwayLightData.map(item => item.id)))
-      this.roadwayLightData = ids.map(id => this.roadwayLightData.find(item => item.id === id))
+      this.compRoadwayLightData = ids.map(id => this.roadwayLightData.find(item => item.id === id))
     },
     getEffectDirectionPos () {
       this.effectDirData = []

package/package/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/LphaseIconSvg.vue

@@ -80,9 +80,14 @@ export default {
         if (this.isVipRoute) {
           this.handleStatus()
         }
-        if (this.lastType === '') {
-          if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
-          // 绿闪：绿-》灰-》绿 循环效果
+        if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
+          // type黄闪代表全部相位黄闪状态
+          // type 4绿闪、5黄闪、6 红闪
+          if (val.type !== this.lastType) {
+            // 清除旧的
+            if (this.GreenIntervalId) {
+              clearInterval(this.GreenIntervalId)
+            }
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
@@ -101,7 +106,11 @@ export default {
           }
         }
         if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== 5 && val.type !== 6 && val.type !== this.lastType) {
-          clearInterval(this.GreenIntervalId)
+          // 非闪烁状态 → 清除
+          if (this.GreenIntervalId) {
+            clearInterval(this.GreenIntervalId)
+            this.GreenIntervalId = null
+          }
           this.FlashColor = undefined
           this.lastType = ''
         }

package/package/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/phaseIconSvg.vue

@@ -100,11 +100,14 @@ export default {
         if (this.isVipRoute || this.customClick) {
           this.handleStatus()
         }
-        if (this.lastStatus === '') {
+        if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
           // type黄闪代表全部相位黄闪状态
           // type 4绿闪、5黄闪、6 红闪
-          if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
-            // 绿闪：绿-》灰-》绿 循环效果
+          if (val.type !== this.lastStatus) {
+            // 清除旧的
+            if (this.GreenIntervalId) {
+              clearInterval(this.GreenIntervalId)
+            }
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
@@ -123,7 +126,11 @@ export default {
           }
         }
         if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== 5 && val.type !== 6 && val.type !== this.lastStatus) {
-          clearInterval(this.GreenIntervalId)
+          // 非闪烁状态 → 清除
+          if (this.GreenIntervalId) {
+            clearInterval(this.GreenIntervalId)
+            this.GreenIntervalId = null
+          }
           this.FlashColor = undefined
           this.lastStatus = ''
         }

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

@@ -67,7 +67,6 @@
                         class="ring-nums"
                         :ref="'inputNumbers' + item.id"
                         size="small"
-                        controls-position="right"
                         :controls="false"
                         :min="0"
                         :step="1"
@@ -89,10 +88,8 @@
                   size="small"
                   :min="0"
                   :step="1"
-                  controls-position="right"
                   v-model.number="item.split"
                   @change="handleEdit(item)"
-                  style="width: 80px"
                 ></el-input-number>
                 </div>
                 <div style="width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">