From c98fdc68b8e78c742ce1d19d97c900aa6f2388cf Mon Sep 17 00:00:00 2001 From: BugKing <wangzhen@fit2cloud.com> Date: Thu, 1 Jul 2021 12:08:00 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E3=80=81=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6=E5=8F=8A?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/ApiScenarioList.vue | 4 ++-- .../plan/view/comonents/api/TestPlanApiCaseList.vue | 4 ++-- .../view/comonents/api/TestPlanApiScenarioList.vue | 13 +++++++------ .../comonents/functional/FunctionalTestCaseList.vue | 2 +- .../view/comonents/load/TestPlanLoadCaseList.vue | 4 ++-- .../track/review/view/TestCaseReviewView.vue | 6 ++++++ .../view/components/TestReviewTestCaseList.vue | 4 ++-- frontend/src/common/css/main.css | 4 ++++ 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index caf053fabe..9a6d824abe 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -946,7 +946,7 @@ export default { padding: 10px; } -/* /deep/ .el-table__fixed-body-wrapper { +/deep/ .el-table__fixed-body-wrapper { top: 60px !important; -} */ +} </style> 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 4c40d4bb51..b50ac0941d 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 @@ -281,7 +281,7 @@ export default { pageSize: 10, total: 0, selectDataCounts: 0, - screenHeight: 'calc(100vh - 330px)',//屏幕高度 + screenHeight: 'calc(100vh - 250px)',//屏幕高度 // environmentId: undefined, currentCaseProjectId: "", runData: [], @@ -717,6 +717,6 @@ export default { } /deep/ .el-table__fixed-body-wrapper { - top: 59px !important; + top: 48px !important; } </style> 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 273979c8a6..031e7d841f 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 @@ -39,7 +39,7 @@ <el-table-column v-if="item.id == 'name'" prop="name" :label="$t('api_test.automation.scenario_name')" min-width="120px" sortable show-overflow-tooltip :key="index"/> - <el-table-column v-if="item.id == 'level'" prop="level" :label="$t('api_test.automation.case_level')" min-width="100px" + <el-table-column v-if="item.id == 'level'" prop="level" :label="$t('api_test.automation.case_level')" min-width="120px" column-key="level" sortable="custom" :filters="LEVEL_FILTERS" @@ -214,7 +214,7 @@ export default { return { type: TEST_PLAN_SCENARIO_CASE, headerItems: Test_Plan_Scenario_Case, - screenHeight: 'calc(100vh - 330px)',//屏幕高度 + screenHeight: 'calc(100vh - 250px)',//屏幕高度 tableLabel: [], loading: false, condition: {}, @@ -543,9 +543,10 @@ export default { } .ms-select-all-fixed >>> th:nth-child(2) .el-icon-arrow-down { - top: -3px; + top: -4px; +} + +/deep/ .el-table__fixed-body-wrapper { + top: 48px !important; } -/*/deep/ .el-table__fixed-body-wrapper {*/ -/* top: 59px !important;*/ -/*}*/ </style> 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 9436e98390..39a96871d7 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 @@ -294,7 +294,7 @@ export default { type: TEST_PLAN_FUNCTION_TEST_CASE, fields: [], fieldsWidth: getCustomTableWidth('TRACK_TEST_CASE'), - screenHeight: 'calc(100vh - 330px)', + screenHeight: 'calc(100vh - 275px)', tableLabel: [], result: {}, deletePath: "/test/case/delete", 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 8c3d136a1c..e4c24dd9b9 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 @@ -201,7 +201,7 @@ export default { total: 0, selectDataCounts: 0, status: 'default', - screenHeight: 'calc(100vh - 330px)',//屏幕高度 + screenHeight: 'calc(100vh - 250px)',//屏幕高度 buttons: [ { name: this.$t('test_track.plan.load_case.unlink_in_bulk'), handleClick: this.handleDeleteBatch, permissions: ['PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE'] @@ -496,6 +496,6 @@ export default { <style scoped> /deep/ .el-table__fixed-body-wrapper { - top: 59px !important; + top: 47px !important; } </style> diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue index 548c61d208..4a7a54feeb 100644 --- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue +++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue @@ -186,4 +186,10 @@ export default { height: calc(100vh - 80px - 53px); margin-top: 1px; } + +.header-menu.el-menu--horizontal > li { + height: 49px; + line-height: 50px; + color: dimgray; +} </style> 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 6978e20753..6a08eddb71 100644 --- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue +++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue @@ -248,7 +248,7 @@ export default { return { type: TEST_CASE_REVIEW_CASE_LIST, headerItems: Test_Case_Review_Case_List, - screenHeight: 'calc(100vh - 330px)', + screenHeight: 'calc(100vh - 270px)', tableLabel: [], result: {}, condition: {}, @@ -547,7 +547,7 @@ export default { } /deep/ .el-table__fixed-body-wrapper { - top: 59px !important; + top: 48px !important; } </style> diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css index 6707dee359..77c21618ad 100644 --- a/frontend/src/common/css/main.css +++ b/frontend/src/common/css/main.css @@ -40,6 +40,10 @@ margin-bottom: 18px; } +.el-dialog__body { + padding: 10px; +} + .tip { padding: 3px 5px; font-size: 16px;