openatc-components 0.1.39 → 0.1.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package/kisscomps/components/PatternStatus/PatternStatus.vue +41 -31
  2. package/package/kissui.min.js +1 -1
  3. package/package.json +1 -1
  4. package/src/kisscomps/components/PatternStatus/PatternStatus.vue +41 -31
  5. package/src/views/intersection.vue +2 -2
  6. package/src/views/overView.vue +3 -3
  7. package/src/views/schemeconfig.vue +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "openatc-components",
3
- "version": "0.1.39",
3
+ "version": "0.1.41",
4
4
  "description": "A Vue.js project",
5
5
  "author": "openatc developer",
6
6
  "private": false,
package/src/kisscomps/components/PatternStatus/PatternStatus.vue CHANGED
@@ -190,7 +190,7 @@ export default {
190
190
  }
191
191
  // this.controlDatas = this.controlData
192
192
  this.getPedPhasePos()
193
- if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition)) {
193
+ if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
194
194
  this.handleTentivePatternData()
195
195
  } else if (this.controlData) {
196
196
  this.handlePatternData()
@@ -590,6 +590,7 @@ export default {
590
590
  return k.id
591
591
  })
592
592
  })
593
+ let newRings = ringsequence.filter(item => item)
593
594
  let minLength = Math.min(...ringlength)
594
595
  let resultArrs = [] // 环1分组
595
596
  let resultArr = [] // 环2分组
@@ -599,8 +600,10 @@ export default {
599
600
  resultArrs.push([])
600
601
  }
601
602
  }
602
- for (let i = 0; i < ringsequence[1].length; i += minLength) {
603
- resultArr.push(ringsequence[1].slice(i, i + minLength))
603
+ if (newRings.length > 1) {
604
+ for (let i = 0; i < ringsequence[1].length; i += minLength) {
605
+ resultArr.push(ringsequence[1].slice(i, i + minLength))
606
+ }
604
607
  }
605
608
  this.patternInfo = []
606
609
  let currentArr = []
@@ -639,20 +642,22 @@ export default {
639
642
  ring1s.push(addRing1)
640
643
  }
641
644
  barrierRing1.push(...ring1, ...ring1s)
642
- let ring2s = [] // 环2与关系1的并集
643
- for (let h = 0; h < newCurrent.length; h++) {
644
- let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
645
- ring2s.push(addRing2)
646
- }
647
- let ring2 = [] // 环2与关系1的并集
648
- for (let h = 0; h < newCurrent.length; h++) {
649
- let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
650
- ring2.push(add)
651
- }
652
- barrierRing2.push(...ring2, ...ring2s)
653
645
  let resultList = []
654
- for (let k = 0; k < barrierRing1.length; k++) {
655
- resultList.push(barrierRing1[k].concat(barrierRing2[k]))
646
+ if (newRings.length > 1) {
647
+ let ring2s = [] // 环2与关系1的并集
648
+ for (let h = 0; h < newCurrent.length; h++) {
649
+ let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
650
+ ring2s.push(addRing2)
651
+ }
652
+ let ring2 = [] // 环2与关系1的并集
653
+ for (let h = 0; h < newCurrent.length; h++) {
654
+ let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
655
+ ring2.push(add)
656
+ }
657
+ barrierRing2.push(...ring2, ...ring2s)
658
+ for (let k = 0; k < barrierRing1.length; k++) {
659
+ resultList.push(barrierRing1[k].concat(barrierRing2[k]))
660
+ }
656
661
  }
657
662
  let resultLists = resultList.filter(item => item.length !== 0)
658
663
  let ringArr = []
@@ -766,6 +771,7 @@ export default {
766
771
  return k.id
767
772
  })
768
773
  })
774
+ let newRings = ringsequence.filter(item => item)
769
775
  let minLength = Math.min(...ringlength)
770
776
  let resultArrs = [] // 环1分组
771
777
  let resultArr = [] // 环2分组
@@ -775,8 +781,10 @@ export default {
775
781
  resultArrs.push([])
776
782
  }
777
783
  }
778
- for (let i = 0; i < ringsequence[1].length; i += minLength) {
779
- resultArr.push(ringsequence[1].slice(i, i + minLength))
784
+ if (newRings.length > 1) {
785
+ for (let i = 0; i < ringsequence[1].length; i += minLength) {
786
+ resultArr.push(ringsequence[1].slice(i, i + minLength))
787
+ }
780
788
  }
781
789
  this.patternInfo = []
782
790
  this.barrierList = []
@@ -816,20 +824,22 @@ export default {
816
824
  ring1s.push(addRing1)
817
825
  }
818
826
  barrierRing1.push(...ring1, ...ring1s)
819
- let ring2s = [] // 环2与关系1的并集
820
- for (let h = 0; h < newCurrent.length; h++) {
821
- let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
822
- ring2s.push(addRing2)
823
- }
824
- let ring2 = [] // 环2与关系1的并集
825
- for (let h = 0; h < newCurrent.length; h++) {
826
- let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
827
- ring2.push(add)
828
- }
829
- barrierRing2.push(...ring2, ...ring2s)
830
827
  let resultList = []
831
- for (let k = 0; k < barrierRing1.length; k++) {
832
- resultList.push(barrierRing1[k].concat(barrierRing2[k]))
828
+ if (newRings.length > 1) {
829
+ let ring2s = [] // 环2与关系1的并集
830
+ for (let h = 0; h < newCurrent.length; h++) {
831
+ let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
832
+ ring2s.push(addRing2)
833
+ }
834
+ let ring2 = [] // 环2与关系1的并集
835
+ for (let h = 0; h < newCurrent.length; h++) {
836
+ let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
837
+ ring2.push(add)
838
+ }
839
+ barrierRing2.push(...ring2, ...ring2s)
840
+ for (let k = 0; k < barrierRing1.length; k++) {
841
+ resultList.push(barrierRing1[k].concat(barrierRing2[k]))
842
+ }
833
843
  }
834
844
  let resultLists = resultList.filter(item => item.length !== 0)
835
845
  let ringArr = []
package/src/views/intersection.vue CHANGED
@@ -94,10 +94,10 @@ export default {
94
94
  return {
95
95
  roadDirection: 'right',
96
96
  // reqUrl: 'http://192.168.13.103:10003/openatc',
97
- agentId: '10002-739',
97
+ agentId: '12003-490',
98
98
  // agentId: '0351-01',
99
99
  reqUrl: 'http://192.168.13.103:10003/openatc',
100
- Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
100
+ Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
101
101
  // agentId: '30003-352',
102
102
  // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
103
103
  // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
package/src/views/overView.vue CHANGED
@@ -19,9 +19,9 @@ export default {
19
19
  isShowMode: true,
20
20
  modeName: '交警遥控',
21
21
  controlName: '步进',
22
- agentId: 'jmlxhl',
23
- Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
24
- reqUrl: 'http://192.168.13.103:10003/openatc'
22
+ agentId: '12003-490',
23
+ Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
24
+ reqUrl: 'http://192.168.13.105:11003/openatc'
25
25
  }
26
26
  },
27
27
  methods: {
package/src/views/schemeconfig.vue CHANGED
@@ -55,9 +55,9 @@ export default {
55
55
  showWalk: [ 1, 2 ],
56
56
  sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
57
57
  lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
58
- agentId: '12004-950',
59
- Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
60
- Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
58
+ agentId: '12003-490',
59
+ Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
60
+ Token103: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
61
61
  boxVisible: false,
62
62
  dialogWidth: '80%',
63
63
  crossStatusData: {} // 路口状态数据