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.
- package/package/kisscomps/components/BoardCard/BoardCard.vue +11 -0
- package/package/kisscomps/components/Channelization/Channelization.vue +1 -1
- package/package/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue +1 -1
- 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/DrawChannelization/drawsvg/index.vue +1 -1
- package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +63 -0
- package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -1
- package/package/kisscomps/components/OverLap/OverLap.vue +1 -1
- package/package/kisscomps/components/OverviewComponent/index.vue +11 -7
- package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
- package/package/kisscomps/components/PatternStatus/PatternStatus.vue +84 -9
- package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +11 -4
- package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
- package/package/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +34 -2
- package/package/kisscomps/components/StageOptimize/StageOptimize.vue +310 -0
- package/package/kisscomps/components/StageOptimize/index.js +2 -0
- package/package/kisscomps/components/StageOptimize/index.vue +310 -0
- package/package/kisscomps/components/overView/index.vue +2 -2
- package/package/kisscomps/components/patternList/patternList.vue +11 -0
- package/package/kisscomps/index.js +2 -0
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/i18n/language/en.js +12 -12
- package/src/i18n/language/zh.js +17 -17
- package/src/kisscomps/components/BoardCard/BoardCard.vue +11 -0
- package/src/kisscomps/components/Channelization/Channelization.vue +1 -1
- package/src/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue +1 -1
- 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/DrawChannelization/drawsvg/index.vue +1 -1
- package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +63 -0
- package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +1 -1
- package/src/kisscomps/components/OverLap/OverLap.vue +1 -1
- package/src/kisscomps/components/OverviewComponent/index.vue +11 -7
- package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
- package/src/kisscomps/components/PatternStatus/PatternStatus.vue +84 -9
- package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +11 -4
- package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
- package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +34 -2
- package/src/kisscomps/components/StageOptimize/StageOptimize.vue +310 -0
- package/src/kisscomps/components/StageOptimize/index.js +2 -0
- package/src/kisscomps/components/StageOptimize/index.vue +310 -0
- package/src/kisscomps/components/overView/index.vue +2 -2
- package/src/kisscomps/components/patternList/patternList.vue +11 -0
- package/src/kisscomps/index.js +2 -0
- package/src/utils/ControlFormat.js +2 -2
- package/src/views/intersection.vue +7 -6
- package/src/views/intersection2.vue +4 -4
- package/src/views/overView.vue +27 -5
- 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
|
@@ -0,0 +1,310 @@
|
|
|
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>
|
|
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="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="common-board-column" style="margin-top: 50px;">
|
|
30
|
+
<div class="common-board-column-header">
|
|
31
|
+
{{headerText}}
|
|
32
|
+
</div>
|
|
33
|
+
<div class="common-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="stageData"
|
|
46
|
+
:options="options">
|
|
47
|
+
<div class="common-board-item" v-for="element in stageData" :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 v-if="element.desc.length > 0" 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 '../XRDDirSelector/XRDDirSelector'
|
|
73
|
+
|
|
74
|
+
export default {
|
|
75
|
+
name: 'StageOptimize',
|
|
76
|
+
components: {
|
|
77
|
+
draggable,
|
|
78
|
+
xdrdirselector
|
|
79
|
+
},
|
|
80
|
+
data () {
|
|
81
|
+
return {
|
|
82
|
+
showStyle: {
|
|
83
|
+
left: '2px',
|
|
84
|
+
top: '0px'
|
|
85
|
+
},
|
|
86
|
+
styles: {
|
|
87
|
+
left: '1px',
|
|
88
|
+
top: '0px'
|
|
89
|
+
},
|
|
90
|
+
typeOptions: [{
|
|
91
|
+
value: 'flow-split-opt'
|
|
92
|
+
}, {
|
|
93
|
+
value: 'cycle-opt'
|
|
94
|
+
}],
|
|
95
|
+
value: '',
|
|
96
|
+
optimizecycle: 0
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
props: {
|
|
100
|
+
headerText: {
|
|
101
|
+
type: String,
|
|
102
|
+
default: 'Header'
|
|
103
|
+
},
|
|
104
|
+
contrloType: {
|
|
105
|
+
type: String
|
|
106
|
+
},
|
|
107
|
+
stageData: {
|
|
108
|
+
type: Array
|
|
109
|
+
},
|
|
110
|
+
stagesChange: {
|
|
111
|
+
type: Array
|
|
112
|
+
},
|
|
113
|
+
id: {
|
|
114
|
+
type: Number
|
|
115
|
+
},
|
|
116
|
+
rings: {
|
|
117
|
+
type: Object
|
|
118
|
+
},
|
|
119
|
+
nowNumber: {
|
|
120
|
+
type: Number
|
|
121
|
+
},
|
|
122
|
+
phaseList: {
|
|
123
|
+
type: Array
|
|
124
|
+
},
|
|
125
|
+
options: {
|
|
126
|
+
type: Object,
|
|
127
|
+
default () {
|
|
128
|
+
return {}
|
|
129
|
+
}
|
|
130
|
+
},
|
|
131
|
+
list: {
|
|
132
|
+
type: Array,
|
|
133
|
+
default () {
|
|
134
|
+
return []
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
// index: {
|
|
138
|
+
// type: Number
|
|
139
|
+
// },
|
|
140
|
+
ISActiveMask: {
|
|
141
|
+
type: Boolean,
|
|
142
|
+
default: true
|
|
143
|
+
},
|
|
144
|
+
// 当phase的描述为空时,显示的图形颜色。
|
|
145
|
+
MaskColor: {
|
|
146
|
+
type: String,
|
|
147
|
+
default: '#000000'
|
|
148
|
+
}
|
|
149
|
+
},
|
|
150
|
+
created () {
|
|
151
|
+
// this.addMinSplit()
|
|
152
|
+
this.addMin()
|
|
153
|
+
},
|
|
154
|
+
watch: {
|
|
155
|
+
list: {
|
|
156
|
+
handler: function () {
|
|
157
|
+
this.addMin()
|
|
158
|
+
// let list = this.$refs.type
|
|
159
|
+
// let flow = this.$refs.types
|
|
160
|
+
// console.log(this.list, 'list')
|
|
161
|
+
// let cycle = 0
|
|
162
|
+
// let n = this.index
|
|
163
|
+
// for (let i = 0; i < list.length; i++) {
|
|
164
|
+
// cycle = cycle + Number(list[i].currentValue)
|
|
165
|
+
// }
|
|
166
|
+
// const globalParamModel = this.$store.getters.globalParamModel
|
|
167
|
+
// // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
|
|
168
|
+
// let pattern = globalParamModel.getParamsByType('patternList')[n]
|
|
169
|
+
// globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
|
|
170
|
+
// this.addMinSplit()
|
|
171
|
+
// this.$emit('handleSplit', n)
|
|
172
|
+
},
|
|
173
|
+
deep: true
|
|
174
|
+
},
|
|
175
|
+
stageData: {
|
|
176
|
+
handler: function () {
|
|
177
|
+
this.addMins()
|
|
178
|
+
// let list = this.$refs.type
|
|
179
|
+
// let flow = this.$refs.types
|
|
180
|
+
// console.log(this.list, 'list')
|
|
181
|
+
// let cycle = 0
|
|
182
|
+
// let n = this.index
|
|
183
|
+
// for (let i = 0; i < list.length; i++) {
|
|
184
|
+
// cycle = cycle + Number(list[i].currentValue)
|
|
185
|
+
// }
|
|
186
|
+
// const globalParamModel = this.$store.getters.globalParamModel
|
|
187
|
+
// // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
|
|
188
|
+
// let pattern = globalParamModel.getParamsByType('patternList')[n]
|
|
189
|
+
// globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
|
|
190
|
+
// this.addMinSplit()
|
|
191
|
+
// this.$emit('handleSplit', n)
|
|
192
|
+
},
|
|
193
|
+
deep: true
|
|
194
|
+
}
|
|
195
|
+
},
|
|
196
|
+
methods: {
|
|
197
|
+
optimize () {
|
|
198
|
+
let _that = this
|
|
199
|
+
let newPha = []
|
|
200
|
+
for (let i = 0; i < _that.rings.rings.length; i++) {
|
|
201
|
+
newPha.push(..._that.rings.rings[i])
|
|
202
|
+
}
|
|
203
|
+
let phaseData = newPha.map(item => {
|
|
204
|
+
return {
|
|
205
|
+
id: item.id,
|
|
206
|
+
flowperhour: item.flowperhour,
|
|
207
|
+
saturation: item.saturation
|
|
208
|
+
}
|
|
209
|
+
})
|
|
210
|
+
// let patternList = _that.$store.state.globalParam.tscParam.patternList
|
|
211
|
+
// console.log(patternList, 'patternList')
|
|
212
|
+
let pattern = _that.rings
|
|
213
|
+
let reqData = {
|
|
214
|
+
'type': _that.value,
|
|
215
|
+
'optcycle': _that.optimizecycle,
|
|
216
|
+
'phaseList': _that.phaseList,
|
|
217
|
+
'pattern': pattern,
|
|
218
|
+
'phases': phaseData
|
|
219
|
+
}
|
|
220
|
+
let isValidata = []
|
|
221
|
+
for (let j = 0; j < newPha.length; j++) {
|
|
222
|
+
let comNum = (newPha[j].length / 4) * 1700 * 0.8
|
|
223
|
+
isValidata.push(newPha[j].flowperhour > comNum)
|
|
224
|
+
}
|
|
225
|
+
if (isValidata.includes(true)) {
|
|
226
|
+
this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
|
|
227
|
+
this.$t('openatccomponents.common.alarm'), {
|
|
228
|
+
confirmButtonText: this.$t('openatccomponents.common.confirm'),
|
|
229
|
+
cancelButtonText: this.$t('openatccomponents.common.cancel'),
|
|
230
|
+
type: 'warning'
|
|
231
|
+
}).then(() => {
|
|
232
|
+
getDuration(reqData).then(data => {
|
|
233
|
+
if (data.data.success) {
|
|
234
|
+
_that.$message({
|
|
235
|
+
type: 'success',
|
|
236
|
+
message: _that.$t('openatccomponents.pattern.success')
|
|
237
|
+
})
|
|
238
|
+
for (let i = 0; i < _that.stagesChange.length; i++) {
|
|
239
|
+
if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
|
|
240
|
+
_that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
this.$emit('optimizestage', this.id)
|
|
244
|
+
}
|
|
245
|
+
}).catch(error => {
|
|
246
|
+
console.log(error)
|
|
247
|
+
})
|
|
248
|
+
}).catch(() => {
|
|
249
|
+
})
|
|
250
|
+
} else {
|
|
251
|
+
getDuration(reqData).then(data => {
|
|
252
|
+
if (data.data.success) {
|
|
253
|
+
_that.$message({
|
|
254
|
+
type: 'success',
|
|
255
|
+
message: _that.$t('openatccomponents.pattern.success')
|
|
256
|
+
})
|
|
257
|
+
for (let i = 0; i < _that.stagesChange.length; i++) {
|
|
258
|
+
if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
|
|
259
|
+
_that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
this.$emit('optimizestage', this.id)
|
|
263
|
+
}
|
|
264
|
+
}).catch(error => {
|
|
265
|
+
console.log(error)
|
|
266
|
+
})
|
|
267
|
+
}
|
|
268
|
+
},
|
|
269
|
+
addMins () {
|
|
270
|
+
for (let i of this.stageData) {
|
|
271
|
+
if (!i.flowperhour || !i.saturation) {
|
|
272
|
+
i.flowperhour = 0
|
|
273
|
+
i.saturation = 1700
|
|
274
|
+
i.length = this.list.length
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
},
|
|
278
|
+
addMin () {
|
|
279
|
+
for (let i of this.list) {
|
|
280
|
+
if (!i.flowperhour || !i.saturation) {
|
|
281
|
+
i.flowperhour = 0
|
|
282
|
+
i.saturation = 1700
|
|
283
|
+
i.length = this.list.length
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
</script>
|
|
290
|
+
<style lang="scss" scoped>
|
|
291
|
+
.col-content {
|
|
292
|
+
width: 100%;
|
|
293
|
+
}
|
|
294
|
+
.optimizetype{
|
|
295
|
+
position: absolute;
|
|
296
|
+
margin:0 0 10PX 0;
|
|
297
|
+
.el-input {
|
|
298
|
+
width: 80PX;
|
|
299
|
+
}
|
|
300
|
+
.el-select{
|
|
301
|
+
width: 145PX;
|
|
302
|
+
}
|
|
303
|
+
.el-button {
|
|
304
|
+
margin-left: 10PX;
|
|
305
|
+
}
|
|
306
|
+
.optimiNum {
|
|
307
|
+
padding-left: 10PX;
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
</style>
|
|
@@ -0,0 +1,310 @@
|
|
|
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>
|
|
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="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="common-board-column" style="margin-top: 50px;">
|
|
30
|
+
<div class="common-board-column-header">
|
|
31
|
+
{{headerText}}
|
|
32
|
+
</div>
|
|
33
|
+
<div class="common-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="stageData"
|
|
46
|
+
:options="options">
|
|
47
|
+
<div class="common-board-item" v-for="element in stageData" :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 v-if="element.desc.length > 0" 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 '../XRDDirSelector/XRDDirSelector'
|
|
73
|
+
|
|
74
|
+
export default {
|
|
75
|
+
name: 'StageOptimize',
|
|
76
|
+
components: {
|
|
77
|
+
draggable,
|
|
78
|
+
xdrdirselector
|
|
79
|
+
},
|
|
80
|
+
data () {
|
|
81
|
+
return {
|
|
82
|
+
showStyle: {
|
|
83
|
+
left: '2px',
|
|
84
|
+
top: '0px'
|
|
85
|
+
},
|
|
86
|
+
styles: {
|
|
87
|
+
left: '1px',
|
|
88
|
+
top: '0px'
|
|
89
|
+
},
|
|
90
|
+
typeOptions: [{
|
|
91
|
+
value: 'flow-split-opt'
|
|
92
|
+
}, {
|
|
93
|
+
value: 'cycle-opt'
|
|
94
|
+
}],
|
|
95
|
+
value: '',
|
|
96
|
+
optimizecycle: 0
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
props: {
|
|
100
|
+
headerText: {
|
|
101
|
+
type: String,
|
|
102
|
+
default: 'Header'
|
|
103
|
+
},
|
|
104
|
+
contrloType: {
|
|
105
|
+
type: String
|
|
106
|
+
},
|
|
107
|
+
stageData: {
|
|
108
|
+
type: Array
|
|
109
|
+
},
|
|
110
|
+
stagesChange: {
|
|
111
|
+
type: Array
|
|
112
|
+
},
|
|
113
|
+
id: {
|
|
114
|
+
type: Number
|
|
115
|
+
},
|
|
116
|
+
rings: {
|
|
117
|
+
type: Object
|
|
118
|
+
},
|
|
119
|
+
nowNumber: {
|
|
120
|
+
type: Number
|
|
121
|
+
},
|
|
122
|
+
phaseList: {
|
|
123
|
+
type: Array
|
|
124
|
+
},
|
|
125
|
+
options: {
|
|
126
|
+
type: Object,
|
|
127
|
+
default () {
|
|
128
|
+
return {}
|
|
129
|
+
}
|
|
130
|
+
},
|
|
131
|
+
list: {
|
|
132
|
+
type: Array,
|
|
133
|
+
default () {
|
|
134
|
+
return []
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
// index: {
|
|
138
|
+
// type: Number
|
|
139
|
+
// },
|
|
140
|
+
ISActiveMask: {
|
|
141
|
+
type: Boolean,
|
|
142
|
+
default: true
|
|
143
|
+
},
|
|
144
|
+
// 当phase的描述为空时,显示的图形颜色。
|
|
145
|
+
MaskColor: {
|
|
146
|
+
type: String,
|
|
147
|
+
default: '#000000'
|
|
148
|
+
}
|
|
149
|
+
},
|
|
150
|
+
created () {
|
|
151
|
+
// this.addMinSplit()
|
|
152
|
+
this.addMin()
|
|
153
|
+
},
|
|
154
|
+
watch: {
|
|
155
|
+
list: {
|
|
156
|
+
handler: function () {
|
|
157
|
+
this.addMin()
|
|
158
|
+
// let list = this.$refs.type
|
|
159
|
+
// let flow = this.$refs.types
|
|
160
|
+
// console.log(this.list, 'list')
|
|
161
|
+
// let cycle = 0
|
|
162
|
+
// let n = this.index
|
|
163
|
+
// for (let i = 0; i < list.length; i++) {
|
|
164
|
+
// cycle = cycle + Number(list[i].currentValue)
|
|
165
|
+
// }
|
|
166
|
+
// const globalParamModel = this.$store.getters.globalParamModel
|
|
167
|
+
// // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
|
|
168
|
+
// let pattern = globalParamModel.getParamsByType('patternList')[n]
|
|
169
|
+
// globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
|
|
170
|
+
// this.addMinSplit()
|
|
171
|
+
// this.$emit('handleSplit', n)
|
|
172
|
+
},
|
|
173
|
+
deep: true
|
|
174
|
+
},
|
|
175
|
+
stageData: {
|
|
176
|
+
handler: function () {
|
|
177
|
+
this.addMins()
|
|
178
|
+
// let list = this.$refs.type
|
|
179
|
+
// let flow = this.$refs.types
|
|
180
|
+
// console.log(this.list, 'list')
|
|
181
|
+
// let cycle = 0
|
|
182
|
+
// let n = this.index
|
|
183
|
+
// for (let i = 0; i < list.length; i++) {
|
|
184
|
+
// cycle = cycle + Number(list[i].currentValue)
|
|
185
|
+
// }
|
|
186
|
+
// const globalParamModel = this.$store.getters.globalParamModel
|
|
187
|
+
// // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
|
|
188
|
+
// let pattern = globalParamModel.getParamsByType('patternList')[n]
|
|
189
|
+
// globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
|
|
190
|
+
// this.addMinSplit()
|
|
191
|
+
// this.$emit('handleSplit', n)
|
|
192
|
+
},
|
|
193
|
+
deep: true
|
|
194
|
+
}
|
|
195
|
+
},
|
|
196
|
+
methods: {
|
|
197
|
+
optimize () {
|
|
198
|
+
let _that = this
|
|
199
|
+
let newPha = []
|
|
200
|
+
for (let i = 0; i < _that.rings.rings.length; i++) {
|
|
201
|
+
newPha.push(..._that.rings.rings[i])
|
|
202
|
+
}
|
|
203
|
+
let phaseData = newPha.map(item => {
|
|
204
|
+
return {
|
|
205
|
+
id: item.id,
|
|
206
|
+
flowperhour: item.flowperhour,
|
|
207
|
+
saturation: item.saturation
|
|
208
|
+
}
|
|
209
|
+
})
|
|
210
|
+
// let patternList = _that.$store.state.globalParam.tscParam.patternList
|
|
211
|
+
// console.log(patternList, 'patternList')
|
|
212
|
+
let pattern = _that.rings
|
|
213
|
+
let reqData = {
|
|
214
|
+
'type': _that.value,
|
|
215
|
+
'optcycle': _that.optimizecycle,
|
|
216
|
+
'phaseList': _that.phaseList,
|
|
217
|
+
'pattern': pattern,
|
|
218
|
+
'phases': phaseData
|
|
219
|
+
}
|
|
220
|
+
let isValidata = []
|
|
221
|
+
for (let j = 0; j < newPha.length; j++) {
|
|
222
|
+
let comNum = (newPha[j].length / 4) * 1700 * 0.8
|
|
223
|
+
isValidata.push(newPha[j].flowperhour > comNum)
|
|
224
|
+
}
|
|
225
|
+
if (isValidata.includes(true)) {
|
|
226
|
+
this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
|
|
227
|
+
this.$t('openatccomponents.common.alarm'), {
|
|
228
|
+
confirmButtonText: this.$t('openatccomponents.common.confirm'),
|
|
229
|
+
cancelButtonText: this.$t('openatccomponents.common.cancel'),
|
|
230
|
+
type: 'warning'
|
|
231
|
+
}).then(() => {
|
|
232
|
+
getDuration(reqData).then(data => {
|
|
233
|
+
if (data.data.success) {
|
|
234
|
+
_that.$message({
|
|
235
|
+
type: 'success',
|
|
236
|
+
message: _that.$t('openatccomponents.pattern.success')
|
|
237
|
+
})
|
|
238
|
+
for (let i = 0; i < _that.stagesChange.length; i++) {
|
|
239
|
+
if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
|
|
240
|
+
_that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
this.$emit('optimizestage', this.id)
|
|
244
|
+
}
|
|
245
|
+
}).catch(error => {
|
|
246
|
+
console.log(error)
|
|
247
|
+
})
|
|
248
|
+
}).catch(() => {
|
|
249
|
+
})
|
|
250
|
+
} else {
|
|
251
|
+
getDuration(reqData).then(data => {
|
|
252
|
+
if (data.data.success) {
|
|
253
|
+
_that.$message({
|
|
254
|
+
type: 'success',
|
|
255
|
+
message: _that.$t('openatccomponents.pattern.success')
|
|
256
|
+
})
|
|
257
|
+
for (let i = 0; i < _that.stagesChange.length; i++) {
|
|
258
|
+
if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
|
|
259
|
+
_that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
this.$emit('optimizestage', this.id)
|
|
263
|
+
}
|
|
264
|
+
}).catch(error => {
|
|
265
|
+
console.log(error)
|
|
266
|
+
})
|
|
267
|
+
}
|
|
268
|
+
},
|
|
269
|
+
addMins () {
|
|
270
|
+
for (let i of this.stageData) {
|
|
271
|
+
if (!i.flowperhour || !i.saturation) {
|
|
272
|
+
i.flowperhour = 0
|
|
273
|
+
i.saturation = 1700
|
|
274
|
+
i.length = this.list.length
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
},
|
|
278
|
+
addMin () {
|
|
279
|
+
for (let i of this.list) {
|
|
280
|
+
if (!i.flowperhour || !i.saturation) {
|
|
281
|
+
i.flowperhour = 0
|
|
282
|
+
i.saturation = 1700
|
|
283
|
+
i.length = this.list.length
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
</script>
|
|
290
|
+
<style lang="scss" scoped>
|
|
291
|
+
.col-content {
|
|
292
|
+
width: 100%;
|
|
293
|
+
}
|
|
294
|
+
.optimizetype{
|
|
295
|
+
position: absolute;
|
|
296
|
+
margin:0 0 10PX 0;
|
|
297
|
+
.el-input {
|
|
298
|
+
width: 80PX;
|
|
299
|
+
}
|
|
300
|
+
.el-select{
|
|
301
|
+
width: 145PX;
|
|
302
|
+
}
|
|
303
|
+
.el-button {
|
|
304
|
+
margin-left: 10PX;
|
|
305
|
+
}
|
|
306
|
+
.optimiNum {
|
|
307
|
+
padding-left: 10PX;
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
</style>
|
|
@@ -153,8 +153,8 @@ export default {
|
|
|
153
153
|
volumeControlTimer: null, // 流量定时器
|
|
154
154
|
ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
|
|
155
155
|
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']]),
|
|
156
|
-
ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '
|
|
157
|
-
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, '
|
|
156
|
+
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, '设备维护']]),
|
|
157
|
+
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']]),
|
|
158
158
|
phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红,黄,绿
|
|
159
159
|
phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红,黄,绿
|
|
160
160
|
ip: '--',
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
:contrloType="contrloType"
|
|
6
6
|
:stagesChange="stagesChange"
|
|
7
7
|
:isShowTip="isShowTip"
|
|
8
|
+
:isMove="isMove"
|
|
8
9
|
:patternStatusList="patternStatusList"
|
|
9
10
|
:cycles="cycles"
|
|
10
11
|
:cycle="cycle"
|
|
@@ -19,6 +20,7 @@
|
|
|
19
20
|
:agentId="agentId"
|
|
20
21
|
:controlData="controlData"
|
|
21
22
|
:syncTime="syncTime"
|
|
23
|
+
@handleSplitMove="handleSplitMove"
|
|
22
24
|
:isPhase="isPhase"
|
|
23
25
|
>
|
|
24
26
|
</BoardCard>
|
|
@@ -502,6 +504,10 @@ export default {
|
|
|
502
504
|
type: Boolean,
|
|
503
505
|
default: true
|
|
504
506
|
},
|
|
507
|
+
isMove: {
|
|
508
|
+
type: Boolean,
|
|
509
|
+
default: true
|
|
510
|
+
},
|
|
505
511
|
contrloType: {
|
|
506
512
|
type: String
|
|
507
513
|
},
|
|
@@ -581,6 +587,11 @@ export default {
|
|
|
581
587
|
// if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
|
|
582
588
|
// this.resetCrossDiagram()
|
|
583
589
|
// }
|
|
590
|
+
},
|
|
591
|
+
methods: {
|
|
592
|
+
handleSplitMove (data) {
|
|
593
|
+
this.$emit('handleSplitMove', data)
|
|
594
|
+
}
|
|
584
595
|
}
|
|
585
596
|
}
|
|
586
597
|
</script>
|
|
@@ -12,6 +12,7 @@ import FaultDetailModal from './components/FaultDetailModal/index'
|
|
|
12
12
|
import CommonKanban from './components/CommonKanban/index'
|
|
13
13
|
import patternList from './components/patternList/index'
|
|
14
14
|
import PatternStatus from './components/PatternStatus/index'
|
|
15
|
+
import StageOptimize from './components/StageOptimize/index'
|
|
15
16
|
import BoardCard from './components/BoardCard/index'
|
|
16
17
|
import StageStatus from './components/StageStatus/index'
|
|
17
18
|
import OverLap from './components/OverLap/index'
|
|
@@ -69,6 +70,7 @@ const components = {
|
|
|
69
70
|
priorityControl,
|
|
70
71
|
tentativeplancontrolmodal,
|
|
71
72
|
PhaseDirectionText,
|
|
73
|
+
StageOptimize,
|
|
72
74
|
patternConfig,
|
|
73
75
|
XiaoKanBan,
|
|
74
76
|
PhaseDirectionSelect,
|