openatc-components 0.3.76 → 0.3.78
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/BoardCard/BoardCard.vue +0 -11
- package/package/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue +1 -1
- package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +1 -1
- package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue +1 -1
- package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +5 -4
- package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -2
- package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +2 -3
- package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue +2 -11
- package/package/kisscomps/components/PatternStatus/PatternStatus.vue +8 -83
- package/package/kisscomps/components/overView/index.vue +2 -2
- package/package/kisscomps/components/patternConfig/planContent.vue +4 -4
- package/package/kisscomps/components/patternConfig/planMenu.vue +7 -7
- package/package/kisscomps/components/patternList/patternList.vue +0 -11
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/i18n/language/en.js +12 -11
- package/src/i18n/language/zh.js +12 -11
- package/src/kisscomps/components/BoardCard/BoardCard.vue +0 -11
- package/src/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue +1 -1
- package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +1 -1
- package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue +1 -1
- package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +5 -4
- package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -2
- package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +2 -3
- package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue +2 -11
- package/src/kisscomps/components/PatternStatus/PatternStatus.vue +8 -83
- package/src/kisscomps/components/overView/index.vue +2 -2
- package/src/kisscomps/components/patternConfig/planContent.vue +4 -4
- package/src/kisscomps/components/patternConfig/planMenu.vue +7 -7
- package/src/kisscomps/components/patternList/patternList.vue +0 -11
- package/src/views/intersection2.vue +2 -2
package/package.json
CHANGED
package/src/i18n/language/en.js
CHANGED
|
@@ -100,7 +100,8 @@ const en = {
|
|
|
100
100
|
'options8': 'Detector',
|
|
101
101
|
'options9': 'PedestrianDetector',
|
|
102
102
|
'graphics': 'Graphics interface',
|
|
103
|
-
'text': 'Text interface'
|
|
103
|
+
'text': 'Text interface',
|
|
104
|
+
'routeOptimize': 'Route Optimize'
|
|
104
105
|
},
|
|
105
106
|
'overview': {
|
|
106
107
|
'crossinfo': 'Cross Information',
|
|
@@ -110,11 +111,9 @@ const en = {
|
|
|
110
111
|
'signalID': 'Intersection ID',
|
|
111
112
|
'flow': 'Average lane flow (h)low',
|
|
112
113
|
'saturationflow': 'Planned lane saturation Flow(h)',
|
|
113
|
-
|
|
114
|
-
'typeflow-split-opt': 'Minimum delay',
|
|
115
|
-
'typecycle-opt': 'Optimal balance',
|
|
114
|
+
'typeflow-split-opt': 'Flow Split Op',
|
|
116
115
|
'maxFlow': 'The average lane flow is too large. Is it further optimized?',
|
|
117
|
-
|
|
116
|
+
'typecycle-opt': 'Cycle Opt',
|
|
118
117
|
'signalIP': 'Signal IP',
|
|
119
118
|
'stagecountdown': 'Stage Countdown',
|
|
120
119
|
'stageduration': 'Stage Duration',
|
|
@@ -904,7 +903,8 @@ const en = {
|
|
|
904
903
|
'ignore': 'Ignore',
|
|
905
904
|
'confirm': 'Confirm',
|
|
906
905
|
'save': 'Save',
|
|
907
|
-
'reset': 'Reset'
|
|
906
|
+
'reset': 'Reset',
|
|
907
|
+
'download': 'Download'
|
|
908
908
|
},
|
|
909
909
|
'common': {
|
|
910
910
|
'confirm': 'Confirm',
|
|
@@ -917,6 +917,7 @@ const en = {
|
|
|
917
917
|
'clone': 'Clone',
|
|
918
918
|
'deleteall': 'DeleteAll',
|
|
919
919
|
'update': 'Update',
|
|
920
|
+
'edit': 'Edit',
|
|
920
921
|
'search': 'Search',
|
|
921
922
|
'alarm': 'Alarm',
|
|
922
923
|
'none': 'none',
|
|
@@ -929,16 +930,16 @@ const en = {
|
|
|
929
930
|
'description': 'Description',
|
|
930
931
|
'operations': 'Operations',
|
|
931
932
|
'addfailed': 'Add Success!',
|
|
932
|
-
'
|
|
933
|
+
'addsuccess': 'Add Failed!',
|
|
933
934
|
'addcancel': 'Add Canceled!',
|
|
934
935
|
'deletefailed': 'Delete Failed!',
|
|
935
|
-
'
|
|
936
|
+
'deletesuccess': 'Delete Success!',
|
|
936
937
|
'deletecancel': 'Delete Canceled!',
|
|
937
938
|
'updatefailed': 'Update Failed!',
|
|
938
|
-
'
|
|
939
|
+
'updatesuccess': 'Update Success!',
|
|
939
940
|
'updatecancel': 'Update Canceled!',
|
|
940
941
|
'relatefailed': 'Relate Failed!',
|
|
941
|
-
'
|
|
942
|
+
'relatesuccess': 'Relate Success!',
|
|
942
943
|
'relatecancel': 'Relate Canceled!',
|
|
943
944
|
'upload': 'Upload',
|
|
944
945
|
'select': 'Select',
|
|
@@ -957,7 +958,7 @@ const en = {
|
|
|
957
958
|
'tipsmodaltitle': 'Tips',
|
|
958
959
|
'deviceoffline': 'Device not online!',
|
|
959
960
|
'operationsuccess': 'Operation Success !',
|
|
960
|
-
'
|
|
961
|
+
'savesuccess': 'Save Success!'
|
|
961
962
|
},
|
|
962
963
|
'login': {
|
|
963
964
|
'title': 'Openatc-Configer',
|
package/src/i18n/language/zh.js
CHANGED
|
@@ -100,17 +100,16 @@ const zh = {
|
|
|
100
100
|
'options8': '检测器',
|
|
101
101
|
'options9': '行人检测器',
|
|
102
102
|
'graphics': '图形界面',
|
|
103
|
-
'text': '文字界面'
|
|
103
|
+
'text': '文字界面',
|
|
104
|
+
'routeOptimize': '干线协调'
|
|
104
105
|
},
|
|
105
106
|
'overview': {
|
|
106
107
|
'crossinfo': '路口信息',
|
|
107
108
|
'flow': '车道平均流量(h)',
|
|
108
109
|
'saturationflow': '车道规划饱和流量(h)',
|
|
109
|
-
|
|
110
|
+
'typeflow-split-opt': '饱和绿信比优化',
|
|
110
111
|
'maxFlow': '车道平均流量过大,是否继续优化?',
|
|
111
|
-
|
|
112
|
-
'typeflow-split-opt': '最小延误',
|
|
113
|
-
'typecycle-opt': '均衡度最优',
|
|
112
|
+
'typecycle-opt': '周期优化',
|
|
114
113
|
'crossname': '路口名称',
|
|
115
114
|
'divicestate': '设备状态',
|
|
116
115
|
'protocoltype': '协议类型',
|
|
@@ -903,7 +902,8 @@ const zh = {
|
|
|
903
902
|
'ignore': '忽略',
|
|
904
903
|
'confirm': '确认',
|
|
905
904
|
'save': '保存',
|
|
906
|
-
'reset': '重置'
|
|
905
|
+
'reset': '重置',
|
|
906
|
+
'download': '下载'
|
|
907
907
|
},
|
|
908
908
|
'common': {
|
|
909
909
|
'confirm': '确认',
|
|
@@ -916,6 +916,7 @@ const zh = {
|
|
|
916
916
|
'clone': '克隆',
|
|
917
917
|
'deleteall': '全部删除',
|
|
918
918
|
'update': '修改',
|
|
919
|
+
'edit': '编辑',
|
|
919
920
|
'enter': '请输入',
|
|
920
921
|
'search': '搜索',
|
|
921
922
|
'alarm': '警告',
|
|
@@ -928,16 +929,16 @@ const zh = {
|
|
|
928
929
|
'description': '描 述',
|
|
929
930
|
'operations': '操 作',
|
|
930
931
|
'addfailed': '添加失败!',
|
|
931
|
-
'
|
|
932
|
+
'addsuccess': '添加成功!',
|
|
932
933
|
'addcancel': '添加取消!',
|
|
933
934
|
'deletefailed': '删除失败!',
|
|
934
|
-
'
|
|
935
|
+
'deletesuccess': '删除成功!',
|
|
935
936
|
'deletecancel': '删除取消!',
|
|
936
937
|
'updatefailed': '更新失败!',
|
|
937
|
-
'
|
|
938
|
+
'updatesuccess': '更新成功!',
|
|
938
939
|
'updatecancel': '更新取消!',
|
|
939
940
|
'relatefailed': '关联失败!',
|
|
940
|
-
'
|
|
941
|
+
'relatesuccess': '关联成功!',
|
|
941
942
|
'relatecancel': '关联取消!',
|
|
942
943
|
'upload': '上传',
|
|
943
944
|
'select': '请选择',
|
|
@@ -956,7 +957,7 @@ const zh = {
|
|
|
956
957
|
'tipsmodaltitle': '提示',
|
|
957
958
|
'deviceoffline': '设备不在线!',
|
|
958
959
|
'operationsuccess': '操作成功',
|
|
959
|
-
'
|
|
960
|
+
'savesuccess': '保存成功!'
|
|
960
961
|
},
|
|
961
962
|
'login': {
|
|
962
963
|
'title': '信号机设备配置',
|
|
@@ -11,7 +11,6 @@
|
|
|
11
11
|
:showBarrier="showBarrier"
|
|
12
12
|
:controlPhase="controlPhase"
|
|
13
13
|
:isShowTip="isShowTip"
|
|
14
|
-
:isMove="isMove"
|
|
15
14
|
:localPatternList="localPatternList"
|
|
16
15
|
:showCondition="showCondition"
|
|
17
16
|
:contrloType="contrloType"
|
|
@@ -25,7 +24,6 @@
|
|
|
25
24
|
:cycle="cycle"
|
|
26
25
|
:syncTime="syncTime"
|
|
27
26
|
:style="{'margin-top': '25px'}"
|
|
28
|
-
@handleSplitMove="handleSplitMove"
|
|
29
27
|
:patternStatusList="patternStatusList"
|
|
30
28
|
:patternId="patternId"
|
|
31
29
|
:cycles="cycles">
|
|
@@ -74,10 +72,6 @@ export default {
|
|
|
74
72
|
stagesChange: {
|
|
75
73
|
type: Array
|
|
76
74
|
},
|
|
77
|
-
isMove: {
|
|
78
|
-
type: Boolean,
|
|
79
|
-
default: true
|
|
80
|
-
},
|
|
81
75
|
isShowTip: {
|
|
82
76
|
type: Boolean,
|
|
83
77
|
default: true
|
|
@@ -114,11 +108,6 @@ export default {
|
|
|
114
108
|
syncTime: {
|
|
115
109
|
type: Number
|
|
116
110
|
}
|
|
117
|
-
},
|
|
118
|
-
methods: {
|
|
119
|
-
handleSplitMove (data) {
|
|
120
|
-
this.$emit('handleSplitMove', data)
|
|
121
|
-
}
|
|
122
111
|
}
|
|
123
112
|
}
|
|
124
113
|
</script>
|
package/src/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue
CHANGED
|
@@ -88,7 +88,7 @@ export default {
|
|
|
88
88
|
getPlatform () {
|
|
89
89
|
queryDevice(this.agentId).then(res => {
|
|
90
90
|
if (!res.data.success) {
|
|
91
|
-
let commomMsg = this.$t('
|
|
91
|
+
let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
|
|
92
92
|
this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
|
|
93
93
|
return
|
|
94
94
|
}
|
package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue
CHANGED
|
@@ -119,7 +119,7 @@ export default {
|
|
|
119
119
|
getPlatform () {
|
|
120
120
|
queryDevice(this.agentId).then(res => {
|
|
121
121
|
if (!res.data.success) {
|
|
122
|
-
let commomMsg = this.$t('
|
|
122
|
+
let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
|
|
123
123
|
this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
|
|
124
124
|
return
|
|
125
125
|
}
|
|
@@ -309,7 +309,7 @@ export default {
|
|
|
309
309
|
roadDirection: {
|
|
310
310
|
handler: function (val1, val2) {
|
|
311
311
|
if (val1 !== val2) {
|
|
312
|
-
this.init()
|
|
312
|
+
// this.init()
|
|
313
313
|
}
|
|
314
314
|
}
|
|
315
315
|
},
|
|
@@ -318,7 +318,8 @@ export default {
|
|
|
318
318
|
if (val1 !== val2) {
|
|
319
319
|
this.init()
|
|
320
320
|
}
|
|
321
|
-
}
|
|
321
|
+
},
|
|
322
|
+
immediate: true
|
|
322
323
|
}
|
|
323
324
|
},
|
|
324
325
|
data () {
|
|
@@ -702,7 +703,7 @@ export default {
|
|
|
702
703
|
},
|
|
703
704
|
getIntersectionInfo () {
|
|
704
705
|
// 获取路口信息
|
|
705
|
-
const agentid = this.agentId
|
|
706
|
+
const agentid = this.agentId
|
|
706
707
|
getIntersectionInfo(agentid).then(res => {
|
|
707
708
|
if (!res.data.success) {
|
|
708
709
|
this.isLoaded = false
|
|
@@ -1313,7 +1314,7 @@ export default {
|
|
|
1313
1314
|
}
|
|
1314
1315
|
},
|
|
1315
1316
|
mounted () {
|
|
1316
|
-
this.init()
|
|
1317
|
+
// this.init()
|
|
1317
1318
|
}
|
|
1318
1319
|
}
|
|
1319
1320
|
</script>
|
|
@@ -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,
|
|
@@ -233,7 +232,7 @@ export default {
|
|
|
233
232
|
let _this = this
|
|
234
233
|
queryDevice(this.AgentId).then(res => {
|
|
235
234
|
if (!res.data.success) {
|
|
236
|
-
let commomMsg = this.$t('
|
|
235
|
+
let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
|
|
237
236
|
let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
|
|
238
237
|
this.$message.error(msg)
|
|
239
238
|
return
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<el-tooltip class="item" effect="dark" placement="left">
|
|
51
51
|
<div slot="content">{{element.name}}</div>
|
|
52
52
|
<div class="common-phase-description">
|
|
53
|
-
<xdrdirselector Width="70px" Height="70px" Widths="
|
|
53
|
+
<xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
|
|
54
54
|
</div>
|
|
55
55
|
</el-tooltip>
|
|
56
56
|
</el-col>
|
|
@@ -79,13 +79,9 @@ export default {
|
|
|
79
79
|
},
|
|
80
80
|
data () {
|
|
81
81
|
return {
|
|
82
|
-
showStyle: {
|
|
83
|
-
left: '2px',
|
|
84
|
-
top: '0px'
|
|
85
|
-
},
|
|
86
82
|
styles: {
|
|
87
83
|
left: '1px',
|
|
88
|
-
top: '
|
|
84
|
+
top: '0'
|
|
89
85
|
},
|
|
90
86
|
typeOptions: [{
|
|
91
87
|
value: 'flow-split-opt'
|
|
@@ -101,9 +97,6 @@ export default {
|
|
|
101
97
|
type: String,
|
|
102
98
|
default: 'Header'
|
|
103
99
|
},
|
|
104
|
-
id: {
|
|
105
|
-
type: Number
|
|
106
|
-
},
|
|
107
100
|
rings: {
|
|
108
101
|
type: Object
|
|
109
102
|
},
|
|
@@ -216,7 +209,6 @@ export default {
|
|
|
216
209
|
}
|
|
217
210
|
}
|
|
218
211
|
}
|
|
219
|
-
this.$emit('optimizesucess', this.id)
|
|
220
212
|
}
|
|
221
213
|
}).catch(error => {
|
|
222
214
|
console.log(error)
|
|
@@ -240,7 +232,6 @@ export default {
|
|
|
240
232
|
}
|
|
241
233
|
}
|
|
242
234
|
}
|
|
243
|
-
this.$emit('optimizesucess', this.id)
|
|
244
235
|
}
|
|
245
236
|
}).catch(error => {
|
|
246
237
|
console.log(error)
|
|
@@ -14,9 +14,8 @@
|
|
|
14
14
|
<!-- 环模式true -->
|
|
15
15
|
<div v-if="this.contrloType === 'ring' || !this.contrloType">
|
|
16
16
|
<div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
|
|
17
|
-
<
|
|
18
|
-
<div
|
|
19
|
-
<div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
|
|
17
|
+
<div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}" v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
|
|
18
|
+
<div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
|
|
20
19
|
<el-tooltip placement="top-start" effect="light">
|
|
21
20
|
<div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
|
|
22
21
|
<div style="cursor:pointer;">
|
|
@@ -26,18 +25,7 @@
|
|
|
26
25
|
</div>
|
|
27
26
|
<div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
|
|
28
27
|
<div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
|
|
29
|
-
<div
|
|
30
|
-
<el-input-number
|
|
31
|
-
v-if="!isMove"
|
|
32
|
-
class="ring-nums"
|
|
33
|
-
size="small"
|
|
34
|
-
:controls="false"
|
|
35
|
-
:min="0"
|
|
36
|
-
:step="1"
|
|
37
|
-
v-model.number="item.split"
|
|
38
|
-
@change="handleEdit(item)"
|
|
39
|
-
style="width: 24px"
|
|
40
|
-
></el-input-number>
|
|
28
|
+
<div class="ring-nums">{{item.split}}</div>
|
|
41
29
|
</div>
|
|
42
30
|
</div>
|
|
43
31
|
</el-tooltip>
|
|
@@ -53,8 +41,7 @@
|
|
|
53
41
|
<div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
|
|
54
42
|
<div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
|
|
55
43
|
<div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
|
|
56
|
-
|
|
57
|
-
</draggable>
|
|
44
|
+
</div>
|
|
58
45
|
</div>
|
|
59
46
|
<div v-if="showBarrier">
|
|
60
47
|
<div v-for="(item, index) in barrierList" :key="index + '1'">
|
|
@@ -113,7 +100,6 @@
|
|
|
113
100
|
<script>
|
|
114
101
|
// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
|
|
115
102
|
import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
|
|
116
|
-
import draggable from 'vuedraggable'
|
|
117
103
|
// import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
|
|
118
104
|
import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
|
|
119
105
|
import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
|
|
@@ -121,7 +107,6 @@ export default {
|
|
|
121
107
|
name: 'pattern-list',
|
|
122
108
|
components: {
|
|
123
109
|
// patternwalksvg,
|
|
124
|
-
draggable,
|
|
125
110
|
xdrdirselector
|
|
126
111
|
},
|
|
127
112
|
data () {
|
|
@@ -129,7 +114,6 @@ export default {
|
|
|
129
114
|
barrierHeight: '',
|
|
130
115
|
stageCycle: '',
|
|
131
116
|
barrierList: [],
|
|
132
|
-
barrierArr: [],
|
|
133
117
|
newCycle: this.cycles,
|
|
134
118
|
patternIds: this.patternId,
|
|
135
119
|
newPatterns: [],
|
|
@@ -158,10 +142,6 @@ export default {
|
|
|
158
142
|
stagesChange: {
|
|
159
143
|
type: Array
|
|
160
144
|
},
|
|
161
|
-
isMove: {
|
|
162
|
-
type: Boolean,
|
|
163
|
-
default: true
|
|
164
|
-
},
|
|
165
145
|
controlPhase: {
|
|
166
146
|
type: Object
|
|
167
147
|
},
|
|
@@ -363,11 +343,11 @@ export default {
|
|
|
363
343
|
handler: function (val, oldVal) {
|
|
364
344
|
this.handleBarrierHeight() // 计算屏障高度
|
|
365
345
|
if (this.patternStatusList && this.newCycle) {
|
|
366
|
-
|
|
367
|
-
|
|
346
|
+
setTimeout(() => {
|
|
347
|
+
this.handleCurrentChange(this.patternStatusList)
|
|
348
|
+
this.handleBarrierHeight()
|
|
349
|
+
}, 10)
|
|
368
350
|
this.handleBarrierHeight()
|
|
369
|
-
// }, 10)
|
|
370
|
-
// this.handleBarrierHeight()
|
|
371
351
|
}
|
|
372
352
|
},
|
|
373
353
|
// 深度观察监听
|
|
@@ -395,60 +375,6 @@ export default {
|
|
|
395
375
|
}
|
|
396
376
|
},
|
|
397
377
|
methods: {
|
|
398
|
-
move (e) {
|
|
399
|
-
// 这里的e表示即将停靠的元素。
|
|
400
|
-
let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
|
|
401
|
-
if (!result.includes(e.draggedContext.element.id)) {
|
|
402
|
-
return false
|
|
403
|
-
}
|
|
404
|
-
},
|
|
405
|
-
endDrag (index) {
|
|
406
|
-
// 拖动后对原数据排序
|
|
407
|
-
const idIndexMap = {}
|
|
408
|
-
this.patternInfo.forEach((subArray, subArrayIndex) => {
|
|
409
|
-
subArray.forEach((item, index) => {
|
|
410
|
-
idIndexMap[item.id] = { subArrayIndex, index }
|
|
411
|
-
})
|
|
412
|
-
})
|
|
413
|
-
this.patternStatusList.forEach((subArray, subArrayIndex) => {
|
|
414
|
-
if (subArray.length > 0) {
|
|
415
|
-
subArray.sort((aItem, bItem) => {
|
|
416
|
-
const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
|
|
417
|
-
const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
|
|
418
|
-
return aIndex - bIndex
|
|
419
|
-
})
|
|
420
|
-
}
|
|
421
|
-
})
|
|
422
|
-
},
|
|
423
|
-
handleEdit (val) {
|
|
424
|
-
this.patternStatusList.map(d => {
|
|
425
|
-
d.map(r => {
|
|
426
|
-
if (r.id === val.id) {
|
|
427
|
-
r.value = val.split
|
|
428
|
-
}
|
|
429
|
-
})
|
|
430
|
-
})
|
|
431
|
-
// this.handleCurrentChange(this.patternStatusList)
|
|
432
|
-
this.$emit('handleSplitMove', this.patternId)
|
|
433
|
-
},
|
|
434
|
-
getMaxCycle (pattern) {
|
|
435
|
-
// let rings = pattern.rings
|
|
436
|
-
let maxCycle = 0
|
|
437
|
-
for (let ring of pattern) {
|
|
438
|
-
if (ring.length === 0) continue
|
|
439
|
-
let cycle = 0
|
|
440
|
-
for (let r of ring) {
|
|
441
|
-
if (r.mode === 7) { // 忽略相位不计周期
|
|
442
|
-
continue
|
|
443
|
-
}
|
|
444
|
-
cycle = cycle + r.value
|
|
445
|
-
}
|
|
446
|
-
if (cycle > maxCycle) {
|
|
447
|
-
maxCycle = cycle
|
|
448
|
-
}
|
|
449
|
-
}
|
|
450
|
-
return maxCycle
|
|
451
|
-
},
|
|
452
378
|
getPed (data) {
|
|
453
379
|
let ped = []
|
|
454
380
|
for (let stg of data) {
|
|
@@ -1253,7 +1179,6 @@ export default {
|
|
|
1253
1179
|
}
|
|
1254
1180
|
}
|
|
1255
1181
|
let resArr = ringArr.map(item => item.data)
|
|
1256
|
-
this.barrierArr = resArr
|
|
1257
1182
|
let ringTeam = this.step1(this.phaseList, resArr)
|
|
1258
1183
|
let ringTeams = ringTeam.filter(item => item.length !== 0)
|
|
1259
1184
|
if (this.patternList) {
|
|
@@ -599,7 +599,7 @@ export default {
|
|
|
599
599
|
queryDevParams () {
|
|
600
600
|
queryDevice(this.AgentId).then(res => {
|
|
601
601
|
if (!res.data.success) {
|
|
602
|
-
let commomMsg = this.$t('
|
|
602
|
+
let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
|
|
603
603
|
let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
|
|
604
604
|
this.$message.error(msg)
|
|
605
605
|
return
|
|
@@ -644,7 +644,7 @@ export default {
|
|
|
644
644
|
getPlatform () {
|
|
645
645
|
queryDevice(this.AgentId).then(res => {
|
|
646
646
|
if (!res.data.success) {
|
|
647
|
-
let commomMsg = this.$t('
|
|
647
|
+
let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
|
|
648
648
|
this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
|
|
649
649
|
return
|
|
650
650
|
}
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<button slot="reference" class="btn" @click="handleEdit" ref="editbtn">{{$t('openatccomponents.greenwaveoptimize.edit')}}</button>
|
|
26
26
|
</el-popover>
|
|
27
27
|
</div>
|
|
28
|
-
<el-button class="btn" type="primary" @click="Download" style="margin-left:10px;">{{$t('
|
|
28
|
+
<el-button class="btn" type="primary" @click="Download" style="margin-left:10px;">{{$t('openatccomponents.button.download')}}</el-button>
|
|
29
29
|
</div>
|
|
30
30
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick" style="border:0px solid red;height:40%;">
|
|
31
31
|
<el-tab-pane :label="$t('openatccomponents.greenwaveoptimize.timespace')" name="first">
|
|
@@ -292,7 +292,7 @@ export default {
|
|
|
292
292
|
this.$message.error(msg)
|
|
293
293
|
resolve(false)
|
|
294
294
|
}
|
|
295
|
-
this.$message.success(this.$t('
|
|
295
|
+
this.$message.success(this.$t('openatccomponents.common.deletesuccess'))
|
|
296
296
|
this.$parent.getAllPlan()
|
|
297
297
|
resolve(true)
|
|
298
298
|
}).catch(error => {
|
|
@@ -315,7 +315,7 @@ export default {
|
|
|
315
315
|
this.$message.error(msg)
|
|
316
316
|
resolve(false)
|
|
317
317
|
}
|
|
318
|
-
this.$message.success(this.$t('
|
|
318
|
+
this.$message.success(this.$t('openatccomponents.common.savesuccess'))
|
|
319
319
|
this.$parent.getAllPlan()
|
|
320
320
|
resolve(true)
|
|
321
321
|
}).catch(error => {
|
|
@@ -337,7 +337,7 @@ export default {
|
|
|
337
337
|
this.$message.error(msg)
|
|
338
338
|
return
|
|
339
339
|
}
|
|
340
|
-
this.$message.success(this.$t('
|
|
340
|
+
this.$message.success(this.$t('openatccomponents.common.savesuccess'))
|
|
341
341
|
this.$parent.getAllPlan()
|
|
342
342
|
})
|
|
343
343
|
},
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
**/
|
|
12
12
|
<template>
|
|
13
13
|
<div class="openatc-planmanu">
|
|
14
|
-
<div class="title" style="display:flex;">{{$t('
|
|
14
|
+
<div class="title" style="display:flex;">{{$t('openatccomponents.main.routeOptimize')}}</div>
|
|
15
15
|
<el-menu @select="selectPlan" v-loading="loading">
|
|
16
16
|
<el-menu-item :index="String(plan.id)" v-for="(plan, index) in planData" :key="index">
|
|
17
17
|
<span slot="title">{{plan.name}}</span>
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
</el-menu>
|
|
20
20
|
<div class="btnGroup" v-show="false">
|
|
21
21
|
<div class="addbtn" :style="{zIndex: zIndexObj.addZIndex}">
|
|
22
|
-
<button slot="reference" class="btn" @click="onAdd" ref="addbtn">{{$t('
|
|
22
|
+
<button slot="reference" class="btn" @click="onAdd" ref="addbtn">{{$t('openatccomponents.common.add')}}</button>
|
|
23
23
|
</div>
|
|
24
24
|
<div class="operate">
|
|
25
25
|
<el-dropdown trigger="click" @command="switchOperate">
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
{{$t('openatccomponents.greenwaveoptimize.operation')}}<i class="el-icon-arrow-down el-icon--right"></i>
|
|
28
28
|
</span>
|
|
29
29
|
<el-dropdown-menu slot="dropdown">
|
|
30
|
-
<el-dropdown-item icon="el-icon-edit" command="Edit">{{$t('
|
|
31
|
-
<el-dropdown-item icon="el-icon-delete" command="Delete">{{$t('
|
|
30
|
+
<el-dropdown-item icon="el-icon-edit" command="Edit">{{$t('openatccomponents.common.edit')}}</el-dropdown-item>
|
|
31
|
+
<el-dropdown-item icon="el-icon-delete" command="Delete">{{$t('openatccomponents.common.delete')}}</el-dropdown-item>
|
|
32
32
|
</el-dropdown-menu>
|
|
33
33
|
</el-dropdown>
|
|
34
34
|
</div>
|
|
@@ -139,7 +139,7 @@ export default {
|
|
|
139
139
|
this.deleteDiologVisible = false
|
|
140
140
|
this.resetChooseId()
|
|
141
141
|
this.$message({
|
|
142
|
-
message: this.$t('
|
|
142
|
+
message: this.$t('openatccomponents.common.deletesuccess'),
|
|
143
143
|
type: 'success',
|
|
144
144
|
duration: 1 * 1000,
|
|
145
145
|
onClose: () => {
|
|
@@ -168,7 +168,7 @@ export default {
|
|
|
168
168
|
}
|
|
169
169
|
this.closeAddDialog()
|
|
170
170
|
this.$message({
|
|
171
|
-
message: this.$t('
|
|
171
|
+
message: this.$t('openatccomponents.common.updatesuccess'),
|
|
172
172
|
type: 'success',
|
|
173
173
|
duration: 1 * 1000,
|
|
174
174
|
onClose: () => {
|
|
@@ -189,7 +189,7 @@ export default {
|
|
|
189
189
|
}
|
|
190
190
|
this.closeAddDialog()
|
|
191
191
|
this.$message({
|
|
192
|
-
message: this.$t('
|
|
192
|
+
message: this.$t('openatccomponents.common.addsuccess'),
|
|
193
193
|
type: 'success',
|
|
194
194
|
duration: 1 * 1000,
|
|
195
195
|
onClose: () => {
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
:contrloType="contrloType"
|
|
6
6
|
:stagesChange="stagesChange"
|
|
7
7
|
:isShowTip="isShowTip"
|
|
8
|
-
:isMove="isMove"
|
|
9
8
|
:patternStatusList="patternStatusList"
|
|
10
9
|
:cycles="cycles"
|
|
11
10
|
:cycle="cycle"
|
|
@@ -20,7 +19,6 @@
|
|
|
20
19
|
:agentId="agentId"
|
|
21
20
|
:controlData="controlData"
|
|
22
21
|
:syncTime="syncTime"
|
|
23
|
-
@handleSplitMove="handleSplitMove"
|
|
24
22
|
:isPhase="isPhase"
|
|
25
23
|
>
|
|
26
24
|
</BoardCard>
|
|
@@ -504,10 +502,6 @@ export default {
|
|
|
504
502
|
type: Boolean,
|
|
505
503
|
default: true
|
|
506
504
|
},
|
|
507
|
-
isMove: {
|
|
508
|
-
type: Boolean,
|
|
509
|
-
default: true
|
|
510
|
-
},
|
|
511
505
|
contrloType: {
|
|
512
506
|
type: String
|
|
513
507
|
},
|
|
@@ -587,11 +581,6 @@ export default {
|
|
|
587
581
|
// if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
|
|
588
582
|
// this.resetCrossDiagram()
|
|
589
583
|
// }
|
|
590
|
-
},
|
|
591
|
-
methods: {
|
|
592
|
-
handleSplitMove (data) {
|
|
593
|
-
this.$emit('handleSplitMove', data)
|
|
594
|
-
}
|
|
595
584
|
}
|
|
596
585
|
}
|
|
597
586
|
</script>
|
|
@@ -102,12 +102,12 @@ export default {
|
|
|
102
102
|
return {
|
|
103
103
|
roadDirection: 'left',
|
|
104
104
|
// reqUrl: 'http://192.168.13.103:10003/openatc',
|
|
105
|
-
agentId: '
|
|
105
|
+
agentId: '32050101041121000001',
|
|
106
106
|
// agentId: '13013',
|
|
107
107
|
// agentId: '12007_390',
|
|
108
108
|
// agentId: '12014',
|
|
109
109
|
reqUrl: 'http://192.168.13.103:10003/openatc',
|
|
110
|
-
Token: '
|
|
110
|
+
Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
|
|
111
111
|
// agentId: '30003-352',
|
|
112
112
|
// reqUrl: 'https://kints-dev.devdolphin.com/openatc',
|
|
113
113
|
// Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
|