openatc-components 0.3.80 → 0.3.81
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.
- package/package/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue +5 -7
- package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
- package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
- package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +14 -12
- package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +9 -5
- package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +2 -4
- package/package/kisscomps/components/OverviewComponent/index.js +2 -0
- package/package/kisscomps/components/OverviewComponent/index.vue +794 -0
- package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +28 -4
- package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
- package/package/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue +21 -1
- package/package/kisscomps/index.js +3 -1
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/i18n/language/en.js +7 -0
- package/src/i18n/language/zh.js +7 -0
- package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue +5 -7
- package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
- package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
- package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +14 -12
- package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +9 -5
- package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +2 -4
- package/src/kisscomps/components/OverviewComponent/index.js +2 -0
- package/src/kisscomps/components/OverviewComponent/index.vue +794 -0
- package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +28 -4
- package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
- package/src/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue +21 -1
- package/src/kisscomps/index.js +3 -1
- package/src/utils/conflct.js +24 -33
- package/src/views/intersection.vue +6 -5
- package/src/views/intersection2.vue +2 -2
- package/src/views/overView.vue +17 -4
- package/static/styles/common.scss +3 -3
- package/static/styles/dark/theme/element-dark.scss +1 -1
- package/static/styles/intersection.scss +5 -15
- package/static/styles/light/theme/element-light.scss +1 -1
- package/static/styles/schemeconfig.scss +6 -3
- package/package/kisscomps/components/OptimizeKanban/index.js +0 -2
- package/package/kisscomps/components/OptimizeKanban/index.vue +0 -369
- package/src/node_modules/.package_versions.json +0 -1
|
@@ -212,8 +212,8 @@ export default {
|
|
|
212
212
|
Detector: [], // 管理所有检测器
|
|
213
213
|
DetectorChart: [], // 管理所有检测器统计图
|
|
214
214
|
motorwayicon: '',
|
|
215
|
-
IconLengh:
|
|
216
|
-
IconWdith:
|
|
215
|
+
IconLengh: 33,
|
|
216
|
+
IconWdith: 109,
|
|
217
217
|
textareaW: 200,
|
|
218
218
|
textareaH: 100,
|
|
219
219
|
pedW: 206,
|
|
@@ -389,8 +389,8 @@ export default {
|
|
|
389
389
|
h: this.IconWdith,
|
|
390
390
|
angle: 0
|
|
391
391
|
}
|
|
392
|
-
this.IconLengh =
|
|
393
|
-
this.IconWdith =
|
|
392
|
+
this.IconLengh = 33
|
|
393
|
+
this.IconWdith = 109
|
|
394
394
|
let Motorwaysitem = {
|
|
395
395
|
index: this.index,
|
|
396
396
|
id: this.motorid,
|
|
@@ -306,16 +306,16 @@ export default {
|
|
|
306
306
|
this.handleDefaultStatus()
|
|
307
307
|
}
|
|
308
308
|
},
|
|
309
|
-
roadDirection: {
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
},
|
|
309
|
+
// roadDirection: {
|
|
310
|
+
// handler: function (val1, val2) {
|
|
311
|
+
// if (val1 !== val2) {
|
|
312
|
+
// this.init()
|
|
313
|
+
// }
|
|
314
|
+
// }
|
|
315
|
+
// },
|
|
316
316
|
agentId: {
|
|
317
317
|
handler: function (val1, val2) {
|
|
318
|
-
if (val1 !== val2) {
|
|
318
|
+
if (val1 !== val2 && val2 !== undefined) {
|
|
319
319
|
this.init()
|
|
320
320
|
}
|
|
321
321
|
}
|
|
@@ -702,7 +702,7 @@ export default {
|
|
|
702
702
|
},
|
|
703
703
|
getIntersectionInfo () {
|
|
704
704
|
// 获取路口信息
|
|
705
|
-
const agentid = this.agentId
|
|
705
|
+
const agentid = this.agentId
|
|
706
706
|
getIntersectionInfo(agentid).then(res => {
|
|
707
707
|
if (!res.data.success) {
|
|
708
708
|
this.isLoaded = false
|
|
@@ -1053,8 +1053,8 @@ export default {
|
|
|
1053
1053
|
},
|
|
1054
1054
|
handleRepeatRealdir (channelList) {
|
|
1055
1055
|
// 按realdir去掉重复方向的数据
|
|
1056
|
-
let dirChannelList = channelList.filter(ele => ele.
|
|
1057
|
-
let pedDirChannelList = channelList.filter(ele => ele.
|
|
1056
|
+
let dirChannelList = channelList.filter(ele => ele.type === 0 || ele.type === 1 || ele.type === 3)
|
|
1057
|
+
let pedDirChannelList = channelList.filter(ele => ele.type === 2)
|
|
1058
1058
|
let map = new Map()
|
|
1059
1059
|
let map2 = new Map()
|
|
1060
1060
|
dirChannelList.forEach(ele => {
|
|
@@ -1313,7 +1313,9 @@ export default {
|
|
|
1313
1313
|
}
|
|
1314
1314
|
},
|
|
1315
1315
|
mounted () {
|
|
1316
|
-
this.
|
|
1316
|
+
if (this.agentId !== undefined) {
|
|
1317
|
+
this.init()
|
|
1318
|
+
}
|
|
1317
1319
|
}
|
|
1318
1320
|
}
|
|
1319
1321
|
</script>
|
|
@@ -74,8 +74,7 @@ export default {
|
|
|
74
74
|
// default: 0
|
|
75
75
|
// },
|
|
76
76
|
agentId: {
|
|
77
|
-
type: String
|
|
78
|
-
default: '0'
|
|
77
|
+
type: String
|
|
79
78
|
},
|
|
80
79
|
graphicMode: {
|
|
81
80
|
type: Boolean,
|
|
@@ -155,6 +154,13 @@ export default {
|
|
|
155
154
|
this.reset = true
|
|
156
155
|
}
|
|
157
156
|
}
|
|
157
|
+
},
|
|
158
|
+
agentId: {
|
|
159
|
+
handler: function (val1, val2) {
|
|
160
|
+
if (val1 !== val2 && val2 !== undefined) {
|
|
161
|
+
this.resetCrossDiagram()
|
|
162
|
+
}
|
|
163
|
+
}
|
|
158
164
|
}
|
|
159
165
|
},
|
|
160
166
|
created () {
|
|
@@ -164,9 +170,7 @@ export default {
|
|
|
164
170
|
},
|
|
165
171
|
mounted () {
|
|
166
172
|
this.getParentSize()
|
|
167
|
-
|
|
168
|
-
this.reset = true
|
|
169
|
-
}
|
|
173
|
+
this.reset = true
|
|
170
174
|
},
|
|
171
175
|
updated () {
|
|
172
176
|
},
|
package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue
CHANGED
|
@@ -59,8 +59,7 @@ export default {
|
|
|
59
59
|
default: ''
|
|
60
60
|
},
|
|
61
61
|
AgentId: {
|
|
62
|
-
type: String
|
|
63
|
-
default: '0'
|
|
62
|
+
type: String
|
|
64
63
|
},
|
|
65
64
|
Token: {
|
|
66
65
|
type: String,
|
|
@@ -93,7 +92,7 @@ export default {
|
|
|
93
92
|
},
|
|
94
93
|
watch: {
|
|
95
94
|
AgentId: {
|
|
96
|
-
handler: function (val
|
|
95
|
+
handler: function (val) {
|
|
97
96
|
this.agentId = val
|
|
98
97
|
},
|
|
99
98
|
// 深度观察监听
|
|
@@ -485,7 +484,6 @@ export default {
|
|
|
485
484
|
}
|
|
486
485
|
},
|
|
487
486
|
created () {
|
|
488
|
-
this.agentId = this.AgentId
|
|
489
487
|
this.setDialogWidth()
|
|
490
488
|
this.setHost(this.reqUrl)
|
|
491
489
|
this.controlFormat = new ControlFormat()
|