openatc-components 0.2.28 → 0.2.29
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.
|
@@ -93,12 +93,9 @@
|
|
|
93
93
|
</el-col>
|
|
94
94
|
</el-row>
|
|
95
95
|
<el-row>
|
|
96
|
-
<el-radio
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
@change="changeRing"
|
|
100
|
-
>{{ $t('openatccomponents.common.ringStyle') }}</el-radio
|
|
101
|
-
>
|
|
96
|
+
<el-radio v-model="isRing" :label="false" @change="changeRing">{{
|
|
97
|
+
$t('openatccomponents.common.ringStyle')
|
|
98
|
+
}}</el-radio>
|
|
102
99
|
<el-radio v-model="isRing" :label="true" @change="changeStage">{{
|
|
103
100
|
$t('openatccomponents.common.stageStyle')
|
|
104
101
|
}}</el-radio>
|
|
@@ -130,11 +127,11 @@
|
|
|
130
127
|
</pattern-list>
|
|
131
128
|
</el-row>
|
|
132
129
|
<el-row>
|
|
133
|
-
<el-tabs v-model="
|
|
130
|
+
<el-tabs v-model="activeTab" type="card">
|
|
134
131
|
<el-tab-pane
|
|
135
132
|
v-if="!isRing"
|
|
136
133
|
:label="$t('openatccomponents.pattern.ringConfig')"
|
|
137
|
-
name="
|
|
134
|
+
name="kanban"
|
|
138
135
|
>
|
|
139
136
|
<div style="width: 100%; overflow: hidden; margin-top: 20px">
|
|
140
137
|
<kan-ban
|
|
@@ -280,14 +277,14 @@
|
|
|
280
277
|
<el-row :gutter="20">
|
|
281
278
|
<el-col :span="24">
|
|
282
279
|
<over-lap
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
280
|
+
:stageList="stagesList"
|
|
281
|
+
:overlap="overlap"
|
|
282
|
+
:checked="true"
|
|
283
|
+
:tentative="true"
|
|
284
|
+
:cycleChange="false"
|
|
285
|
+
:cycle="overLapCycle"
|
|
286
|
+
>
|
|
287
|
+
</over-lap>
|
|
291
288
|
</el-col>
|
|
292
289
|
</el-row>
|
|
293
290
|
</el-tab-pane>
|
|
@@ -360,7 +357,15 @@ export default {
|
|
|
360
357
|
type: Array
|
|
361
358
|
}
|
|
362
359
|
},
|
|
360
|
+
watch: {
|
|
361
|
+
isRing (newVal) {
|
|
362
|
+
this.activeTab = newVal ? 'ring' : 'kanban'
|
|
363
|
+
}
|
|
364
|
+
},
|
|
363
365
|
computed: {
|
|
366
|
+
computedActiveTab () {
|
|
367
|
+
return this.isRing ? 'ring' : 'kanban'
|
|
368
|
+
},
|
|
364
369
|
rings () {
|
|
365
370
|
return this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
|
|
366
371
|
},
|
|
@@ -392,7 +397,8 @@ export default {
|
|
|
392
397
|
max: '',
|
|
393
398
|
contrloType: '',
|
|
394
399
|
patternCycleEqual: true,
|
|
395
|
-
activeList: 'ring',
|
|
400
|
+
// activeList: 'ring',
|
|
401
|
+
activeTab: 'kanban',
|
|
396
402
|
isRing: false,
|
|
397
403
|
// isChange: false,
|
|
398
404
|
ringCount: 1,
|
|
@@ -531,7 +537,7 @@ export default {
|
|
|
531
537
|
getStageItems (stageArr, i, stageChange) {
|
|
532
538
|
let res = {
|
|
533
539
|
key: i,
|
|
534
|
-
|
|
540
|
+
split: this.narr[i], // 阶段绿性比
|
|
535
541
|
phases: stageArr,
|
|
536
542
|
delaystart: 0,
|
|
537
543
|
advanceend: 0
|
|
@@ -1002,7 +1008,7 @@ export default {
|
|
|
1002
1008
|
getStageItem (stageArr, stage, ringsList, i) {
|
|
1003
1009
|
let res = {
|
|
1004
1010
|
key: i,
|
|
1005
|
-
|
|
1011
|
+
split: this.narr[i], // 阶段绿性比
|
|
1006
1012
|
phases: stageArr,
|
|
1007
1013
|
stageKanban: stage,
|
|
1008
1014
|
delaystart: 0,
|