From a97b4d137c27e698fd78e2dfb9c5b5815430c308 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 1 Sep 2022 15:53:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=94=AF=E9=98=9F=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=8F=98=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/basic-info/basic-info.component.html | 2 +- .../home/basic-info/unit/unit.component.html | 2 +- src/app/home/nav/nav.component.html | 2 +- src/app/home/nav/nav.component.ts | 4 ++ src/theme.less | 51 ++++++++++++++++++- 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/app/home/basic-info/basic-info.component.html b/src/app/home/basic-info/basic-info.component.html index 09e2c8c..997488b 100644 --- a/src/app/home/basic-info/basic-info.component.html +++ b/src/app/home/basic-info/basic-info.component.html @@ -1,4 +1,4 @@ -
+
- + 单位名称 diff --git a/src/app/home/nav/nav.component.html b/src/app/home/nav/nav.component.html index b89b2e5..2404a09 100644 --- a/src/app/home/nav/nav.component.html +++ b/src/app/home/nav/nav.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/home/nav/nav.component.ts b/src/app/home/nav/nav.component.ts index ef35c8c..29cff3d 100644 --- a/src/app/home/nav/nav.component.ts +++ b/src/app/home/nav/nav.component.ts @@ -17,6 +17,8 @@ export class NavComponent implements OnInit { constructor(private modal: NzModalService, private http: HttpClient, private message: NzMessageService, private viewContainerRef: ViewContainerRef, private router: Router, public token: CacheTokenService) { } user = null isSuperAdmin + + isZhidui = false ngOnInit(): void { //调用服务中的function刷新token this.token.startUp() @@ -27,6 +29,8 @@ export class NavComponent implements OnInit { }) isTrue ? this.isSuperAdmin = true : this.isSuperAdmin = false + let organizationLevel = JSON.parse(sessionStorage.getItem('userData')).organizationLevel + organizationLevel == 'brigade' ? this.isZhidui = true : this.isZhidui = false signalR.initSR(); // 接收来自中心的消息 diff --git a/src/theme.less b/src/theme.less index cbc3dad..b39bbd5 100644 --- a/src/theme.less +++ b/src/theme.less @@ -84,10 +84,57 @@ .maxHeightTreeSelect { max-height: 280px; } -.ant-checkbox-group{ + +.ant-checkbox-group { display: flex; flex-direction: column; - label{ + + label { margin-bottom: 6px; } } + + +.bigfontpattern { + .logobox { + width: 255px !important; + font-size: 20px !important; + } + + font-size: 16px !important; + + th, + tr, + button, + input, + nz-select, + nz-tree-select { + font-size: 16px !important; + padding-top: 0; + padding-bottom: 0; + } + +} + +// 适配125% +@media screen and (max-height: 750px) { + .bigfontpattern { + .logobox { + width: 240px !important; + font-size: 16px !important; + } + + font-size: 14px !important; + + th, + tr, + button, + input, + nz-select, + nz-tree-select { + font-size: 14px !important; + padding-top: 0; + padding-bottom: 0; + } + } +}