diff --git a/angular.json b/angular.json index a26ea44..2ede4bb 100644 --- a/angular.json +++ b/angular.json @@ -37,14 +37,14 @@ ], "styles": [ "src/styles.scss", - "node_modules/ng-zorro-antd/ng-zorro-antd.min.css" + "node_modules/ng-zorro-antd/ng-zorro-antd.min.css", + "src/theme.less" ], "scripts": [] }, "configurations": { "production": { - "budgets": [ - { + "budgets": [{ "type": "initial", "maximumWarning": "5mb", "maximumError": "5mb" @@ -55,12 +55,10 @@ "maximumError": "4kb" } ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], + "fileReplacements": [{ + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + }], "outputHashing": "all" }, "development": { diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 3e0f3b5..5e23858 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -25,6 +25,8 @@ import { StationTaskExecutionComponent } from './task/station-task-execution/sta 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'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; +import { NzButtonModule } from 'ng-zorro-antd/button'; @NgModule({ declarations: [ NavComponent, @@ -54,7 +56,9 @@ import { NzProgressModule } from 'ng-zorro-antd/progress'; NzInputModule, NzTableModule, NzIconModule, - NzProgressModule + NzProgressModule, + NzEmptyModule, + NzButtonModule ] }) export class HomeModule { } diff --git a/src/app/home/statistic-analysis/statistic-analysis.component.html b/src/app/home/statistic-analysis/statistic-analysis.component.html index 1056d25..a6a2170 100644 --- a/src/app/home/statistic-analysis/statistic-analysis.component.html +++ b/src/app/home/statistic-analysis/statistic-analysis.component.html @@ -1 +1,4 @@ -

功能开发中

+ +
+ +
\ No newline at end of file diff --git a/src/app/home/statistic-analysis/statistic-analysis.component.scss b/src/app/home/statistic-analysis/statistic-analysis.component.scss index e69de29..56a0555 100644 --- a/src/app/home/statistic-analysis/statistic-analysis.component.scss +++ b/src/app/home/statistic-analysis/statistic-analysis.component.scss @@ -0,0 +1,7 @@ +.box{ + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/src/app/home/system-management/role/role.component.html b/src/app/home/system-management/role/role.component.html index eb54d90..ef40522 100644 --- a/src/app/home/system-management/role/role.component.html +++ b/src/app/home/system-management/role/role.component.html @@ -1,3 +1,11 @@
+
+ + 角色管理 + + +
+
+
\ No newline at end of file diff --git a/src/app/home/system-management/role/role.component.scss b/src/app/home/system-management/role/role.component.scss index 4df0c75..0687d7d 100644 --- a/src/app/home/system-management/role/role.component.scss +++ b/src/app/home/system-management/role/role.component.scss @@ -1,3 +1,16 @@ .box { - + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + + .header { + width: 100%; + height: 56px; + + } + + .content { + flex: 1; + } } diff --git a/src/styles.scss b/src/styles.scss index 6611369..da2f443 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -155,3 +155,8 @@ app-root { .maxHeightTreeSelect { max-height: 280px; } + +button { + + background: #2C4DC0; +} diff --git a/src/theme.less b/src/theme.less new file mode 100644 index 0000000..2396a16 --- /dev/null +++ b/src/theme.less @@ -0,0 +1,5 @@ +// -------- 引入官方提供的 less 样式入口文件 ----------- +@import "../node_modules/ng-zorro-antd/ng-zorro-antd.less"; + +// -------- 自定义参数覆盖 ----------- +@primary-color : #2C4DC0;