diff --git a/frontend/src/business/components/track/plan/components/TestCasePlanList.vue b/frontend/src/business/components/track/plan/components/TestCasePlanList.vue index f027a83e8e..9e4ab1abb7 100644 --- a/frontend/src/business/components/track/plan/components/TestCasePlanList.vue +++ b/frontend/src/business/components/track/plan/components/TestCasePlanList.vue @@ -9,12 +9,12 @@ {{$t('test_track.test_case')}} - + 关联测试用例 + @click="$emit('openTestCaseRelevanceDialog')" >{{$t('test_track.relevance_test_case')}} - + {{$t('commons.refresh')}} @@ -73,19 +73,19 @@ + :label="$t('test_track.executor')"> - 未开始 - 通过 - 失败 - 阻塞 - 跳过 + {{$t('test_track.plan_status_prepare')}} + {{$t('test_track.pass')}} + {{$t('test_track.failure')}} + {{$t('test_track.blocking')}} + {{$t('test_track.skip')}} diff --git a/frontend/src/business/components/track/plan/components/TestCaseRelevance.vue b/frontend/src/business/components/track/plan/components/TestCaseRelevance.vue index 9ca4149604..e1ed8467b4 100644 --- a/frontend/src/business/components/track/plan/components/TestCaseRelevance.vue +++ b/frontend/src/business/components/track/plan/components/TestCaseRelevance.vue @@ -2,7 +2,7 @@ - @@ -29,7 +29,7 @@ {{scope.row.name}} @@ -115,7 +115,7 @@ }, getCaseNameByNodeIds(nodeIds) { this.dialogFormVisible = true; - this.getCaseNames(null, nodeIds); + this.getCaseNames(this.planId, nodeIds); }, handleSelectAll(selection) { if(selection.length > 0){ diff --git a/frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue index 42f54e0812..b736bf0de2 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue @@ -11,12 +11,12 @@ - - 优先级: + + {{$t('test_track.priority')}}: {{testCase.priority}} - - 用例类型: + + {{$t('test_track.case_type')}}: {{$t('test_track.functional_test')}} {{$t('commons.performance')}} {{$t('commons.api')}} @@ -24,13 +24,13 @@ - - 测试方式: + + {{$t('test_track.method')}}: {{$t('test_track.manual')}} {{$t('test_track.auto')}} - - 所属模块: + + {{$t('test_track.module')}}: {{testCase.nodePath}} @@ -39,22 +39,22 @@ 成功 + @click="setTestCaseStatus('Pass')"> {{$t('test_track.pass')}} 失败 + @click="setTestCaseStatus('Failure')"> {{$t('test_track.failure')}} 阻塞 + @click="setTestCaseStatus('Blocking')"> {{$t('test_track.blocking')}} 跳过 + @click="setTestCaseStatus('Skip')"> {{$t('test_track.skip')}} @@ -77,7 +77,7 @@ {{scope.row.result}} - + {{scope.row.actualResult}} - + - - - - - + + + + + @@ -103,17 +103,17 @@ - 备注: + {{$t('commons.remark')}}: {{testCase.remark}} - 未填写 + {{$t('commons.not_filled')}} - 取 消 - {{ '保 存' }} + {{$t('test_track.cancel')}} + {{$t('test_track.save')}} diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 3216865792..0515b8c679 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -45,6 +45,7 @@ export default { 'refresh': 'refresh', 'remark': 'remark', 'delete': 'delete', + 'not_filled': 'Not filled' }, workspace: { 'create': 'Create Workspace', @@ -206,7 +207,7 @@ export default { 'module_name': 'Module name', 'create_plan': 'Create test plan', 'plan_name': 'Test plan name', - 'plan_project': 'Related projects', + 'plan_project': 'Related project', 'plan_stage': 'Testing phase', 'plan_status': 'The current state', 'smoke_test': 'Smoke test', @@ -222,7 +223,19 @@ export default { 'plan_status_running': 'Starting', 'plan_status_completed': 'Completed', 'delete_module_confirm': 'Confirm delete module: ', - 'delete_module_resource': 'and all submodules and test cases under the module' + 'delete_module_resource': 'and all submodules and test cases under the module', + 'relevance_test_case': 'Relevance test case', + 'executor': 'executor', + 'execute_result': 'Execute result', + 'case_type': 'Case type', + 'pass': 'Success', + 'failure': 'Failure', + 'blocking': 'Blocking', + 'skip': 'Skip', + 'actual_result': 'Actual result', + 'step_result': 'Step result', + 'select_execute_result': 'Select execute result', + 'save': 'Save' }, i18n: { 'home': 'Home' diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index f3e46a8635..7024e8e939 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -44,7 +44,8 @@ export default { 'create': '新建', 'refresh': '刷新', 'remark': '备注', - 'delete': '删除' + 'delete': '删除', + 'not_filled': '未填写' }, workspace: { 'create': '创建工作空间', @@ -204,7 +205,6 @@ export default { 'add_submodule': '添加子模块', 'add_module': '添加模块', 'module_name': '模块名称', - 'create_plan': '新建测试计划', 'plan_name': '计划名称', 'plan_project': '所属项目', @@ -224,6 +224,20 @@ export default { 'plan_status_completed': '已完成', 'delete_module_confirm': '确认删除模块: ', 'delete_module_resource': '以及模块下所有子模块和测试用例', + + 'relevance_test_case': '关联测试用例', + 'executor': '执行人', + 'execute_result': '执行结果', + 'case_type': '用例类型', + 'pass': '成功', + 'failure': '失败', + 'blocking': '阻塞', + 'skip': '跳过', + 'actual_result': '实际结果', + 'step_result': '步骤执行结果', + 'select_execute_result': '选择执行结果', + 'save': '保 存' + }, i18n: { 'home': '首页'