openatc-components 0.1.171 → 0.1.173

package/package/kisscomps/components/Channelization/Channelization.vue

@@ -491,6 +491,7 @@ export default {
       for (let i = 0; i < this.LanePhaseData.length; i++) {
         const data = {
           ...this.LanePhaseData[i],
+          type: '黄闪',
           control: 1
         }
         curLanePhaseData.push(data)
@@ -502,6 +503,7 @@ export default {
       for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
         const data = {
           ...this.sidewalkPhaseData[i],
+          pedtype: '黄闪',
           control: 1
         }
         curPedStatus.push(data)

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue

@@ -349,12 +349,12 @@ export default {
         if (this.UsageMode === 'show') {
           if (this.lastType === '') {
           // 绿闪：绿-》灰-》绿 循环效果
-            if (val.type === 4 || val.control === 1) {
+            if (val.type === 4 || val.type === '黄闪') {
               let highlightColor = ''
               if (val.type === 4) {
                 highlightColor = this.GreenColor
               }
-              if (val.control === 1) {
+              if (val.type === '黄闪') {
                 highlightColor = this.YellowColor
               }
               this.FlashColor = highlightColor
@@ -370,7 +370,7 @@ export default {
           if (
             this.GreenIntervalId &&
           val.type !== 4 &&
-          val.control !== 1 &&
+          val.type !== '黄闪' &&
           val.type !== this.lastType
           ) {
             clearInterval(this.GreenIntervalId)

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/pedroadIconSvg.vue

@@ -61,6 +61,8 @@ export default {
       Viewbox: [0, 0, 206, 22],
       showDefaultColor: '#fff', // 默认状态颜色
       FlashColor: undefined,
+      GreenColor: '#77fb65',
+      YellowColor: '#f7b500',
       lastType: ''
     }
   },
@@ -87,23 +89,21 @@ export default {
           this.item.angle = val.angle
         }
         if (this.UsageMode === 'show') {
-          if (!val.pedtype) return
           if (this.lastType === '') {
-            if (val.pedtype === 4 || val.control === 1) {
-              let highlightColor = ''
+            if (val.pedtype === 4 || val.pedtype === '黄闪') {
+              let flashLightColor = ''
               if (val.pedtype === 4) {
-                highlightColor = this.GreenColor
+                flashLightColor = this.GreenColor
               }
-              if (val.control === 1) {
-                highlightColor = this.YellowColor
+              if (val.pedtype === '黄闪') {
+                flashLightColor = this.YellowColor
               }
-              this.FlashColor = highlightColor
+              this.FlashColor = flashLightColor
               // 绿闪：绿-》灰-》绿 循环效果
-              this.FlashColor = '#7bd66b'
               this.GreenIntervalId = setInterval(() => {
                 this.FlashColor =
               !this.FlashColor || this.FlashColor === '#828282'
-                ? highlightColor
+                ? flashLightColor
                 : '#828282'
               }, 500)
               this.lastType = val.pedtype
@@ -112,7 +112,7 @@ export default {
           if (
             this.GreenIntervalId &&
           val.pedtype !== 4 &&
-          val.control !== 1 &&
+          val.pedtype !== '黄闪' &&
           val.pedtype !== this.lastType
           ) {
             clearInterval(this.GreenIntervalId)

package/package/kisscomps/components/IntersectionMap/crossDirection/baseImg/SidewalkSvg.vue

@@ -1103,14 +1103,13 @@ export default {
   watch: {
     Data: {
       handler: function (val) {
-        if (!val.pedtype) return
         if (this.lastType === '') {
-          if (val.pedtype === 4 || val.control === 1) {
+          if (val.pedtype === 4 || val.pedtype === '黄闪') {
             let highlightColor = ''
             if (val.pedtype === 4) {
               highlightColor = this.GreenColor
             }
-            if (val.control === 1) {
+            if (val.pedtype === '黄闪') {
               highlightColor = this.YellowColor
             }
             this.FlashColor = highlightColor
@@ -1127,7 +1126,7 @@ export default {
         if (
           this.GreenIntervalId &&
           val.pedtype !== 4 &&
-          val.control !== 1 &&
+          val.pedtype !== '黄闪' &&
           val.pedtype !== this.lastType
         ) {
           clearInterval(this.GreenIntervalId)

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

@@ -475,6 +475,7 @@ export default {
       for (let i = 0; i < this.LanePhaseData.length; i++) {
         const data = {
           ...this.LanePhaseData[i],
+          type: '黄闪',
           control: 1
         }
         curLanePhaseData.push(data)
@@ -486,6 +487,7 @@ export default {
       for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
         const data = {
           ...this.sidewalkPhaseData[i],
+          pedtype: '黄闪',
           control: 1
         }
         curPedStatus.push(data)
@@ -497,6 +499,7 @@ export default {
       for (let i = 0; i < this.busPhaseData.length; i++) {
         const data = {
           ...this.busPhaseData[i],
+          type: '黄闪',
           control: 1
         }
         curBusLanePhaseData.push(data)

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

@@ -71,13 +71,13 @@ export default {
     Data: {
       handler: function (val) {
         if (this.lastType === '') {
-          if (val.type === 4 || val.control === 1) {
+          if (val.type === 4 || val.type === '黄闪') {
           // 绿闪：绿-》灰-》绿 循环效果
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
             }
-            if (val.control === 1) {
+            if (val.type === '黄闪') {
               highlightColor = this.YellowColor
             }
             this.FlashColor = highlightColor
@@ -87,7 +87,7 @@ export default {
             this.lastType = val.type
           }
         }
-        if (this.GreenIntervalId && val.type !== 4 && val.control !== 1 && val.type !== this.lastType) {
+        if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== this.lastType) {
           clearInterval(this.GreenIntervalId)
           this.FlashColor = undefined
           this.lastType = ''

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

@@ -64,33 +64,33 @@ export default {
       FlashColor: undefined,
       GreenColor: '#77fb65',
       YellowColor: '#f7b500',
-      lastType: ''
+      lastStatus: ''
     }
   },
   watch: {
     Data: {
       handler: function (val) {
-        if (this.lastType === '') {
-          if (val.type === 4 || val.control === 1) {
+        if (this.lastStatus === '') {
+          if (val.type === 4 || val.type === '黄闪') {
             // 绿闪：绿-》灰-》绿 循环效果
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
             }
-            if (val.control === 1) {
+            if (val.type === '黄闪') {
               highlightColor = this.YellowColor
             }
             this.FlashColor = highlightColor
             this.GreenIntervalId = setInterval(() => {
               this.FlashColor = !this.FlashColor || this.FlashColor === '#828282' ? highlightColor : '#828282'
             }, 500)
-            this.lastType = val.type
+            this.lastStatus = val.type
           }
         }
-        if (this.GreenIntervalId && val.type !== 4 && val.control !== 1 && val.type !== this.lastType) {
+        if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== this.lastStatus) {
           clearInterval(this.GreenIntervalId)
           this.FlashColor = undefined
-          this.lastType = ''
+          this.lastStatus = ''
         }
       },
       deep: true

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

@@ -70,13 +70,13 @@ export default {
     Data: {
       handler: function (val) {
         if (this.lastType === '') {
-          if (val.type === 4 || val.control === 1) {
+          if (val.type === 4 || val.type === '黄闪') {
             // 绿闪：绿-》灰-》绿 循环效果
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
             }
-            if (val.control === 1) {
+            if (val.type === '黄闪') {
               highlightColor = this.YellowColor
             }
             this.FlashColor = highlightColor
@@ -86,7 +86,7 @@ export default {
             this.lastType = val.type
           }
         }
-        if (this.GreenIntervalId && val.type !== 4 && val.control !== 1 && val.type !== this.lastType) {
+        if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== this.lastType) {
           clearInterval(this.GreenIntervalId)
           this.FlashColor = undefined
           this.lastType = ''