From 83710c787faf3f33a4f136b99330e9066450ee57 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 11 Jan 2022 17:46:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=B6=85=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=98=BE=E7=A4=BA=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.scss | 46 +++++++++++----- .../criminal-records.component.scss | 54 +++++++++++++------ .../system-management/user/user.component.ts | 4 +- 3 files changed, 74 insertions(+), 30 deletions(-) diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss index 640df91..33965e7 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss @@ -27,10 +27,12 @@ // flex: 5; width: 150px; } - .searchParamsLong{ + + .searchParamsLong { width: 250px; } - .searchParams2{ + + .searchParams2 { width: 220px; } @@ -41,9 +43,11 @@ nz-select { color: rgba(145, 204, 255, 0.95); } + nz-tree-select { color: rgba(145, 204, 255, 0.95); } + nz-range-picker { background-color: rgba(0, 0, 0, 0); width: 100%; @@ -221,10 +225,12 @@ background: none; cursor: pointer; } - .rankingBtnbox{ + + .rankingBtnbox { display: flex; flex-direction: column; } + .selectedbtn { background: linear-gradient(180deg, #000D21 0%, #001331 27%, #2399FF 100%); color: white; @@ -269,13 +275,17 @@ div { color: #91CCFF; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; .look { color: #36A2FF; cursor: pointer; } } - img{ + + img { width: 36px; } @@ -365,6 +375,7 @@ .chartsbox { width: 100%; height: 43%; + .chartname { position: absolute; left: 20px; @@ -373,6 +384,7 @@ .chart { height: 100%; + div { span { font-size: 14px; @@ -414,6 +426,7 @@ display: flex; flex-direction: row; z-index: 999; + .rankingBtn { margin-right: 12px; } @@ -427,7 +440,7 @@ .th { height: 32px; line-height: 32px; - font-size: 12px!important; + font-size: 12px !important; } .tbody { @@ -435,10 +448,12 @@ .tr { height: 32px; line-height: 32px; - div{ - font-size: 12px!important; + + div { + font-size: 12px !important; } - img{ + + img { width: 32px; } } @@ -455,6 +470,7 @@ padding: 0 22px; height: 32px; margin-bottom: 6px; + form { width: 100%; height: 32px; @@ -509,6 +525,7 @@ .chartsbox { width: 100%; height: 40%; + .chartname { position: absolute; left: 20px; @@ -517,6 +534,7 @@ .chart { height: 100%; + div { span { font-size: 14px; @@ -547,6 +565,7 @@ .rightbox { box-shadow: 0 0 22px 0px #1a7fd7 inset; + .btnbox { position: absolute; right: 28px; @@ -554,6 +573,7 @@ display: flex; flex-direction: row; z-index: 999; + .rankingBtn { margin-right: 8px; } @@ -567,7 +587,7 @@ .th { height: 28px; line-height: 28px; - font-size: 10px!important; + font-size: 10px !important; } .tbody { @@ -575,10 +595,12 @@ .tr { height: 28px; line-height: 28px; - div{ - font-size: 10px!important; + + div { + font-size: 10px !important; } - img{ + + img { width: 30px; } } diff --git a/src/app/pages/criminal-records/criminal-records.component.scss b/src/app/pages/criminal-records/criminal-records.component.scss index ed2f265..f861cc2 100644 --- a/src/app/pages/criminal-records/criminal-records.component.scss +++ b/src/app/pages/criminal-records/criminal-records.component.scss @@ -18,16 +18,20 @@ display: flex; justify-content: flex-start; - .searchParams,.btn{ + .searchParams, + .btn { margin: 0 3px; } + .searchParams { // flex: 5; width: 150px; } - .searchParams2{ + + .searchParams2 { width: 220px; } + .btn { // flex: 1; } @@ -94,11 +98,13 @@ font-size: 20px; font-family: titlefont; cursor: pointer; - } - span:nth-child(1){ + } + + span:nth-child(1) { margin-left: 12px; } - .grey{ + + .grey { color: #68829F; } } @@ -254,13 +260,17 @@ div { color: #91CCFF; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; .look { color: #36A2FF; cursor: pointer; } } - img{ + + img { width: 36px; } } @@ -349,6 +359,7 @@ .chartsbox { width: 100%; height: 43%; + .chartname { position: absolute; left: 20px; @@ -358,6 +369,7 @@ .chart { width: 97%; height: 100%; + div { span { font-size: 14px; @@ -399,6 +411,7 @@ display: flex; flex-direction: row; z-index: 999; + .rankingBtn { margin-right: 12px; } @@ -412,7 +425,7 @@ .th { height: 32px; line-height: 32px; - font-size: 12px!important; + font-size: 12px !important; } .tbody { @@ -420,14 +433,16 @@ .tr { height: 32px; line-height: 32px; - div{ - font-size: 12px!important; + + div { + font-size: 12px !important; } - img{ + + img { width: 32px; } } - + } } } @@ -441,6 +456,7 @@ padding: 0 22px; height: 32px; margin-bottom: 6px; + form { width: 100%; height: 32px; @@ -495,6 +511,7 @@ .chartsbox { width: 100%; height: 40%; + .chartname { position: absolute; left: 20px; @@ -504,6 +521,7 @@ .chart { width: 98%; height: 100%; + div { span { font-size: 14px; @@ -534,6 +552,7 @@ .rightbox { box-shadow: 0 0 22px 0px #1a7fd7 inset; + .btnbox { position: absolute; right: 28px; @@ -541,6 +560,7 @@ display: flex; flex-direction: row; z-index: 999; + .rankingBtn { margin-right: 8px; } @@ -554,7 +574,7 @@ .th { height: 28px; line-height: 28px; - font-size: 10px!important; + font-size: 10px !important; } .tbody { @@ -562,10 +582,12 @@ .tr { height: 28px; line-height: 28px; - div{ - font-size: 10px!important; + + div { + font-size: 10px !important; } - img{ + + img { width: 30px; } } @@ -574,4 +596,4 @@ } } -} \ No newline at end of file +} diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts index b19ef58..9da47ef 100644 --- a/src/app/system-management/user/user.component.ts +++ b/src/app/system-management/user/user.component.ts @@ -100,7 +100,7 @@ export class UserComponent implements OnInit { nzTitle: '新增用户', nzContent: AdduserComponent, nzViewContainerRef: this.viewContainerRef, - nzWidth: 288, + nzWidth: 360, nzComponentParams: { title: '', subtitle: '' @@ -149,7 +149,7 @@ export class UserComponent implements OnInit { nzTitle: '编辑用户', nzContent: EdituserComponent, nzViewContainerRef: this.viewContainerRef, - nzWidth: 288, + nzWidth: 360, // nzOkLoading: true, nzComponentParams: { data: data,