openatc-components 0.3.114 → 0.3.116

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 (58) hide show
  1. package/package/kisscomps/components/BoardCard/BoardCard.vue +11 -0
  2. package/package/kisscomps/components/Channelization/Channelization.vue +1 -1
  3. package/package/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue +1 -1
  4. package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
  5. package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
  6. package/package/kisscomps/components/DrawChannelization/drawsvg/index.vue +1 -1
  7. package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +63 -0
  8. package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -1
  9. package/package/kisscomps/components/OverLap/OverLap.vue +1 -1
  10. package/package/kisscomps/components/OverviewComponent/index.vue +11 -7
  11. package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
  12. package/package/kisscomps/components/PatternStatus/PatternStatus.vue +84 -9
  13. package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +11 -4
  14. package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
  15. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +34 -2
  16. package/package/kisscomps/components/StageOptimize/StageOptimize.vue +310 -0
  17. package/package/kisscomps/components/StageOptimize/index.js +2 -0
  18. package/package/kisscomps/components/StageOptimize/index.vue +310 -0
  19. package/package/kisscomps/components/overView/index.vue +2 -2
  20. package/package/kisscomps/components/patternList/patternList.vue +11 -0
  21. package/package/kisscomps/index.js +2 -0
  22. package/package/kissui.min.js +1 -1
  23. package/package.json +1 -1
  24. package/src/i18n/language/en.js +12 -12
  25. package/src/i18n/language/zh.js +17 -17
  26. package/src/kisscomps/components/BoardCard/BoardCard.vue +11 -0
  27. package/src/kisscomps/components/Channelization/Channelization.vue +1 -1
  28. package/src/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue +1 -1
  29. package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
  30. package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
  31. package/src/kisscomps/components/DrawChannelization/drawsvg/index.vue +1 -1
  32. package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +63 -0
  33. package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -1
  34. package/src/kisscomps/components/OverLap/OverLap.vue +1 -1
  35. package/src/kisscomps/components/OverviewComponent/index.vue +11 -7
  36. package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
  37. package/src/kisscomps/components/PatternStatus/PatternStatus.vue +84 -9
  38. package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +11 -4
  39. package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
  40. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +34 -2
  41. package/src/kisscomps/components/StageOptimize/StageOptimize.vue +310 -0
  42. package/src/kisscomps/components/StageOptimize/index.js +2 -0
  43. package/src/kisscomps/components/StageOptimize/index.vue +310 -0
  44. package/src/kisscomps/components/overView/index.vue +2 -2
  45. package/src/kisscomps/components/patternList/patternList.vue +11 -0
  46. package/src/kisscomps/index.js +2 -0
  47. package/src/utils/ControlFormat.js +2 -2
  48. package/src/views/intersection.vue +7 -6
  49. package/src/views/intersection2.vue +4 -4
  50. package/src/views/overView.vue +27 -5
  51. package/static/styles/common.scss +3 -3
  52. package/static/styles/dark/theme/element-dark.scss +1 -1
  53. package/static/styles/intersection.scss +5 -15
  54. package/static/styles/light/theme/element-light.scss +1 -1
  55. package/static/styles/schemeconfig.scss +6 -3
  56. package/package/kisscomps/components/OptimizeKanban/index.js +0 -2
  57. package/package/kisscomps/components/OptimizeKanban/index.vue +0 -369
  58. package/src/node_modules/.package_versions.json +0 -1
@@ -14,8 +14,8 @@ export default class ControlFormat {
14
14
  constructor (crossStatusData, phaseList) {
15
15
  this.ParamsMode = new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']])
16
16
  this.ParamsModeEn = new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']])
17
- this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
18
- this.ParamsControlEn = new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']])
17
+ this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '感应式自适应'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
18
+ this.ParamsControlEn = new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Inductive Adaptive'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']])
19
19
  this.phaseType = new Map([[1, '红'], [2, '黄'], [3, '绿']]) // phaseType表示红,黄,绿
20
20
  this.phaseTypeEn = new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]) // phaseType表示红,黄,绿
21
21
  }
@@ -1,15 +1,16 @@
1
1
  <template>
2
2
  <div>
