openatc-components 0.0.69 → 0.0.72
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 +19 -7
- package/package/kisscomps/components/KanBan/kanban.vue +2 -2
- package/package/kisscomps/components/OverLap/OverLap.vue +1 -1
- package/package/kisscomps/components/PatternStatus/PatternStatus.vue +3 -1
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/kisscomps/components/ExpendConfig/ExpendConfig.vue +19 -7
- package/src/kisscomps/components/KanBan/kanban.vue +2 -2
- package/src/kisscomps/components/OverLap/OverLap.vue +1 -1
- package/src/kisscomps/components/PatternStatus/PatternStatus.vue +3 -1
|
@@ -6,11 +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="6">{{this.$t('openatccomponents.pattern.phase')}}
|
|
10
10
|
</el-col>
|
|
11
|
-
<el-col :span="
|
|
11
|
+
<el-col :span="6">{{this.$t('openatccomponents.pattern.property')}}
|
|
12
12
|
</el-col>
|
|
13
|
-
<el-col :span="
|
|
13
|
+
<el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
|
|
14
|
+
</el-col>
|
|
15
|
+
<el-col :span="6">{{this.$t('openatccomponents.pattern.advanceend')}}
|
|
14
16
|
</el-col>
|
|
15
17
|
</el-row>
|
|
16
18
|
</div>
|
|
@@ -20,6 +22,14 @@
|
|
|
20
22
|
:options="options">
|
|
21
23
|
<div class="common-board-item" v-for="element in list" :key="element.id">
|
|
22
24
|
<el-row :gutter="13" >
|
|
25
|
+
<el-col :span="4">
|
|
26
|
+
<el-tooltip class="item" effect="dark" placement="left">
|
|
27
|
+
<div slot="content">{{element.name}}</div>
|
|
28
|
+
<div class="phase-description">
|
|
29
|
+
<xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
|
|
30
|
+
</div>
|
|
31
|
+
</el-tooltip>
|
|
32
|
+
</el-col>
|
|
23
33
|
<el-col :span="8">
|
|
24
34
|
<el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
|
|
25
35
|
<el-option
|
|
@@ -30,10 +40,10 @@
|
|
|
30
40
|
</el-option>
|
|
31
41
|
</el-select>
|
|
32
42
|
</el-col>
|
|
33
|
-
<el-col :span="
|
|
43
|
+
<el-col :span="6">
|
|
34
44
|
<el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
|
|
35
45
|
</el-col>
|
|
36
|
-
<el-col :span="
|
|
46
|
+
<el-col :span="6">
|
|
37
47
|
<el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
|
|
38
48
|
</el-col>
|
|
39
49
|
</el-row>
|
|
@@ -45,10 +55,12 @@
|
|
|
45
55
|
|
|
46
56
|
<script>
|
|
47
57
|
import draggable from 'vuedraggable'
|
|
58
|
+
import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
|
|
48
59
|
export default {
|
|
49
60
|
name: 'expend-config',
|
|
50
61
|
components: {
|
|
51
|
-
draggable
|
|
62
|
+
draggable,
|
|
63
|
+
xdrdirselector
|
|
52
64
|
},
|
|
53
65
|
data () {
|
|
54
66
|
return {
|
|
@@ -88,6 +100,6 @@ export default {
|
|
|
88
100
|
|
|
89
101
|
<style lang="scss" scoped>
|
|
90
102
|
.el-input-number--small {
|
|
91
|
-
width:
|
|
103
|
+
width: unset !important;
|
|
92
104
|
}
|
|
93
105
|
</style>
|
|
@@ -115,7 +115,7 @@ export default {
|
|
|
115
115
|
}
|
|
116
116
|
},
|
|
117
117
|
created () {
|
|
118
|
-
|
|
118
|
+
this.addMinSplit()
|
|
119
119
|
// console.log(this.list, 'list')
|
|
120
120
|
},
|
|
121
121
|
watch: {
|
|
@@ -132,7 +132,7 @@ export default {
|
|
|
132
132
|
// let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
|
|
133
133
|
// let pattern = globalParamModel.getParamsByType('patternList')[n]
|
|
134
134
|
// globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
|
|
135
|
-
|
|
135
|
+
this.addMinSplit()
|
|
136
136
|
this.$emit('handleSplit', n, newList)
|
|
137
137
|
},
|
|
138
138
|
deep: true
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="overLap" v-if="checked" :style="{'
|
|
2
|
+
<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 417px'}">
|
|
3
3
|
<div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
|
|
4
4
|
<div v-for="(item,index2) in list.stageLists" :key="index2" >
|
|
5
5
|
<div class="first-2">
|
|
@@ -467,7 +467,9 @@ export default {
|
|
|
467
467
|
if (currentArr.length !== 0) {
|
|
468
468
|
let newCurrent = this.tranform(currentArr)
|
|
469
469
|
let ringTeam = this.step1(this.phaseList, newCurrent)
|
|
470
|
-
this.
|
|
470
|
+
if (this.patternList) {
|
|
471
|
+
this.setBarrier(ringTeam, val)
|
|
472
|
+
}
|
|
471
473
|
this.fillGap(ringTeam, val)
|
|
472
474
|
let barrier = this.step2(ringTeam, newPattern)
|
|
473
475
|
this.barrierList = barrier.map(j => {
|