From f0c33529e76441bd851b8ec92f0e9b0a1e4c1367 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Mon, 2 Aug 2021 15:52:54 +0800 Subject: [PATCH] update table --- report-ui/src/assets/styles/anji.scss | 28 ++ .../src/views/report/bigscreen/index.vue | 9 +- report-ui/src/views/report/report/index.vue | 352 ++++++++++++------ .../src/views/report/resultset/index.vue | 30 +- 4 files changed, 276 insertions(+), 143 deletions(-) diff --git a/report-ui/src/assets/styles/anji.scss b/report-ui/src/assets/styles/anji.scss index 0ca3d157..143ad3f0 100644 --- a/report-ui/src/assets/styles/anji.scss +++ b/report-ui/src/assets/styles/anji.scss @@ -38,3 +38,31 @@ zoom: 1; } } + +.el-form-item .el-form-item__label { + line-height: 28px; +} +.el-form-item__content { + line-height: 28px; +} +.el-input__icon { + line-height: 28px; +} + +.el-input--suffix .el-input__inner { + height: 28px; + line-height: 28px; +} +.el-input .el-input__inner { + height: 28px; + line-height: 28px; +} +.el-button { + padding: 7px 15px; + font-size: 12px; + border-radius: 3px; +} + +.el-table td { + padding: 6px 0; +} diff --git a/report-ui/src/views/report/bigscreen/index.vue b/report-ui/src/views/report/bigscreen/index.vue index f287f367..2afc90e4 100644 --- a/report-ui/src/views/report/bigscreen/index.vue +++ b/report-ui/src/views/report/bigscreen/index.vue @@ -31,14 +31,7 @@ /> - + 查询 diff --git a/report-ui/src/views/report/report/index.vue b/report-ui/src/views/report/report/index.vue index c559c1ad..e5ee9777 100644 --- a/report-ui/src/views/report/report/index.vue +++ b/report-ui/src/views/report/report/index.vue @@ -6,17 +6,35 @@ !--> diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index c7376ca4..3a4d9b64 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -256,15 +256,22 @@ - + @@ -661,9 +668,9 @@ export default { order: "DESC", pageNumber: this.params.pageNumber, pageSize: this.params.pageSize, - setCode:this.query.setCode, + setCode: this.query.setCode, setName: this.query.setName - } + }; const res = await dataSetPageList(params); if (res.code != "200") return; this.listLoading = true; @@ -1176,7 +1183,4 @@ export default { overflow-y: auto; padding: 10px; } -.query { - margin-top: 5px; -}