openatc-components 0.1.29 → 0.1.30

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

@@ -500,6 +500,20 @@ export default {
             }
             return item.id === ring.id
           })[0]
+          let peddirections = []
+          for (let walk of this.sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+            // if (stg === walk.phaseid) {
+              let objs = {}
+              objs.name = walk.name
+              objs.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(objs)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            // }
+            }
+          }
           if (ring.desc) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
@@ -508,12 +522,23 @@ export default {
               }
             })
           } else {
-            obj.direction = currPhase.direction.map(item => {
-              return {
-                id: item,
-                color: '#454545'
-              }
-            })
+            if (currPhase.direction.length > 0) {
+              obj.direction = currPhase.direction.map(item => {
+                return {
+                  id: item,
+                  peddirection: peddirections,
+                  color: '#454545'
+                }
+              })
+            } else {
+              obj.direction = [
+                {
+                  id: '',
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              ]
+            }
           }
           obj.split = split
           if (ring.sum) {
@@ -524,22 +549,6 @@ export default {
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
-          // obj.peddirection = currPhase.peddirection
-          let peddirections = []
-          for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
-              }
-            // }
-            }
-          }
-          obj.peddirection = peddirections
           // 忽略相位不显示
           let mode = ring.mode
           if (mode !== 7) { // 忽略相位不显示
@@ -624,7 +633,7 @@ export default {
               }
             })
           } else {
-            if (obj.direction && obj.direction > 0) {
+            if (currPhase.direction > 0) {
               obj.direction = currPhase.direction.map(item => {
                 return {
                   id: item,

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -12,7 +12,7 @@
 <template>
   <div :style="{position: 'reletive'}">
     <!-- <div> -->
-      <div :style="{position: 'absolute', left: Data?Data.left:'2px', top: Data?Data.top:0}">
+      <div :style="{position: 'absolute', left: Data?Data.left:0, top: Data?Data.top:0}">
         <svg
           t="1545378648902"
           class="icon"
@@ -308,7 +308,7 @@
           </g>
         </svg>
       </div>
-      <div :style="{position: 'absolute', left: Data?Data.left:'2px', top: Data?Data.top:0}">
+      <div :style="{position: 'absolute', left: Data?Data.left:0, top: Data?Data.top:0}">
         <svg
             :width="Width"
             :height="Height"
@@ -862,10 +862,10 @@ export default {
     refreshShows (showlist) {
       for (let i = 0; i < 16; i++) {
         if (this.peoplestatus[i].isshow) {
-          this.peoplestatusstatus[i].isshow = false
+          this.peoplestatus[i].isshow = false
         }
       }
-      if (!showlist[0].peddirection) return
+      if (showlist[0].peddirection.length === 0) return
       for (let i = 0; i < showlist[0].peddirection.length; i++) {
         for (let j = 0; j < this.peoplestatus.length; j++) {
           if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {