openatc-components 0.1.56 → 0.1.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/StageStatus/StageStatus.vue

@@ -192,51 +192,58 @@ export default {
       // this.stageLineStatus = true
       if (this.controlData) {
         if (this.localPatternList.length === 0) return
-        let ringList = this.localPatternList.filter(item => {
-          return item.id === this.controlData.patternid
-        })[0].rings
-        if (!rings.rings) return
-        // let mapAdd = rings.phase.map(item => {
-        //   return {
-        //     id: item.id,
-        //     split: item.split
-        //   }
-        // })
-        // let newRings = rings.rings.map(j => {
-        //   return j.sequence
-        // })
-        // let newList = newRings.map(item => {
-        //   let ret = []
-        //   item.map(i => {
-        //     const find = mapAdd.find(j => j.id === i)
-        //     if (find) {
-        //       ret.push(find)
-        //     }
-        //   })
-        //   return ret
-        // })
-        // let mapAdds = newList.map(item => {
-        //   return item.map(val => {
-        //     return val.split
-        //   })
-        // })
-        // let maxCycle = mapAdds.length > 0 ? mapAdds.map(item => {
-        //   return item.length > 0 ? item.reduce((a, b) => {
-        //     return a + b
-        //   }) : 0
-        // }) : 0
-        let mapAdd = ringList.map(item => {
-          return item.map(val => {
-            return val.value + (val.sum ? val.sum : 0)
+        let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
+        if (idPattern.length === 0) {
+          let mapAdd = rings.phase.map(item => {
+            return {
+              id: item.id,
+              value: item.split
+            }
           })
-        })
-        let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
-          return item.length > 0 ? item.reduce((a, b) => {
-            return a + b
+          let newRings = rings.rings.map(j => {
+            return j.sequence
+          })
+          let newList = newRings.map(item => {
+            let ret = []
+            item.map(i => {
+              const find = mapAdd.find(j => j.id === i)
+              if (find) {
+                ret.push(find)
+              }
+            })
+            return ret
+          })
+          let mapAdds = newList.map(item => {
+            return item.map(val => {
+              return val.value
+            })
+          })
+          let maxCycle = mapAdds.length > 0 ? mapAdds.map(item => {
+            return item.length > 0 ? item.reduce((a, b) => {
+              return a + b
+            }) : 0
           }) : 0
-        }) : 0
-        this.max = Math.max(...maxCycle)// 每个环的周期最大值
-        this.getControl(ringList)
+          this.max = Math.max(...maxCycle)// 每个环的周期最大值
+          this.getControl(newList)
+        } else {
+          let ringList = this.localPatternList.filter(item => {
+            return item.id === this.controlData.patternid
+          })[0].rings
+          if (!rings.rings) return
+
+          let mapAdd = ringList.map(item => {
+            return item.map(val => {
+              return val.value + (val.sum ? val.sum : 0)
+            })
+          })
+          let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
+            return item.length > 0 ? item.reduce((a, b) => {
+              return a + b
+            }) : 0
+          }) : 0
+          this.max = Math.max(...maxCycle)// 每个环的周期最大值
+          this.getControl(ringList)
+        }
       } else {
         let mapAdd = rings.map(item => {
           return item.map(val => {

package/src/utils/RingDataModel.js

@@ -70,17 +70,20 @@ export default class RingDataModel {
     let peddirections = []
     let sidewalkPhaseData = this.getPedPhasePos()
     for (let walk of sidewalkPhaseData) {
-      if (!phaseList.peddirection) return
-      for (let ped of phaseList.peddirection) {
+      if (phaseList.peddirection) {
+        for (let ped of phaseList.peddirection) {
         // if (stg === walk.phaseid) {
-        let obj = {}
-        obj.name = walk.name
-        obj.id = walk.id
-        if (ped === walk.id) {
-          peddirections.push(obj)
-          peddirections = Array.from(new Set(peddirections))
-        }
+          let obj = {}
+          obj.name = walk.name
+          obj.id = walk.id
+          if (ped === walk.id) {
+            peddirections.push(obj)
+            peddirections = Array.from(new Set(peddirections))
+          }
         // }
+        }
+      } else {
+        peddirections = []
       }
     }
     for (let id of phaseList.direction) {