openatc-components 0.0.75 → 0.0.76

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -2,6 +2,7 @@
 <div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 417px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
+          <!-- {{list.peddirection}} -->
             <div class="first-2">
               <el-tooltip v-if="item.greenWidth" placement="top-start" effect="light">
                 <div slot="content">
@@ -12,7 +13,7 @@
                 </div>
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
-                        <patternwalksvg :sidewalkPhaseData="list.sidewalkPhaseData" :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                        <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
                         <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
@@ -135,6 +136,7 @@ export default {
         findIndexs = Array.from(new Set(findIndexs))
         return {
           ...item,
+          peddirection: this.getPedPhasePos(item.peddirection),
           sidewalkPhaseData: this.getPedPhasePos(item.peddirection),
           stageLists: stageList.map(sta => {
             const find = findIndexs.includes(sta.key)
@@ -148,6 +150,7 @@ export default {
           })
         }
       })
+      console.log(overlapData, 'overlapData')
       this.overlapDatas = overlapData
     }
   }

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

@@ -20,7 +20,7 @@
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
-                      <patternwalksvg :sidewalkPhaseData="sidewalkPhaseData" :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                      <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
                       <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
@@ -63,7 +63,7 @@
                   </div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
-                      <patternwalksvg :sidewalkPhaseData="sidewalkPhaseData" :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                      <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
                       <xdrdirselector  Width="36px" Height="34px" :showlist="list.direction"></xdrdirselector>
                     </div>
                     <div class="box" style="line-height:28px">
@@ -274,9 +274,16 @@ export default {
           return item.id === stg
         })[0]
         for (let walk of this.sidewalkPhaseData) {
-          if (stg === walk.phaseid) {
-            peddirections.push(...currPhase.peddirection)
-            peddirections = Array.from(new Set(peddirections))
+          for (let ped of currPhase.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))
+              }
+            }
           }
         }
         ped.push(...peddirections)
@@ -420,7 +427,22 @@ export default {
             obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
             obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
             obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-            obj.peddirection = currPhase.peddirection
+            // 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
             obj.split = split
             obj.direction = currPhase.direction.map(item => {
               return {
@@ -517,7 +539,22 @@ export default {
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.peddirection = currPhase.peddirection
+          // 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) { // 忽略相位不显示

package/package/kisscomps/components/PatternWalkSvg/PatternWalkSvg.vue

@@ -370,9 +370,6 @@ export default {
     }
   },
   props: {
-    sidewalkPhaseData: {
-      type: Array
-    },
     showWalk: {
       type: Array
     },
@@ -389,28 +386,21 @@ export default {
     }
   },
   watch: {
-    sidewalkPhaseData: {
-      handler: function () {
-        this.getShow()
-      },
-      deep: true // 深度监听
-    },
     showWalk: {
-      handler: function () {
-        this.getShow()
+      handler: function (newList) {
+        this.refreshShow(newList)
       },
       deep: true // 深度监听
     }
   },
   created () {
-    this.getShow()
+    this.refreshShow(this.showWalk)
   },
   methods: {
-    getShow () {
-      if (!this.sidewalkPhaseData) return
-      for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
+    refreshShow (showWalk) {
+      for (let i = 0; i < this.showWalk.length; i++) {
         for (let j = 0; j < this.status.length; j++) {
-          if (this.sidewalkPhaseData[i].name === this.status[j].name && this.showWalk.includes(this.sidewalkPhaseData[i].id)) {
+          if (this.showWalk[i].name === this.status[j].name) {
             this.status[j].isshow = true
           }
         }

package/package/kisscomps/components/Stages/index.vue

@@ -26,7 +26,6 @@
               </template> -->
                 <patternwalksvg class="patternWalk"
                           :showWalk="item[0].peddirection"
-                          :sidewalkPhaseData="item[0].sidewalkPhaseData"
                           :Width="'40'"
                           :Height="'40'" />
               <xdr-dir-selector Width="40PX" Height="40PX" :showlist="item"></xdr-dir-selector>