diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 7334643973..20368c7be4 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -374,7 +374,6 @@ }, methods: { customHeader() { - getLabel(this, API_SCENARIO_LIST); this.$refs.headerCustom.open(this.tableLabel) }, selectByParam() { diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue index 6437c94123..7bb7c2e60a 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue @@ -264,11 +264,9 @@ export default { this.$nextTick(() => { this.$refs.caseTable.bodyWrapper.scrollTop = 5 }) - getLabel(this, API_CASE_LIST); }, watch: { selectNodeIds() { - getLabel(this, API_CASE_LIST); this.initTable(); }, currentProtocol() { @@ -294,11 +292,9 @@ export default { }, methods: { customHeader() { - getLabel(this, API_CASE_LIST); this.$refs.headerCustom.open(this.tableLabel) }, initTable() { - getLabel(this, API_CASE_LIST); this.selectRows = new Set(); this.condition.status = ""; this.condition.moduleIds = this.selectNodeIds; diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index 7ec2982c49..faee8860ce 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -383,7 +383,6 @@ this.getSystemLabel(this.type) this.initTable(); this.getMaintainerOptions(); - getLabel(this, API_LIST); }, watch: { selectNodeIds() { @@ -413,7 +412,6 @@ }) }, customHeader() { - getLabel(this, API_LIST); this.$refs.headerCustom.open(this.tableLabel) }, handleBatchMove() { diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index 8a6220194d..815a6eec64 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -309,7 +309,7 @@ export default { this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]}; } this.initTableData(); - getSystemLabel(this, this.type) + }, activated() { if (this.trashEnable) { @@ -330,7 +330,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_CASE_LIST); this.$refs.headerCustom.open(this.tableLabel) }, getSelectDataRange() { @@ -352,6 +351,7 @@ export default { this.condition.nodeIds = this.selectNodeIds; } getLabel(this, TEST_CASE_LIST); + this.getData(); }, getData() { diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue index 7cf1aa7162..b2bd87c542 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanList.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue @@ -295,7 +295,6 @@ export default { }, methods: { inite() { - getLabel(this, TEST_PLAN_LIST); this.initTableData() }, calPassRate(scope) { @@ -303,7 +302,6 @@ export default { return Number.parseInt(passRate, 10); }, customHeader() { - getLabel(this, TEST_PLAN_LIST); this.$refs.headerCustom.open(this.tableLabel) }, initTableData() { diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue index 4fab18c445..cbb7ebf98a 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue @@ -304,8 +304,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_PLAN_API_CASE); - this.$refs.headerCustom.open(this.tableLabel) }, getMaintainerOptions() { diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue index f997aba38f..8456d0d8bd 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue @@ -201,8 +201,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_PLAN_SCENARIO_CASE); - this.$refs.headerCustom.open(this.tableLabel) }, search() { diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue index 5117b039af..7c21e48f3a 100644 --- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue @@ -429,7 +429,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE); this.$refs.headerCustom.open(this.tableLabel) }, diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue index 7f38eb878a..63e1a4c4df 100644 --- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue @@ -211,7 +211,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_PLAN_LOAD_CASE); this.$refs.headerCustom.open(this.tableLabel) }, initTable() { diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue index 4fb47c4b4a..8131b853a0 100644 --- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue +++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue @@ -183,7 +183,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_CASE_REVIEW_LIST); this.$refs.headerCustom.open(this.tableLabel) }, diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue index 93d56b4f63..3d9d3a25c2 100644 --- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue +++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue @@ -301,7 +301,6 @@ export default { }, methods: { customHeader() { - getLabel(this, TEST_CASE_REVIEW_CASE_LIST); this.$refs.headerCustom.open(this.tableLabel) }, initTableData() { diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js index 1980090164..2c7978fd7e 100644 --- a/frontend/src/common/js/tableUtils.js +++ b/frontend/src/common/js/tableUtils.js @@ -114,15 +114,14 @@ export function getLabel(vueObj, type) { vueObj.result = vueObj.$post('/system/header/info', param, response => { if (response.data != null) { vueObj.tableLabel = eval(response.data.props); - } - }) -} -export function getSystemLabel(vueObj, type) { - let param = {} - param.type=type - vueObj.result = vueObj.$post('/system/system/header',param, response => { - if (response.data != null) { - vueObj.tableLabel = eval(response.data.props); + }else{ + let param = {} + param.type=type + vueObj.result = vueObj.$post('/system/system/header',param, response => { + if (response.data != null) { + vueObj.tableLabel = eval(response.data.props); + } + }) } }) } diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 051d1beade..eeccb8d2a5 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1193,7 +1193,7 @@ export default { batch_delete_case: '批量删除', batch_unlink: '批量取消关联', project_name: '所属项目', - status: '评审状态', + status: '评审结果', status_prepare: '未评审', status_pass: '通过', status_un_pass: '未通过',