-
{{ $t('term.autoexec.batchsetting') }}
+
{{ $t('page.autoexecparallel') }}
+
+
+
+
+
+
+
+
+
+
{
if (res.Status == 'OK') {
this.$Message.success(this.$t('message.savesuccess')); //保存成功
@@ -641,6 +693,8 @@ export default {
}
if (this.dataConfig && this.dataConfig.needRoundCount) { //是否需要设置分批数量
this.$set(data, 'roundCount', this.roundCount);
+ this.$set(data, 'parallelCount', this.parallelCount);
+ this.$set(data, 'parallelPolicy', this.parallelPolicy);
}
if (this.$refs.param) {
this.$set(data, 'param', this.$refs.param.getValue());
@@ -677,11 +731,13 @@ export default {
},
setJobParams(obj) {
let config = this.$utils.deepClone(obj);
- let {name = '', param = {}, roundCount = 2, scenarioId = null, executeConfig = {}, runnerGroupTag = null, runnerGroup = null} = config || {};
+ let {name = '', param = {}, roundCount = 64, parallelCount = 32, parallelPolicy = 'parallel', scenarioId = null, executeConfig = {}, runnerGroupTag = null, runnerGroup = null} = config || {};
this.nameForm.itemList.name.value = name;
this.paramValue = param;
this.scenarioId = scenarioId;
this.roundCount = roundCount;
+ this.parallelCount = parallelCount;
+ this.parallelPolicy = parallelPolicy;
this.executeConfig = executeConfig;
this.runnerGroupTag = runnerGroupTag || {
mappingMode: 'constant',
@@ -707,6 +763,13 @@ export default {
this.getAction();
}
});
+ },
+ changeParallelPolicy(val) {
+ if (val && val == 'roundCount') {
+ this.roundCount = this.roundCount || 64;
+ } else {
+ this.parallelCount = this.parallelCount || 32;
+ }
}
},
computed: {
diff --git a/src/views/pages/deploy/job/job-add.vue b/src/views/pages/deploy/job/job-add.vue
index 857fc04912bf03d0fbc3b046168dbe5f59d53d4e..50f74e4b3bae7289686d63fc78c9e15e3be11ecf 100644
--- a/src/views/pages/deploy/job/job-add.vue
+++ b/src/views/pages/deploy/job/job-add.vue
@@ -114,8 +114,22 @@
>
-
{{ $t('term.autoexec.batchsetting') }}
+
{{ $t('page.autoexecparallel') }}
+
+
+
+
+
+
+
+
+
+
{{ $t('term.autoexec.jobparam') }}
@@ -174,7 +202,8 @@ export default {
SaveSetting: () => import('@/views/pages/autoexec/detail/runnerDetail/save-setting.vue'),
ResultDialog: () => import('./publishing/result-dialog'),
PublishingValid: () => import('./publishing/publishing-valid'),
- PhaseList: () => import('./publishing/phase-list')
+ PhaseList: () => import('./publishing/phase-list'),
+ TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio')
},
props: {},
data() {
@@ -201,6 +230,17 @@ export default {
desc: this.$t('term.autoexec.roundcountdescrition'),
validateList: ['required', 'maxNum']
},
+ parallelForm: {
+ placeholder: this.$t('page.selectinput'),
+ border: 'border',
+ dataList: this.getRoundCountList(),
+ filterName: 'text',
+ // allowCreate: true,
+ search: true,
+ transfer: true,
+ desc: this.$t('term.autoexec.paralldesc'),
+ validateList: ['required', 'maxNum']
+ },
runtimeParamList: [], //作业参数
combopPhaseList: [],
isSaveDialog: false,
@@ -216,7 +256,19 @@ export default {
jobConfig: {},
paramValue: {},
saveLoading: false,
- moduleEnvInstanceMap: {}
+ moduleEnvInstanceMap: {},
+ parallelPolicyDataList: [
+ {
+ text: this.$t('page.autoexecparall'),
+ value: 'parallel'
+ },
+ {
+ text: this.$t('page.autoexecbatchround'),
+ value: 'roundCount'
+ }
+ ],
+ parallelPolicy: 'roundCount',
+ parallelCount: 4
};
},
beforeCreate() {},
@@ -376,6 +428,8 @@ export default {
envId: this.envId,
scenarioId: this.scenarioId,
roundCount: this.roundCount,
+ parallelCount: this.parallelCount,
+ parallelPolicy: this.parallelPolicy,
param: {},
moduleList: this.$refs.moduleList.getData()
};
@@ -524,6 +578,8 @@ export default {
}
});
this.jobConfig.roundCount && (this.roundCount = this.jobConfig.roundCount);
+ this.jobConfig.parallelCount && (this.parallelCount = this.jobConfig.parallelCount);
+ this.jobConfig.parallelPolicy && (this.parallelPolicy = this.jobConfig.parallelPolicy);
this.paramValue = this.jobConfig.param || {};
if (this.jobConfig.scenarioId) {
let findScenario = this.initData.scenarioList.find((item) => item.isEnable == true && item.scenarioId == this.jobConfig.scenarioId);
@@ -549,6 +605,13 @@ export default {
];
list.push(...this.$utils.getRoundCountList());
return list;
+ },
+ changeParallelPolicy(val) {
+ if (val && val == 'roundCount') {
+ this.roundCount = this.roundCount || 64;
+ } else {
+ this.parallelCount = this.parallelCount || 32;
+ }
}
},
filter: {},