openatc-components 0.4.72 → 0.4.73

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

@@ -10,6 +10,12 @@
                     <span v-for="(ids,index3) in list.includedphases" :key="index3">
                         {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                     </span>
+                     <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                      *P{{ ids
+                      }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                        >,</span
+                      >
+                    </span>)</span>
                 </div>
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
@@ -22,6 +28,12 @@
                             <span v-for="(ids,index3) in list.includedphases" :key="index3">
                                 {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                             </span>
+                            <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                              *P{{ ids
+                                }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                                >,</span
+                              >
+                            </span>)</span>
                         </div>
                     </div>
                 </div>
@@ -153,7 +165,16 @@ export default {
           const findItems = stageList.filter(j => (j.phases ? j.phases : j.stages).includes(i))
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
+        // 收集所有包含 modifyphase 中相位的阶段 key
+        let modifyIndexs = []
+        if (item.modifyphase !== undefined) {
+          item.modifyphase.forEach(i => {
+            const findItems = stageList.filter(j => j.phases.includes(i))
+            if (findItems.length) modifyIndexs.push(...findItems.map(m => m.key))
+          })
+        }
         findIndexs = Array.from(new Set(findIndexs))
+        modifyIndexs = Array.from(new Set(modifyIndexs))
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -168,7 +189,7 @@ export default {
           peddirection: this.getPedPhasePos(item.peddirection),
           sidewalkPhaseData: this.getPedPhasePos(item.peddirection),
           stageLists: stageList.map(sta => {
-            const find = findIndexs.includes(sta.key)
+            const find = findIndexs.includes(sta.key) && !modifyIndexs.includes(sta.key)
             return {
               ...sta,
               direction: this.getRoad(item),

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

@@ -758,15 +758,17 @@ export default {
           ring1s.push(addRing1)
         }
         // 双环相位数不等的时候
-        if (newRings[0].length !== newRings[1].length) {
-          for (let h = 0; h < newCurrent.length; h++) {
-            let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
-            ring1.push(adds)
-          }
-          let ring1s = [] // 环1与关系2的并集
-          for (let h = 0; h < newCurrent.length; h++) {
-            let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
-            ring1s.push(addRing1)
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
           }
         }
         barrierRing1.push(...ring1, ...ring1s)
@@ -1056,15 +1058,17 @@ export default {
           ring1s.push(addRing1)
         }
         // 双环相位数不等的时候
-        if (newRings[0].length !== newRings[1].length) {
-          for (let h = 0; h < newCurrent.length; h++) {
-            let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
-            ring1.push(adds)
-          }
-          let ring1s = [] // 环1与关系2的并集
-          for (let h = 0; h < newCurrent.length; h++) {
-            let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
-            ring1s.push(addRing1)
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
           }
         }
         barrierRing1.push(...ring1, ...ring1s)
@@ -1317,15 +1321,17 @@ export default {
           ring1s.push(addRing1)
         }
         // 双环相位数不等的时候
-        if (newRings[0].length !== newRings[1].length) {
-          for (let h = 0; h < newCurrent.length; h++) {
-            let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
-            ring1.push(adds)
-          }
-          let ring1s = [] // 环1与关系2的并集
-          for (let h = 0; h < newCurrent.length; h++) {
-            let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
-            ring1s.push(addRing1)
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
           }
         }
         barrierRing1.push(...ring1, ...ring1s)