openatc-components 0.1.168 → 0.1.170

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

@@ -255,7 +255,12 @@ export default {
         this.comdireBusPhaseData = JSON.parse(JSON.stringify(this.busPhaseData))
         if (val.control === 1 || val.control === 2 || val.control === 3) {
           // 黄闪、全红、关灯属于特殊控制，优先级最高，直接改变灯色，不用判断phase里的type，也不需要考虑跟随相位的灯色优先级
-          this.SpecialControl(val)
+          if (val.control === 1) {
+            this.getYellowFlashColor()
+          } else {
+            this.SpecialControl(val)
+          }
+          this.isHasPhase = false
           return
         }
         if (!val.phase && !this.overlapStatusList) {
@@ -337,7 +342,7 @@ export default {
       crossType: '', // 路口底图类型
       isLoaded: false, // 是否成功加载底图
       isHasPhase: true, // 是否有相位状态数据
-      phaseControlColorMap: new Map([['黄闪', '#f7b500'], ['全红', '#ff2828'], ['关灯', '#828282'], ['默认', '#fff'], ['方向锁定', '#fff']]),
+      phaseControlColorMap: new Map([['全红', '#ff2828'], ['关灯', '#828282'], ['默认', '#fff'], ['方向锁定', '#fff']]),
       sidewalkPhaseData: [], // 行人相位
       overlapsidewalkPhaseData: [], // 行人跟随相位
       resetflag: true, // 离线后，控制行人相位、车道相位reset标识
@@ -381,15 +386,12 @@ export default {
     },
     SpecialControl (data) {
       switch (data.control) {
-        case 1: this.handleSpecialControlStatus('黄闪')
-          break
         case 2: this.handleSpecialControlStatus('全红')
           break
         case 3: this.handleSpecialControlStatus('关灯')
           break
         default: this.handleSpecialControlStatus('默认')
       }
-      this.isHasPhase = false
     },
     handleDefaultStatus () {
       // 恢复默认状态
@@ -467,6 +469,17 @@ export default {
         this.phaseStatusMap.set(phaseId, phaseInfo)
       })
     },
+    getYellowFlashColor () {
+      let curLanePhaseData = []
+      for (let i = 0; i < this.LanePhaseData.length; i++) {
+        const data = {
+          ...this.LanePhaseData[i],
+          type: '黄闪'
+        }
+        curLanePhaseData.push(data)
+      }
+      this.LanePhaseData = JSON.parse(JSON.stringify(curLanePhaseData))
+    },
     getPhaseStatus () {
       // 得到车道相位状态（颜色）
       this.comdirePhaseData = []

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

@@ -62,21 +62,25 @@ export default {
     return {
       defaultColor: '#fff', // 默认状态颜色
       GreenFlashColor: undefined,
+      GreenColor: '#77fb65',
+      YellowColor: '#f7b500',
       lastType: ''
     }
   },
   watch: {
     Data: {
       handler: function (val) {
-        if (val.type === 4 && this.lastType === '') {
-          // 绿闪：绿-》灰-》绿 循环效果
-          this.GreenFlashColor = '#77fb65'
-          this.GreenIntervalId = setInterval(() => {
-            this.GreenFlashColor = !this.GreenFlashColor || this.GreenFlashColor === '#828282' ? '#77fb65' : '#828282'
-          }, 500)
-          this.lastType = val.type
+        if (this.lastType === '') {
+          if (val.type === 4 || val.type === '黄闪') {
+            // 绿闪：绿-》灰-》绿 循环效果
+            this.GreenFlashColor = val.type === 4 ? this.GreenColor : this.YellowColor
+            this.GreenIntervalId = setInterval(() => {
+              this.GreenFlashColor = !this.GreenFlashColor || this.GreenFlashColor === '#828282' ? (val.type === 4 ? this.GreenColor : this.YellowColor) : '#828282'
+            }, 500)
+            this.lastType = val.type
+          }
         }
-        if (this.GreenIntervalId && val.type !== 4 && val.type !== this.lastType) {
+        if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== this.lastType) {
           clearInterval(this.GreenIntervalId)
           this.GreenFlashColor = undefined
           this.lastType = ''