openatc-components 0.4.71 → 0.4.72

package/package.json

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

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

@@ -757,6 +757,18 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           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)
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1043,6 +1055,18 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           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)
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1292,6 +1316,18 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           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)
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length >= 1) {
@@ -1350,9 +1386,6 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -1362,6 +1395,9 @@ export default {
         } else {
           this.max = ''
         }
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}