openatc-components 0.5.49 → 0.5.51
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/OptimizeKanban/index.js +2 -0
- package/package/kisscomps/components/OptimizeKanban/index.vue +369 -0
- package/package/kisscomps/components/PatternStatus/PatternStatus.vue +29 -29
- package/package/kisscomps/components/StageOptimize/index.vue +310 -0
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/kisscomps/components/PatternStatus/PatternStatus.vue +29 -29
- package/src/node_modules/.package_versions.json +1 -0
|
@@ -0,0 +1,369 @@
|
|
|
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>
|
|
@@ -678,14 +678,14 @@ export default {
|
|
|
678
678
|
obj.id = ring.phases
|
|
679
679
|
// if (ring.sum) {
|
|
680
680
|
// obj.sum = ring.sum
|
|
681
|
-
// obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
681
|
+
// obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
682
682
|
// } else {
|
|
683
|
-
// obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
683
|
+
// obj.redWidth = ((currPhase.redclear || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
684
684
|
// }
|
|
685
685
|
// obj.mode = ring.mode
|
|
686
686
|
obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
|
|
687
|
-
// obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
688
|
-
// obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
687
|
+
// obj.flashgreen = ((currPhase.flashgreen || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
688
|
+
// obj.yellowWidth = ((currPhase.yellow || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
689
689
|
// 忽略相位不显示
|
|
690
690
|
// let mode = ring.mode
|
|
691
691
|
// if (mode !== 7) { // 忽略相位不显示
|
|
@@ -1148,13 +1148,13 @@ export default {
|
|
|
1148
1148
|
obj.cycle = cycle
|
|
1149
1149
|
if (ring.sum) {
|
|
1150
1150
|
obj.sum = ring.sum
|
|
1151
|
-
obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1151
|
+
obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1152
1152
|
} else {
|
|
1153
|
-
obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
|
|
1153
|
+
obj.redWidth = ((currPhase.redclear || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1154
1154
|
}
|
|
1155
|
-
obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
|
|
1156
|
-
obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
|
|
1157
|
-
obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1155
|
+
obj.flashgreen = (((currPhase.flashgreen || 0) || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1156
|
+
obj.yellowWidth = ((currPhase.yellow || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1157
|
+
obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1158
1158
|
// 忽略相位不显示
|
|
1159
1159
|
// let mode = ring.mode
|
|
1160
1160
|
// if (mode !== 7) { // 忽略相位不显示
|
|
@@ -1452,13 +1452,13 @@ export default {
|
|
|
1452
1452
|
obj.cycle = cycle
|
|
1453
1453
|
if (ring.sum) {
|
|
1454
1454
|
obj.sum = ring.sum
|
|
1455
|
-
obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1455
|
+
obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1456
1456
|
} else {
|
|
1457
|
-
obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
|
|
1457
|
+
obj.redWidth = ((currPhase.redclear || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1458
1458
|
}
|
|
1459
|
-
obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
|
|
1460
|
-
obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
|
|
1461
|
-
obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1459
|
+
obj.flashgreen = ((currPhase.flashgreen || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1460
|
+
obj.yellowWidth = ((currPhase.yellow || 0) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1461
|
+
obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.max ? this.max : cycle) * 100) + '%'
|
|
1462
1462
|
// 忽略相位不显示
|
|
1463
1463
|
// let mode = ring.mode
|
|
1464
1464
|
// if (mode !== 7) { // 忽略相位不显示
|
|
@@ -1659,6 +1659,9 @@ export default {
|
|
|
1659
1659
|
if (this.patternList) {
|
|
1660
1660
|
this.setBarrier(ringTeams, val)
|
|
1661
1661
|
}
|
|
1662
|
+
if (newRings.length > 1) {
|
|
1663
|
+
this.fillGap(ringTeams, val)
|
|
1664
|
+
}
|
|
1662
1665
|
if (this.cycleChange) {
|
|
1663
1666
|
const globalParamModel = this.$store.getters.globalParamModel
|
|
1664
1667
|
let pattern = globalParamModel.getParamsByType('patternList')
|
|
@@ -1668,9 +1671,6 @@ export default {
|
|
|
1668
1671
|
} else {
|
|
1669
1672
|
this.max = ''
|
|
1670
1673
|
}
|
|
1671
|
-
if (newRings.length > 1) {
|
|
1672
|
-
this.fillGap(ringTeams, val)
|
|
1673
|
-
}
|
|
1674
1674
|
let barrier = this.step2(ringTeams, newPattern)
|
|
1675
1675
|
let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
|
|
1676
1676
|
this.barrierList = barrierLeft.map(j => {
|
|
@@ -1742,29 +1742,29 @@ export default {
|
|
|
1742
1742
|
}
|
|
1743
1743
|
obj.split = split
|
|
1744
1744
|
obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
|
|
1745
|
-
const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
|
|
1746
|
-
const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
|
|
1745
|
+
const isZero = split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)
|
|
1746
|
+
const allAdd = split + (currPhase.redclear || 0) + (currPhase.yellow || 0) + (currPhase.flashgreen || 0)
|
|
1747
1747
|
if (isZero <= 0) {
|
|
1748
1748
|
if (ring.sum) {
|
|
1749
1749
|
obj.sum = ring.sum
|
|
1750
|
-
obj.redWidth = ((((currPhase.redclear + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1750
|
+
obj.redWidth = (((((currPhase.redclear || 0) + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1751
1751
|
} else {
|
|
1752
|
-
obj.redWidth = (((currPhase.redclear / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1752
|
+
obj.redWidth = ((((currPhase.redclear || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1753
1753
|
}
|
|
1754
|
-
obj.greenWidth = (((split - (currPhase.redclear / allAdd) - (currPhase.yellow / allAdd) - (currPhase.flashgreen / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1755
|
-
obj.yellowWidth = (((currPhase.yellow / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1756
|
-
obj.flashgreen = (((currPhase.flashgreen / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1754
|
+
obj.greenWidth = (((split - ((currPhase.redclear || 0) / allAdd) - ((currPhase.yellow || 0) / allAdd) - ((currPhase.flashgreen || 0) / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1755
|
+
obj.yellowWidth = ((((currPhase.yellow || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1756
|
+
obj.flashgreen = ((((currPhase.flashgreen || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
|
|
1757
1757
|
} else {
|
|
1758
1758
|
if (ring.sum) {
|
|
1759
1759
|
obj.sum = ring.sum
|
|
1760
|
-
obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1760
|
+
obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1761
1761
|
} else {
|
|
1762
|
-
obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1762
|
+
obj.redWidth = ((currPhase.redclear || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1763
1763
|
}
|
|
1764
1764
|
obj.mode = ring.mode
|
|
1765
|
-
obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1766
|
-
obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1767
|
-
obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1765
|
+
obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1766
|
+
obj.flashgreen = ((currPhase.flashgreen || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1767
|
+
obj.yellowWidth = ((currPhase.yellow || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
|
|
1768
1768
|
}
|
|
1769
1769
|
// 忽略相位不显示
|
|
1770
1770
|
// let mode = ring.mode
|