openatc-components 0.1.95 → 0.1.97
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/ExpendConfig/ExpendConfig.vue +8 -8
- package/package/kisscomps/components/PatternStatus/PatternStatus.vue +1 -1
- package/package/kisscomps/components/StageStatus/StageStatus.vue +11 -3
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/kisscomps/components/ExpendConfig/ExpendConfig.vue +8 -8
- package/src/kisscomps/components/PatternStatus/PatternStatus.vue +1 -1
- package/src/kisscomps/components/StageStatus/StageStatus.vue +11 -3
- package/src/node_modules/.package_versions.json +1 -0
- package/static/styles/schemeconfig.scss +6 -3
|
@@ -6,13 +6,13 @@
|
|
|
6
6
|
</div>
|
|
7
7
|
<div class="common-board-table-header">
|
|
8
8
|
<el-row :gutter="13">
|
|
9
|
-
<el-col :span="
|
|
9
|
+
<el-col :span="3">{{this.$t('openatccomponents.pattern.phase')}}
|
|
10
10
|
</el-col>
|
|
11
|
-
<el-col :span="
|
|
11
|
+
<el-col :span="11">{{this.$t('openatccomponents.pattern.property')}}
|
|
12
12
|
</el-col>
|
|
13
|
-
<el-col :span="
|
|
13
|
+
<el-col :span="5">{{this.$t('openatccomponents.pattern.delaystart')}}
|
|
14
14
|
</el-col>
|
|
15
|
-
<el-col :span="
|
|
15
|
+
<el-col :span="5">{{this.$t('openatccomponents.pattern.advanceend')}}
|
|
16
16
|
</el-col>
|
|
17
17
|
</el-row>
|
|
18
18
|
</div>
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
:options="options">
|
|
23
23
|
<div class="common-board-item" v-for="element in list" :key="element.id">
|
|
24
24
|
<el-row :gutter="13" >
|
|
25
|
-
<el-col :span="
|
|
25
|
+
<el-col :span="3">
|
|
26
26
|
<el-tooltip class="item" effect="dark" placement="left">
|
|
27
27
|
<div slot="content">{{element.name}}</div>
|
|
28
28
|
<div class="common-phase-description">
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
</div>
|
|
31
31
|
</el-tooltip>
|
|
32
32
|
</el-col>
|
|
33
|
-
<el-col :span="
|
|
33
|
+
<el-col :span="11">
|
|
34
34
|
<el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
|
|
35
35
|
<el-option
|
|
36
36
|
v-for="item in coordphaseOption"
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
</el-option>
|
|
41
41
|
</el-select>
|
|
42
42
|
</el-col>
|
|
43
|
-
<el-col :span="
|
|
43
|
+
<el-col :span="5">
|
|
44
44
|
<el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
|
|
45
45
|
</el-col>
|
|
46
|
-
<el-col :span="
|
|
46
|
+
<el-col :span="5">
|
|
47
47
|
<el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
|
|
48
48
|
</el-col>
|
|
49
49
|
</el-row>
|
|
@@ -230,8 +230,16 @@ export default {
|
|
|
230
230
|
return item.id === this.controlData.patternid
|
|
231
231
|
})[0].rings
|
|
232
232
|
if (!rings.rings) return
|
|
233
|
-
|
|
234
|
-
let
|
|
233
|
+
let filterPattern = []
|
|
234
|
+
for (let i of ringList) {
|
|
235
|
+
for (let j of this.controlData.rings) {
|
|
236
|
+
let filterSequence = i.filter(item => j.sequence.includes(item.id))
|
|
237
|
+
if (filterSequence.length > 0) {
|
|
238
|
+
filterPattern.push(filterSequence)
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
let mapAdd = filterPattern.map(item => {
|
|
235
243
|
return item.map(val => {
|
|
236
244
|
return val.value + (val.sum ? val.sum : 0)
|
|
237
245
|
})
|
|
@@ -242,7 +250,7 @@ export default {
|
|
|
242
250
|
}) : 0
|
|
243
251
|
}) : 0
|
|
244
252
|
this.max = Math.max(...maxCycle)// 每个环的周期最大值
|
|
245
|
-
this.getControl(
|
|
253
|
+
this.getControl(filterPattern)
|
|
246
254
|
}
|
|
247
255
|
} else {
|
|
248
256
|
let mapAdd = rings.map(item => {
|