3
+ <intersection-with-interface :AgentId="agentId" />
3
4
  <h2 class="text">实时通道路口图</h2>
4
- <channel-realtime-intersection
5
+ <!-- <channel-realtime-intersection
5
6
  :agentId="this.agentId"
6
7
  :roadDirection="roadDirection"
7
8
  :channelRealtimeStatusData="channelRealtimeStatusData"
8
- />
9
+ /> -->
9
10
 
10
11
  <!-- 按通道获取相位的方向选择列表,特殊路口显示列表,普通路口显示模版路口图 -->
11
12
  <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
12
- <intersection-direction-selection
13
+ <!-- <intersection-direction-selection
13
14
  :agentId="this.agentId"
14
15
  :choosedDirection="[14,6,13,8]"
15
16
  :choosedPedDirection="[1]"
@@ -25,7 +26,7 @@
25
26
  :choosedPedDirection="[1,2]"
26
27
  :roadDirection="roadDirection"
27
28
  @handleClickCrossIcon="handleClickCrossIcon" />
28
- </div>
29
+ </div> -->
29
30
 
30
31
  <!-- 显示按通道获取相位的模版路口图 -->
31
32
  <h2 class="text">显示配置的相位路口图</h2>
@@ -161,12 +162,12 @@ export default {
161
162
  return {
162
163
  roadDirection: 'right',
163
164
  // reqUrl: 'http://192.168.13.103:10003/openatc',
164
- agentId: 'tjblfql',
165
+ agentId: '32050101041121000001',
165
166
  // agentId: '13013',
166
167
  // agentId: '12007_390',
167
168
  // agentId: '12014',
168
169
  reqUrl: 'http://192.168.13.103:10003/openatc',
169
- Token: 'eyJraWQiOiIxNzM0MDc1MTI0MjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDA3ODcyNCwiaWF0IjoxNzM0MDcxNTI0fQ.KixCOm8CIbS10UYc0djLAr-NCg24S5ftHM384yweVVU',
170
+ Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
170
171
  // agentId: '30003-352',
171
172
  // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
172
173
  // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -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: 'cllzpl',
105
+ // agentId: '32050101041121000001',
106
106
  // agentId: '13013',
107
- // agentId: '12007_390',
107
+ agentId: '12007_390',
108
108
  // agentId: '12014',
109
109
  reqUrl: 'http://192.168.13.103:10003/openatc',
110
- Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
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',
@@ -117,7 +117,7 @@ export default {
117
117
  controlName: '步进',
118
118
  isShowState: true,
119
119
  isShowMode: true,
120
- isShowMessage: true,
120
+ isShowMessage: false,
121
121
  isShowPatternStatus: false,
122
122
  isShowIntersection: true,
123
123
  isShowInterval: true,
@@ -1,13 +1,18 @@
1
1
  <template>
2
2
  <div id="test1">
3
- <overview
3
+ <!-- <overview
4
4
  :AgentId="agentId"
5
5
  :reqUrl="reqUrl"
6
6
  :modeName="modeName"
7
7
  :controlName="controlName"
8
8
  :isShowState="isShowState"
9
9
  :isShowMode="isShowMode"
10
- :Token="Token"></overview>
10
+ :Token="Token"></overview> -->
11
+ <el-button @click="handleChangeOverview">切换overview组件</el-button>
12
+ <overview-component
13
+ :AgentId="agentId2"
14
+ :isShowInterval="isShowInterval"
15
+ :isShowMessage ="isShowMessage"/>
11
16
  </div>
12
17
  </template>
13
18
 
@@ -19,12 +24,29 @@ export default {
19
24
  isShowMode: true,
20
25
  modeName: '交警遥控',
21
26
  controlName: '步进',
22
- agentId: 'stao',
23
- Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
24
- reqUrl: 'http://192.168.13.103:10003/openatc'
27
+ agentId: '13013',
28
+ agentid1: 'gjnlahql',
29
+ agentid2: '12007_390',
30
+ isShowMessage: false,
31
+ isShowInterval: true,
32
+ sum: 0,
33
+ Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
34
+ reqUrl: 'http://192.168.13.103:10003/openatc',
35
+ isOnlyMap: true
25
36
  }
26
37
  },
27
38
  methods: {
39
+ handleChangeOverview () {
40
+ if (this.sum % 2 === 0) {
41
+ this.agentId = this.agentid1
42
+ } else {
43
+ this.agentId = this.agentid2
44
+ }
45
+ this.sum++
46
+ },
47
+ reverseOverviewBtMap () {
48
+ this.isOnlyMap = !this.isOnlyMap
49
+ }
28
50
  },
29
51
  watch: {
30
52
  },
@@ -11,12 +11,12 @@
11
11
 
12
12
  // 全局滚动条样式
13
13
  ::-webkit-scrollbar {
14
- width: 12PX;
15
- height: 12PX;
14
+ width: 6PX;
15
+ height: 6PX;
16
16
  }
17
17
  ::-webkit-scrollbar-thumb {
18
18
  // 滚动条的滑块
19
- border-radius: 4px;
19
+ border-radius: 3PX;
20
20
  background: rgba(144, 147, 153, 0.3);
21
21
  }
22
22
  ::-webkit-scrollbar-corner{
@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
34
34
  $--button-success-font-color: #FFFFFF;
35
35
  $--radio-button-checked-font-color: #FFFFFF;
36
36
  $--radio-font-color: $--color-text-secondary;
37
- $--tag-info-color: $--color-text-placeholder;
37
+ $--tag-info-color: #FFFFFF;
38
38
  $--tooltip-color: $--color-white;
39
39
  $--checkbox-font-color: $--color-text-secondary;
40
40
 
@@ -38,9 +38,6 @@
38
38
  zoom: 0.9;
39
39
 
40
40
  }
41
- .centerText .text {
42
- font-size: 14px;
43
- }
44
41
  }
45
42
  /*当屏幕小于等于1440px的屏幕样式*/
46
43
  @media only screen and (max-width: 1440px){
@@ -49,9 +46,6 @@
49
46
  zoom: 0.8;
50
47
 
51
48
  }
52
- .centerText .text {
53
- font-size: 18px;
54
- }
55
49
  }
