-
+
忘记密码?
diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss
index f7618f4..1a20adf 100644
--- a/src/app/pages/login/login.component.scss
+++ b/src/app/pages/login/login.component.scss
@@ -10,7 +10,9 @@
}
.left{
color: #feffff;
+ padding: 50px;
margin-right: 100px;
+ height: 504px;
p{
font-size: 24px;
text-align: left;
@@ -25,11 +27,14 @@
width: 468px;
height: 504px;
box-sizing: border-box;
- padding: 79px 45px 42px 45px;
+ padding: 40px 45px 42px 45px;
color: #3b3b3b;
}
.cardheader {
+ width: 200px;
+ margin: 0 auto;
+ text-align: center;
font-size: 22px;
color: #3b3b3b
}
@@ -61,7 +66,7 @@ button {
width: 100%;
height: 42px;
font-size: 16px;
- background: #2D4CC1;
+ // background: #2D4CC1;
border-radius: 4px;
}
diff --git a/src/styles.scss b/src/styles.scss
index 2f8e2e3..b7395d4 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -15,7 +15,6 @@ body {
width: 100%;
height: 100%;
overflow: hidden;
- --antd-wave-shadow-color: #2D4CC1;
}
body {
@@ -139,3 +138,6 @@ app-root {
.maxHeightTreeSelect {
max-height: 280px;
}
+button{
+ background: #2D4CC1;
+}
\ No newline at end of file
diff --git a/src/theme.scss b/src/theme.scss
new file mode 100644
index 0000000..87c3565
--- /dev/null
+++ b/src/theme.scss
@@ -0,0 +1,5 @@
+// -------- 引入官方提供的 less 样式入口文件 -----------
+@import "../node_modules/ng-zorro-antd/ng-zorro-antd.less";
+
+// -------- 自定义参数覆盖 -----------
+@primary-color : #f5222d;
\ No newline at end of file
From b81375f6f351fb70a3e20bb5094582fafb73c21a Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Wed, 3 Aug 2022 14:38:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../home/basic-info/unit/unit.component.html | 70 ++++++++++++++-
.../home/basic-info/unit/unit.component.scss | 86 +++++++++++++++++--
.../home/basic-info/unit/unit.component.ts | 39 ++++++++-
src/app/home/home.module.ts | 9 +-
4 files changed, 192 insertions(+), 12 deletions(-)
diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html
index aa885f8..8f4cb30 100644
--- a/src/app/home/basic-info/unit/unit.component.html
+++ b/src/app/home/basic-info/unit/unit.component.html
@@ -1,2 +1,68 @@
-
-
\ No newline at end of file
+
+
+
+
+
+ | 单位名称 |
+ 信息完整度 |
+ 所属机构 |
+ 单位级别 |
+ 使用性质 |
+ 修改时间 |
+ 单位地址 |
+ 状态 |
+ 操作 |
+
+
+
+
+ | {{ data.name }} |
+ {{ data.integrity }} |
+ {{ data.organization }} |
+ {{ data.nature }} |
+ {{ data.time }} |
+ {{ data.addr }} |
+ {{ data.state }} |
+
+ Action 一 {{ data.name }}
+
+ |
+
+
+
+
+
diff --git a/src/app/home/basic-info/unit/unit.component.scss b/src/app/home/basic-info/unit/unit.component.scss
index 4cfccbf..7651035 100644
--- a/src/app/home/basic-info/unit/unit.component.scss
+++ b/src/app/home/basic-info/unit/unit.component.scss
@@ -1,6 +1,80 @@
-p{
- color: black;
-}
-input{
- color: red;
-}
\ No newline at end of file
+.orbox {
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+ background: #fff;
+ box-sizing: border-box;
+ padding: 20px;
+ font-size: 15px;
+ }
+
+ .topbox {
+ width: 100%;
+ height: 36px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .lefttop {
+ span:nth-child(1) {
+ color: #000D21;
+ margin-right: 16px;
+ }
+
+ span:nth-child(2) {
+ color: rgba(36, 36, 36, 0.24);
+ }
+ }
+
+ .righttop {
+ height: 36px;
+ display: flex;
+
+ button {
+ margin-left: 16px;
+ }
+
+ nz-input-group {
+ height: 32px;
+ }
+ }
+ }
+
+ .treeTitle {
+ width: 700px;
+ height: 36px;
+ line-height: 36px;
+ display: flex;
+ justify-content: space-between;
+ color: #000D21;
+ box-sizing: border-box;
+ padding-left: 30px;
+ padding-right: 180px;
+ background: rgba(145, 204, 255, 0.2);
+ margin: 12px 0;
+ }
+
+ .nodebox {
+ font-size: 15px;
+
+ }
+
+ .operation {
+ position: absolute;
+ right: 0;
+
+ span {
+ margin-left: 40px;
+ }
+
+ span:nth-child(1),
+ span:nth-child(2),
+ span:nth-child(3) {
+ color: #2399FF;
+ }
+
+ .grey{
+ color: rgba(0, 13, 33, 0.48)!important;
+ }
+ }
+
\ No newline at end of file
diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts
index a84b91e..b603a6e 100644
--- a/src/app/home/basic-info/unit/unit.component.ts
+++ b/src/app/home/basic-info/unit/unit.component.ts
@@ -1,17 +1,52 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
-
+interface Person {
+ id: string;
+ name: string;
+ integrity: number;
+ organization: string;
+ level: string;
+ nature:string;
+ time:string;
+ addr:string;
+ state:string
+}
@Component({
selector: 'app-unit',
templateUrl: './unit.component.html',
styleUrls: ['./unit.component.scss']
})
export class UnitComponent implements OnInit {
-
+ listOfData: Person[] = [
+ {
+ id: '1',
+ name: 'John Brown',
+ integrity: 32,
+ organization: 'New York No. 1 Lake Park',
+ level:'重点单位',
+ nature:'会议中心',
+ time:'time',
+ addr:'单位地址',
+ state:''
+ }
+ // {
+ // id: '2',
+ // name: 'Jim Green',
+ // integrity: 42,
+ // organization: 'London No. 1 Lake Park'
+ // },
+ // {
+ // id: '3',
+ // name: 'Joe Black',
+ // integrity: 32,
+ // organization: 'Sidney No. 1 Lake Park'
+ // }
+ ];
constructor(private router: Router) { }
ngOnInit(): void {
}
+ searchValue = '';
next() {
this.router.navigate(['/basicInfo/unit/details']);
}
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 946d8b6..2c597af 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -13,7 +13,9 @@ import { RoleComponent } from './system-management/role/role.component';
import { OrComponent } from './system-management/or/or.component';
import { UnitComponent } from './basic-info/unit/unit.component';
import { UnitDetailsComponent } from './basic-info/unit-details/unit-details.component';
-
+import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzTableModule } from 'ng-zorro-antd/table';
@NgModule({
declarations: [
NavComponent,
@@ -30,7 +32,10 @@ import { UnitDetailsComponent } from './basic-info/unit-details/unit-details.com
imports: [
CommonModule,
HomeRoutingModule,
- NzLayoutModule
+ NzLayoutModule,
+ NzDropDownModule,
+ NzInputModule,
+ NzTableModule
]
})
export class HomeModule { }
From 14db34867c211ba0882aa973ff77fb66bf61e0ee Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Wed, 3 Aug 2022 15:48:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../home/basic-info/unit/unit.component.html | 20 ++++++++++---------
.../home/basic-info/unit/unit.component.scss | 15 +++++++++++---
.../home/basic-info/unit/unit.component.ts | 2 +-
src/app/home/home.module.ts | 4 +++-
src/styles.scss | 3 ---
5 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html
index a6ae449..e85659b 100644
--- a/src/app/home/basic-info/unit/unit.component.html
+++ b/src/app/home/basic-info/unit/unit.component.html
@@ -49,15 +49,17 @@
- | {{ data.name }} |
- {{ data.integrity }} |
- {{ data.organization }} |
- {{ data.level }} |
- {{ data.nature }} |
- {{ data.time }} |
- {{ data.addr }} |
- {{ data.state }} |
-
+ | {{ data.name }} |
+ |
+ {{ data.organization }} |
+ {{ data.level }} |
+ {{ data.nature }} |
+ {{ data.time }} |
+ {{ data.addr }} |
+ {{ data.state }} |
+
查看详情
关闭
diff --git a/src/app/home/basic-info/unit/unit.component.scss b/src/app/home/basic-info/unit/unit.component.scss
index 71a04b5..4e535de 100644
--- a/src/app/home/basic-info/unit/unit.component.scss
+++ b/src/app/home/basic-info/unit/unit.component.scss
@@ -76,7 +76,16 @@
.grey{
color: rgba(0, 13, 33, 0.48)!important;
}
+ .progress{
+ width: 100%;
+ height: 20px;
+ background: #eee;
+ border-radius: 2px;
+ .bg{
+ width: 32%;
+ height: 100%;
+ background: #46B783;
+ }
+ }
}
- .td{
- border-style: 1px solid red;
- }
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts
index b603a6e..3309b62 100644
--- a/src/app/home/basic-info/unit/unit.component.ts
+++ b/src/app/home/basic-info/unit/unit.component.ts
@@ -21,7 +21,7 @@ export class UnitComponent implements OnInit {
{
id: '1',
name: 'John Brown',
- integrity: 32,
+ integrity: 20,
organization: 'New York No. 1 Lake Park',
level:'重点单位',
nature:'会议中心',
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 32ee8db..3e0f3b5 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -24,6 +24,7 @@ import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.c
import { StationTaskExecutionComponent } from './task/station-task-execution/station-task-execution.component';
import { StationTaskApplyComponent } from './task/station-task-apply/station-task-apply.component';
import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-weekly-plan.component';
+import { NzProgressModule } from 'ng-zorro-antd/progress';
@NgModule({
declarations: [
NavComponent,
@@ -52,7 +53,8 @@ import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-w
NzDropDownModule,
NzInputModule,
NzTableModule,
- NzIconModule
+ NzIconModule,
+ NzProgressModule
]
})
export class HomeModule { }
diff --git a/src/styles.scss b/src/styles.scss
index c48d6a6..6611369 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -155,6 +155,3 @@ app-root {
.maxHeightTreeSelect {
max-height: 280px;
}
-button{
- background: #2D4CC1;
-}
\ No newline at end of file
|