From e053e00f4b3479945ed0dae472a3eb0cbcdd279a Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 6 Jun 2022 17:37:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/common/right-box-common.scss | 7 + .../rightBox/report/builtinReportBox.scss | 9 + .../views/report/builtinReport.scss | 35 ++- .../rightBox/report/reportTestBox.vue | 198 +++++++++--- src/components/table/CnDataList.vue | 2 +- .../table/report/reportTestTable.vue | 289 +++++++++--------- src/mixins/data-list.js | 70 ++--- src/mixins/table.js | 4 +- src/utils/api.js | 2 + src/utils/constants.js | 13 +- .../charts/charts/chartDetectionService.vue | 1 - src/views/report/reportTest.vue | 103 +++++-- 12 files changed, 445 insertions(+), 288 deletions(-) diff --git a/src/assets/css/common/right-box-common.scss b/src/assets/css/common/right-box-common.scss index 9dcb74fd..dc918f37 100644 --- a/src/assets/css/common/right-box-common.scss +++ b/src/assets/css/common/right-box-common.scss @@ -267,6 +267,13 @@ .right-box-select-dropdown { width: 625px; } +.right-box-select-report.right-box-select-dropdown { + width: 640px; +} +.el-select-last.right-box-select-dropdown { + width: 434px; + left: 1698px; +} .limit-height .el-cascader-menu { max-height: 200px; overflow: auto; diff --git a/src/assets/css/components/components/rightBox/report/builtinReportBox.scss b/src/assets/css/components/components/rightBox/report/builtinReportBox.scss index d0389d49..a8ffcd96 100644 --- a/src/assets/css/components/components/rightBox/report/builtinReportBox.scss +++ b/src/assets/css/components/components/rightBox/report/builtinReportBox.scss @@ -1,9 +1,18 @@ .right-box.right-box-report { .right-box__container { .container__form { + .el-height.el-form-item { + margin-bottom: 18px; + .el-form-item__content { + height: 20px; + line-height: 20px; + } + } .enable-tab { display: flex; + width: 100%; .enable-tabs { + flex: 1; height: 32px; width: 160px; text-align: center; diff --git a/src/assets/css/components/views/report/builtinReport.scss b/src/assets/css/components/views/report/builtinReport.scss index 5d262c3e..7aef7fa3 100644 --- a/src/assets/css/components/views/report/builtinReport.scss +++ b/src/assets/css/components/views/report/builtinReport.scss @@ -46,17 +46,34 @@ border-left: none; display: none; } + .el-table__row .el-table-column--selection .cell { + padding: 0; + } .el-table__expanded-cell { + .down { + margin-left: 32px; + height: 100%; + width: 1256px; + .cn-detection__footer { + text-align: center; + .el-pagination__jump { + margin-left: 3px; + } + } + } + .block.drop-down-time { + margin: 15px 0 14px 0; + } .expand { - width: 100%; + margin: auto; display: flex; - justify-content: center; + flex-wrap: wrap; .expand-cell { display: flex; background: #FFFFFF; border: 1px solid #E7EAED; border-radius: 2px; - margin-right: 16px; + margin: 0 12px 16px 0; width: 300px; height: 97px; .expand-right { @@ -89,15 +106,23 @@ } .expand-time { font-size: 12px; - color: #999999; - font-weight: 400; + color: #666666; margin-bottom: 4px; + div:nth-of-type(1) { + font-size: 12px; + color: #999999; + } } .expand-icon { display: flex; justify-content: space-evenly; margin: 0 8px; font-size: 14px; + .table-operation-item--no-border { + cursor: pointer; + position: relative; + font-size: 16px; + } } } } diff --git a/src/components/rightBox/report/reportTestBox.vue b/src/components/rightBox/report/reportTestBox.vue index 4f395044..46c921ac 100644 --- a/src/components/rightBox/report/reportTestBox.vue +++ b/src/components/rightBox/report/reportTestBox.vue @@ -15,57 +15,91 @@ -