56
50
  /*当屏幕小于等于1280px的屏幕样式*/
57
51
  @media only screen and (max-width: 1280px){
@@ -59,9 +53,6 @@
59
53
  // transform: scale(0.65);
60
54
  zoom: 0.65;
61
55
  }
62
- .centerText .text {
63
- font-size: 20px;
64
- }
65
56
  }
66
57
  /*当屏幕小于等于960px的屏幕样式*/
67
58
  @media only screen and (max-width: 960px){
@@ -69,9 +60,6 @@
69
60
  // transform: scale(0.5);
70
61
  zoom: 0.5;
71
62
  }
72
- .centerText .text {
73
- font-size: 14px;
74
- }
75
63
  }
76
64
  /*当屏幕小于等于720px的屏幕样式*/
77
65
  @media only screen and (max-width: 720px){
@@ -79,9 +67,6 @@
79
67
  // transform: scale(0.45);
80
68
  zoom: 0.45;
81
69
  }
82
- .centerText .text {
83
- font-size: 14px;
84
- }
85
70
  }
86
71
  // 小屏幕打开首页适配样式
87
72
  .minifont {
@@ -188,4 +173,9 @@
188
173
  color: $--color-text-primary;
189
174
  font-size:30PX;
190
175
  }
176
+ .centerText {
177
+ .text {
178
+ font-size: 18PX;
179
+ }
180
+ }
191
181
  }
@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
34
34
  // $--button-success-font-color: #FFFFFF;
35
35
  // $--radio-button-checked-font-color: #FFFFFF;
36
36
  // $--radio-font-color: $--color-text-secondary;
37
- // $--tag-info-color: $--color-text-placeholder;
37
+ $--tag-info-color: #303133;
38
38
  // $--tooltip-color: $--color-white;
39
39
  // $--checkbox-font-color: $--color-text-secondary;
40
40
 
@@ -226,7 +226,7 @@
226
226
  overflow-y: auto;
227
227
  }
228
228
  .manual-common-content::-webkit-scrollbar {
229
- width: 8PX;
229
+ width: 6PX;
230
230
  }
231
231
  }
232
232
  // 手动控制弹框
