From 24aeb6afd54e48dd49cb3bd275a6a2b6304fe533 Mon Sep 17 00:00:00 2001 From: dengbf Date: Fri, 25 Jul 2025 11:17:16 +0800 Subject: [PATCH] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1473061050613760]?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93&=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93-=E6=B5=8B=E8=AF=95=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=9A=84=E6=97=B6=E5=80=99=E5=90=8E=E7=AB=AF=E8=A6=81?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=88=86=E6=89=B9=E6=95=B0=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/?= =?UTF-8?q?939050947543040/939050947543057/1473061050613760?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/autoexec/detail/test-detail.vue | 113 +++++++++++++++++- 1 file changed, 112 insertions(+), 1 deletion(-) diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue index f65bd4b2..1f62f942 100644 --- a/src/views/pages/autoexec/detail/test-detail.vue +++ b/src/views/pages/autoexec/detail/test-detail.vue @@ -66,6 +66,51 @@ +
+ {{ $t('page.autoexecparallel') }} +
+ + + +
+
+ + + +
+
+ + + +
+
{{ $t('term.deploy.actuatorgroup') }} @@ -92,6 +137,9 @@ export default { TsForm: () => import('@/resources/plugins/TsForm/TsForm'), ArgumentParams: () => import('./runnerDetail/argument-params.vue'), TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput'), + TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'), + TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'), + TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'), RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue') }, filters: {}, @@ -156,7 +204,40 @@ export default { mappingMode: 'constant', value: '-1' }, - scriptId: null + scriptId: null, + roundCount: 32, + parallelCount: 64, + parallelPolicy: 'parallel', + parallelPolicyDataList: [ + { + text: this.$t('page.autoexecparall'), + value: 'parallel' + }, + { + text: this.$t('page.autoexecbatchround'), + value: 'roundCount' + } + ], + roundCountForm: { + placeholder: this.$t('page.selectinput'), + border: 'border', + dataList: this.getRoundCountList(), + filterName: 'text', + search: true, + transfer: true, + desc: this.$t('term.autoexec.roundcountdescrition'), + validateList: ['required'] + }, + parallelForm: { + placeholder: this.$t('page.selectinput'), + border: 'border', + dataList: this.getRoundCountList(), + filterName: 'text', + search: true, + transfer: true, + desc: this.$t('term.autoexec.paralldesc'), + validateList: ['required'] + } }; }, beforeCreate() {}, @@ -244,6 +325,9 @@ export default { isValid = this.$refs.nameForm ? this.$refs.nameForm.valid() && isValid : isValid; isValid = this.$refs.argumentConfig ? this.$refs.argumentConfig.valid() && isValid : isValid; isValid = this.$refs.executeUser ? this.$refs.executeUser.valid() && isValid : isValid; + if ((this.$refs.roundCountForm && !this.$refs.roundCountForm.valid()) || (this.$refs.parallelForm && !this.$refs.parallelForm.valid())) { + isValid = false; + } if (isValid) { this.executeAction(); } @@ -262,6 +346,12 @@ export default { val.executeConfig = this.$refs.executeForm ? this.$refs.executeForm.getFormValue() : {}; if (this.targetShow) { val.executeConfig.executeNodeConfig = this.$refs.addTarget.getValue(); + val.parallelPolicy = this.parallelPolicy; + if (this.parallelPolicy === 'roundCount') { + val.roundCount = this.roundCount; + } else { + val.parallelCount = this.parallelCount; + } } else { val.executeConfig.executeNodeConfig = []; } @@ -321,6 +411,27 @@ export default { } }); } + }, + getRoundCountList() { + let list = [ + { + value: -1, + text: '蓝绿执行' + } + ]; + list.push(...this.$utils.getRoundCountList()); + return list; + }, + changeParallelPolicy(val) { + if (val && val == 'roundCount') { + if (this.$utils.isEmpty(this.roundCount)) { + this.roundCount = 64; + } + } else { + if (this.$utils.isEmpty(this.parallelCount)) { + this.parallelCount = 32; + } + } } }, computed: {}, -- Gitee