@@ -498,12 +498,12 @@
498
498
  width: 85% !important;
499
499
  }
500
500
  .el-input.is-disabled .el-input__inner {
501
- text-align: center;
501
+ text-align: left;
502
502
  }
503
503
  .el-input-number {
504
504
  width: 100%;
505
505
  .el-input__inner {
506
- text-align: center;
506
+ text-align: left;
507
507
  }
508
508
  }
509
509
  .el-select {
@@ -540,6 +540,9 @@
540
540
  }
541
541
  .el-input-number {
542
542
  width: 100%;
543
+ .el-input__inner {
544
+ text-align: left;
545
+ }
543
546
  }
544
547
  .el-input-number--mini{
545
548
  width: 100%;
@@ -1,2 +0,0 @@
1
- import OptimizeKanban from './OptimizeKanban.vue'
2
- export default OptimizeKanban
@@ -1,369 +0,0 @@
1
- /**
2
- * Copyright (c) 2020 kedacom
3
- * OpenATC is licensed under Mulan PSL v2.
4
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
5
- * You may obtain a copy of Mulan PSL v2 at:
6
- * http://license.coscl.org.cn/MulanPSL2
7
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
8
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
9
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
10
- * See the Mulan PSL v2 for more details.
11
- **/
12
- <template>
13
- <div class="kanbanOptimize">
14
- <div v-if="this.nowNumber === 1" class="optimizetype">
15
- <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
16
- <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
17
- <el-option
18
- v-for="item in typeOptions"
19
- :key="item.value"
20
- :label="$t('openatccomponents.overview.type' + item.value)"
21
- :value="item.value"
22
- >
23
- </el-option>
24
- </el-select>
25
- <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
26
- <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
27
- <!-- <el-button type="primary" @click="onOptimizeClick()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
28
- </div>
29
- <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px',marginLeft:this.nowNumber === 1 ? 0 : 0}">
30
- <div class="common-board-column-header">
31
- {{headerText}}
32
- </div>
33
- <div class="openatccomponents-board-table-header">
34
- <el-row :gutter="13">
35
- <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
36
- </el-col>
37
- <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
38
- </el-col>
39
- <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
40
- </el-col>
41
- </el-row>
42
- </div>
43
- <draggable
44
- class="common-board-column-content"
45
- :list="list"
46
- :options="options">
47
- <div class="common-board-item" v-for="element in list" :key="element.id">
48
- <el-row :gutter="13">
49
- <el-col :span="4">
50
- <el-tooltip class="item" effect="dark" placement="left">
51
- <div slot="content">{{element.name}}</div>
52
- <div class="common-phase-description">
53
- <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
54
- </div>
55
- </el-tooltip>
56
- </el-col>
57
- <el-col :span="10">
58
- <el-input-number :controls="false" class="col-content" size="small" :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
59
- </el-col>
60
- <el-col :span="10">
61
- <el-input-number :controls="false" class="col-content" size="small" :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
62
- </el-col>
63
- </el-row>
64
- </div>
65
- </draggable>
66
- </div>
67
- </div>
68
- </template>
69
- <script>
70
- import draggable from 'vuedraggable'
71
- import { getDuration } from '@/api/cross'
72
- import xdrdirselector from '@/components/XRDDirSelector'
73
-
74
- export default {
75
- name: 'patternOptimize',
76
- components: {
77
- draggable,
78
- xdrdirselector
79
- },
80
- data () {
81
- return {
82
- showStyle: {
83
- left: '7px',
84
- top: '0px'
85
- },
86
- styles: {
87
- left: '7px',
88
- top: '0px'
89
- },
90
- typeOptions: [{
91
- value: 'flow-split-opt'
92
- }, {
93
- value: 'cycle-opt'
94
- }],
95
- value: 'flow-split-opt',
96
- optimizecycle: 0
97
- }
98
- },
99
- props: {
100
- headerText: {
101
- type: String,
102
- default: 'Header'
103
- },
104
- id: {
105
- type: Number
106
- },
107
- rings: {
108
- type: Array
109
- },
110
- nowNumber: {
111
- type: Number
112
- },
113
- phaseList: {
114
- type: Array
115
- },
116
- options: {
117
- type: Object,
118
- default () {
119
- return {}
120
- }
121
- },
122
- list: {
123
- type: Array,
124
- default () {
125
- return []
126
- }
127
- },
128
- // index: {
129
- // type: Number
130
- // },
131
- ISActiveMask: {
132
- type: Boolean,
133
- default: true
134
- },
135
- // 当phase的描述为空时,显示的图形颜色。
136
- MaskColor: {
137
- type: String,
138
- default: '#000000'
139
- }
140
- },
141
- created () {
142
- // this.addMinSplit()
143
- this.addMin()
144
- },
145
- computed () {
146
-
147
- },
148
- watch: {
149
- list: {
150
- handler: function () {
151
- // let list = this.$refs.type
152
- // let flow = this.$refs.types
153
- // console.log(this.list, 'list')
154
- // let cycle = 0
155
- // let n = this.index
156
- // for (let i = 0; i < list.length; i++) {
157
- // cycle = cycle + Number(list[i].currentValue)
158
- // }
159
- // const globalParamModel = this.$store.getters.globalParamModel
160
- // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
161
- // let pattern = globalParamModel.getParamsByType('patternList')[n]
162
- // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
163
- // this.addMinSplit()
164
- // this.$emit('handleSplit', n)
165
- },
166
- deep: true
167
- }
168
- },
169
- methods: {
170
- onOptimizeClick () {
171
- let msg = this.$t('openatccomponents.pattern.algorithmEngineOptimization')
172
- const loading = this.$loading({
173
- lock: true,
174
- text: msg,
175
- spinner: 'el-icon-loading',
176
- background: 'rgba(0, 0, 0, 0.7)'
177
- })
178
- setTimeout(() => {
179
- loading.close()
180
- this.handeleOptimizeClick()
181
- }, 1000)
182
- },
183
- handeleOptimizeClick () {
184
- let newPha = []
185
- for (let i = 0; i < this.rings.length; i++) {
186
- newPha.push(...this.rings[i])
187
- }
188
- let phaseData = newPha.map(item => {
189
- return {
190
- id: item.id,
191
- flowperhour: item.flowperhour,
192
- saturation: item.saturation
193
- }
194
- })
195
- let patternList = this.$store.state.globalParam.tscParam.patternList
196
- let pattern = patternList.filter((item) => item.id === this.id)[0]
197
- let reqData = {
198
- 'type': this.value,
199
- 'optcycle': this.optimizecycle ? this.optimizecycle : 0,
200
- 'phaseList': this.phaseList,
201
- 'pattern': pattern,
202
- 'phases': phaseData
203
- }
204
- let isValidata = []
205
- for (let j = 0; j < newPha.length; j++) {
206
- let comNum = (newPha[j].length / 4) * 1700 * 0.8
207
- isValidata.push(newPha[j].flowperhour > comNum)
208
- }
209
- if (isValidata.includes(true)) {
210
- this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
211
- this.$t('openatccomponents.common.alarm'), {
212
- confirmButtonText: this.$t('eopenatccomponentsdge.common.confirm'),
213
- cancelButtonText: this.$t('openatccomponents.common.cancel'),
214
- type: 'warning'
215
- }).then(() => {
216
- getDuration(reqData).then(data => {
217
- if (data.data.success) {
218
- this.$message({
219
- type: 'success',
220
- message: this.$t('openatccomponents.pattern.success')
221
- })
222
- for (let i = 0; i < this.rings.length; i++) {
223
- for (let j = 0; j < this.rings[i].length; j++) {
224
- for (let h = 0; h < data.data.data.phase.length; h++) {
225
- if (this.rings[i][j].id === data.data.data.phase[h].id) {
226
- this.rings[i][j].value = data.data.data.phase[h].duration
227
- // this.rings[i][j].cycle = data.data.data.phase[h].cycle
228
- }
229
- }
230
- }
231
- }
232
- }
233
- }).catch(error => {
234
- console.log(error)
235
- })
236
- }).catch(() => {
237
- })
238
- } else {
239
- getDuration(reqData).then(data => {
240
- if (data.data.success) {
241
- this.$message({
242
- type: 'success',
243
- message: this.$t('openatccomponents.pattern.success')
244
- })
245
- for (let i = 0; i < this.rings.length; i++) {
246
- for (let j = 0; j < this.rings[i].length; j++) {
247
- for (let h = 0; h < data.data.data.phase.length; h++) {
248
- if (this.rings[i][j].id === data.data.data.phase[h].id) {
249
- this.rings[i][j].value = data.data.data.phase[h].duration
250
- // this.rings[i][j].cycle = data.data.data.phase[h].cycle
251
- }
252
- }
253
- }
254
- }
255
- }
256
- }).catch(error => {
257
- console.log(error)
258
- })
259
- }
260
- },
261
- addMin () {
262
- for (let i of this.list) {
263
- if (!i.flowperhour || !i.saturation) {
264
- i.length = this.list.length
265
- i.flowperhour = 0
266
- i.saturation = 1700
267
- }
268
- }
269
- }
270
- // addMinSplit () {
271
- // const globalParamModel = this.$store.getters.globalParamModel
272
- // let phaseList = globalParamModel.getParamsByType('phaseList')
273
- // for (let ls of this.list) {
274
- // let phase = phaseList.filter((item) => {
275
- // return item.id === ls.id
276
- // })[0]
277
- // if (!phase.redyellow) {
278
- // phase.redyellow = 0
279
- // }
280
- // if (!phase.yellow) {
281
- // phase.yellow = 0
282
- // }
283
- // if (!phase.redclear) {
284
- // phase.redclear = 0
285
- // }
286
- // if (!phase.flashgreen) {
287
- // phase.flashgreen = 0
288
- // }
289
- // if (!phase.phasewalk) {
290
- // phase.phasewalk = 0
291
- // }
292
- // if (!phase.pedclear) {
293
- // phase.pedclear = 0
294
- // }
295
- // // let temp1 = phase.redyellow + phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
296
- // // let temp2 = phase.phasewalk + phase.pedclear
297
- // // if (temp1 > temp2) {
298
- // // ls.minSplit = temp1
299
- // // } else {
300
- // // ls.minSplit = temp2
301
- // // }
302
- // // if (ls.mode !== 7 && ls.value < ls.minSplit) {
303
- // // ls.value = ls.minSplit
304
- // // }
305
- // // let temp1 = phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
306
- // let temp1 = phase.yellow + phase.redclear + phase.mingreen
307
- // let temp2 = phase.yellow + phase.redclear + phase.phasewalk + phase.pedclear
308
- // ls.minSplit = temp1 > temp2 ? temp1 : temp2
309
- // if (ls.mode !== 7 && ls.value < ls.minSplit) {
310
- // ls.value = ls.minSplit
311
- // this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
312
- // }
313
- // }
314
- // },
315
- // getMaxCycle (pattern) {
316
- // let rings = pattern.rings
317
- // let maxCycle = 0
318
- // for (let ring of rings) {
319
- // if (ring.length === 0) continue
320
- // let cycle = 0
321
- // for (let r of ring) {
322
- // if (r.mode === 7) { // 忽略相位不计周期
323
- // continue
324
- // }
325
- // cycle = cycle + r.value
326
- // }
327
- // if (cycle > maxCycle) {
328
- // maxCycle = cycle
329
- // }
330
- // }
331
- // return maxCycle
332
- // },
333
- // doChange (val) {
334
- // // if (val.mode === 7) {
335
- // // val.value = 0
336
- // // } else {
337
- // // val.value = 30
338
- // // }
339
- // }
340
- }
341
- }
342
- </script>
343
- <style lang="scss" scoped>
344
- .col-content {
345
- width: 100%;
346
- }
347
- .kanbanOptimize {
348
- .common-board-column {
349
- max-width: unset !important;
350
- }
351
- }
352
- .optimizetype{
353
- // float: left;
354
- font-size: 14PX;
355
- margin:0 0 10PX 0;
356
- .el-input {
357
- width: 80PX;
358
- }
359
- .el-select{
360
- width: 145PX;
361
- }
362
- .el-button {
363
- margin-left: 10PX;
364
- }
365
- .optimiNum {
366
- padding-left: 10PX;
367
- }
368
- }
369
- </style>
@@ -1 +0,0 @@
1
- {}