diff --git a/src/app/home/basic-info/basic-info.component.html b/src/app/home/basic-info/basic-info.component.html index a371b7a..09e2c8c 100644 --- a/src/app/home/basic-info/basic-info.component.html +++ b/src/app/home/basic-info/basic-info.component.html @@ -1,10 +1,15 @@
- +
+ +
diff --git a/src/app/home/basic-info/basic-info.component.scss b/src/app/home/basic-info/basic-info.component.scss index 6cbca32..49531f6 100644 --- a/src/app/home/basic-info/basic-info.component.scss +++ b/src/app/home/basic-info/basic-info.component.scss @@ -4,33 +4,47 @@ .nav { - width: 200px; + width: 210px; height: 100%; background: #2c4dc1; ul { li { - height: 48px; - line-height: 48px; + height: 50px; + line-height: 50px; cursor: pointer; + text-align: left; + + i { + margin: 0 8px 0 28px; + } } } } .router-link-active { background: #fff; + color: #2C4DC0; } .content { flex: 1; } -.router-link-active { - color: black; -} .content { box-sizing: border-box; - padding: 8px; + padding: 16px; background: #F6F5F8; + + .routerbox { + width: 100%; + height: 100%; + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + overflow-y: auto; + } } diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html index 8f4cb30..a6ae449 100644 --- a/src/app/home/basic-info/unit/unit.component.html +++ b/src/app/home/basic-info/unit/unit.component.html @@ -33,7 +33,7 @@ - + 单位名称 @@ -49,16 +49,18 @@ - {{ data.name }} - {{ data.integrity }} - {{ data.organization }} - {{ data.nature }} - {{ data.time }} - {{ data.addr }} - {{ data.state }} - - Action 一 {{ data.name }} - + {{ data.name }} + {{ data.integrity }} + {{ 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 7651035..71a04b5 100644 --- a/src/app/home/basic-info/unit/unit.component.scss +++ b/src/app/home/basic-info/unit/unit.component.scss @@ -77,4 +77,6 @@ color: rgba(0, 13, 33, 0.48)!important; } } - \ No newline at end of file + .td{ + border-style: 1px solid red; + } \ No newline at end of file diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index f7ae115..df6c515 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -8,7 +8,15 @@ import { OrComponent } from './system-management/or/or.component'; import { RoleComponent } from './system-management/role/role.component'; import { SystemManagementComponent } from './system-management/system-management.component'; import { UserComponent } from './system-management/user/user.component'; +import { DaMonthlyTaskOverviewComponent } from './task/da-monthly-task-overview/da-monthly-task-overview.component'; +import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.component'; +import { DaSubordinateAuditComponent } from './task/da-subordinate-audit/da-subordinate-audit.component'; +import { StationTaskApplyComponent } from './task/station-task-apply/station-task-apply.component'; +import { StationTaskExecutionComponent } from './task/station-task-execution/station-task-execution.component'; +import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-weekly-plan.component'; import { TaskComponent } from './task/task.component'; +import { ZhiAuditComponent } from './task/zhi-audit/zhi-audit.component'; +import { ZhiIndicatorsComponent } from './task/zhi-indicators/zhi-indicators.component'; const routes: Routes = [ { @@ -17,10 +25,7 @@ const routes: Routes = [ { path: '', redirectTo: '/basicInfo/unit', pathMatch: 'full' }, { path: 'unit', - component: UnitComponent, - children: [ - - ] + component: UnitComponent }, { path: 'unit/details', @@ -28,7 +33,43 @@ const routes: Routes = [ } ], }, - { path: 'task', component: TaskComponent }, + { + path: 'task', component: TaskComponent, + children: [ + { + path: 'indicators', + component: ZhiIndicatorsComponent, + }, + { + path: 'audit', + component: ZhiAuditComponent, + }, + { + path: 'monthlytaskoverview', + component: DaMonthlyTaskOverviewComponent, + }, + { + path: 'subordinateaudit', + component: DaSubordinateAuditComponent, + }, + { + path: 'oneselfplan', + component: DaOneselfPlanComponent, + }, + { + path: 'taskexecution', + component: StationTaskExecutionComponent, + }, + { + path: 'taskapply', + component: StationTaskApplyComponent, + }, + { + path: 'weeklyplan', + component: StationWeeklyPlanComponent, + } + ], + }, { path: 'statistic', component: StatisticAnalysisComponent }, { path: 'system', component: SystemManagementComponent, diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 2c597af..32ee8db 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { HomeRoutingModule } from './home-routing.module'; import { NavComponent } from './nav/nav.component'; import { NzLayoutModule } from 'ng-zorro-antd/layout'; @@ -13,9 +13,17 @@ 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'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { ZhiIndicatorsComponent } from './task/zhi-indicators/zhi-indicators.component'; +import { ZhiAuditComponent } from './task/zhi-audit/zhi-audit.component'; +import { DaMonthlyTaskOverviewComponent } from './task/da-monthly-task-overview/da-monthly-task-overview.component'; +import { DaSubordinateAuditComponent } from './task/da-subordinate-audit/da-subordinate-audit.component'; +import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.component'; +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'; @NgModule({ declarations: [ NavComponent, @@ -27,7 +35,15 @@ import { NzTableModule } from 'ng-zorro-antd/table'; RoleComponent, OrComponent, UnitComponent, - UnitDetailsComponent + UnitDetailsComponent, + ZhiIndicatorsComponent, + ZhiAuditComponent, + DaMonthlyTaskOverviewComponent, + DaSubordinateAuditComponent, + DaOneselfPlanComponent, + StationTaskExecutionComponent, + StationTaskApplyComponent, + StationWeeklyPlanComponent ], imports: [ CommonModule, @@ -35,7 +51,8 @@ import { NzTableModule } from 'ng-zorro-antd/table'; NzLayoutModule, NzDropDownModule, NzInputModule, - NzTableModule + NzTableModule, + NzIconModule ] }) export class HomeModule { } diff --git a/src/app/home/nav/nav.component.html b/src/app/home/nav/nav.component.html index 0742d6c..a58c93d 100644 --- a/src/app/home/nav/nav.component.html +++ b/src/app/home/nav/nav.component.html @@ -1,5 +1,9 @@ +
+ + 防消一体化综合治理平台 +
  • 基础信息
    @@ -14,6 +18,16 @@
    系统管理
+
+ + + + +
    +
  • 退出
  • +
+
+
diff --git a/src/app/home/nav/nav.component.scss b/src/app/home/nav/nav.component.scss index eeade1b..19bd89a 100644 --- a/src/app/home/nav/nav.component.scss +++ b/src/app/home/nav/nav.component.scss @@ -9,9 +9,19 @@ nz-header { background: #2C4DC0; color: #fff; display: flex; - justify-content: center; + justify-content: space-between; align-items: center; - + padding: 0 20px; + .logobox{ + img{ + margin-right: 8px; + } + } + .headerbtn{ + a{ + color: #fff; + } + } ul { display: flex; justify-content: center; diff --git a/src/app/home/nav/nav.component.ts b/src/app/home/nav/nav.component.ts index e710f3f..ec1496d 100644 --- a/src/app/home/nav/nav.component.ts +++ b/src/app/home/nav/nav.component.ts @@ -13,7 +13,7 @@ export class NavComponent implements OnInit { ngOnInit(): void { } - xxx() { - this.router.navigate(['/task']); + signOut() { + this.router.navigate(['/login']) } } diff --git a/src/app/home/statistic-analysis/statistic-analysis.component.html b/src/app/home/statistic-analysis/statistic-analysis.component.html index 204f3ed..1056d25 100644 --- a/src/app/home/statistic-analysis/statistic-analysis.component.html +++ b/src/app/home/statistic-analysis/statistic-analysis.component.html @@ -1 +1 @@ -

statistic-analysis works!

+

功能开发中

diff --git a/src/app/home/system-management/role/role.component.html b/src/app/home/system-management/role/role.component.html index ce1bd50..eb54d90 100644 --- a/src/app/home/system-management/role/role.component.html +++ b/src/app/home/system-management/role/role.component.html @@ -1 +1,3 @@ -

role works!

+
+ +
\ 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 e69de29..4df0c75 100644 --- a/src/app/home/system-management/role/role.component.scss +++ b/src/app/home/system-management/role/role.component.scss @@ -0,0 +1,3 @@ +.box { + +} diff --git a/src/app/home/system-management/system-management.component.html b/src/app/home/system-management/system-management.component.html index 47df6e9..b6991d4 100644 --- a/src/app/home/system-management/system-management.component.html +++ b/src/app/home/system-management/system-management.component.html @@ -1,12 +1,23 @@
- +
+ +
\ No newline at end of file diff --git a/src/app/home/system-management/system-management.component.scss b/src/app/home/system-management/system-management.component.scss index bdc52f6..3288140 100644 --- a/src/app/home/system-management/system-management.component.scss +++ b/src/app/home/system-management/system-management.component.scss @@ -4,32 +4,46 @@ .nav { - width: 200px; + width: 210px; height: 100%; background: #2c4dc1; + ul { li { - height: 48px; - line-height: 48px; + height: 50px; + line-height: 50px; cursor: pointer; + text-align: left; + + i { + margin: 0 8px 0 28px; + } } } } .router-link-active { background: #fff; + color: #2C4DC0; } .content { flex: 1; } -.router-link-active { - color: black; -} - .content { box-sizing: border-box; - padding: 8px; + padding: 16px; background: #F6F5F8; + + .routerbox { + width: 100%; + height: 100%; + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + overflow-y: auto; + } } diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html new file mode 100644 index 0000000..35e3dab --- /dev/null +++ b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html @@ -0,0 +1 @@ +

da-monthly-task-overview works!

diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts new file mode 100644 index 0000000..8dee578 --- /dev/null +++ b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-da-monthly-task-overview', + templateUrl: './da-monthly-task-overview.component.html', + styleUrls: ['./da-monthly-task-overview.component.scss'] +}) +export class DaMonthlyTaskOverviewComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html new file mode 100644 index 0000000..484b08a --- /dev/null +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html @@ -0,0 +1 @@ +

da-oneself-plan works!

diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts new file mode 100644 index 0000000..62983a4 --- /dev/null +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-da-oneself-plan', + templateUrl: './da-oneself-plan.component.html', + styleUrls: ['./da-oneself-plan.component.scss'] +}) +export class DaOneselfPlanComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html new file mode 100644 index 0000000..f4ff38b --- /dev/null +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html @@ -0,0 +1 @@ +

da-subordinate-audit works!

diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts new file mode 100644 index 0000000..7e4f904 --- /dev/null +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-da-subordinate-audit', + templateUrl: './da-subordinate-audit.component.html', + styleUrls: ['./da-subordinate-audit.component.scss'] +}) +export class DaSubordinateAuditComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.html b/src/app/home/task/station-task-apply/station-task-apply.component.html new file mode 100644 index 0000000..294cc99 --- /dev/null +++ b/src/app/home/task/station-task-apply/station-task-apply.component.html @@ -0,0 +1 @@ +

station-task-apply works!

diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.scss b/src/app/home/task/station-task-apply/station-task-apply.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.ts b/src/app/home/task/station-task-apply/station-task-apply.component.ts new file mode 100644 index 0000000..dbb373d --- /dev/null +++ b/src/app/home/task/station-task-apply/station-task-apply.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-station-task-apply', + templateUrl: './station-task-apply.component.html', + styleUrls: ['./station-task-apply.component.scss'] +}) +export class StationTaskApplyComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.html b/src/app/home/task/station-task-execution/station-task-execution.component.html new file mode 100644 index 0000000..6c69ff0 --- /dev/null +++ b/src/app/home/task/station-task-execution/station-task-execution.component.html @@ -0,0 +1 @@ +

station-task-execution works!

diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.scss b/src/app/home/task/station-task-execution/station-task-execution.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.ts b/src/app/home/task/station-task-execution/station-task-execution.component.ts new file mode 100644 index 0000000..6a800be --- /dev/null +++ b/src/app/home/task/station-task-execution/station-task-execution.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-station-task-execution', + templateUrl: './station-task-execution.component.html', + styleUrls: ['./station-task-execution.component.scss'] +}) +export class StationTaskExecutionComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html new file mode 100644 index 0000000..1c0d324 --- /dev/null +++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html @@ -0,0 +1 @@ +

station-weekly-plan works!

diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts new file mode 100644 index 0000000..ec19a67 --- /dev/null +++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-station-weekly-plan', + templateUrl: './station-weekly-plan.component.html', + styleUrls: ['./station-weekly-plan.component.scss'] +}) +export class StationWeeklyPlanComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/task.component.html b/src/app/home/task/task.component.html index 0c8a790..e43b55f 100644 --- a/src/app/home/task/task.component.html +++ b/src/app/home/task/task.component.html @@ -1 +1,47 @@ -

task works!

+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/home/task/task.component.scss b/src/app/home/task/task.component.scss index e69de29..a5750bc 100644 --- a/src/app/home/task/task.component.scss +++ b/src/app/home/task/task.component.scss @@ -0,0 +1,51 @@ +.box { + display: flex; +} + + +.nav { + width: 210px; + height: 100%; + background: #2c4dc1; + + ul { + margin-bottom: 0px; + li { + height: 50px; + line-height: 50px; + cursor: pointer; + text-align: left; + + i { + margin: 0 8px 0 28px; + } + } + } +} + +.router-link-active { + background: #fff; + color: #2C4DC0; +} + +.content { + flex: 1; +} + + +.content { + box-sizing: border-box; + padding: 16px; + background: #F6F5F8; + + .routerbox { + width: 100%; + height: 100%; + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + overflow-y: auto; + } +} diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.html b/src/app/home/task/zhi-audit/zhi-audit.component.html new file mode 100644 index 0000000..8ba83c5 --- /dev/null +++ b/src/app/home/task/zhi-audit/zhi-audit.component.html @@ -0,0 +1 @@ +

zhi-audit works!

diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.scss b/src/app/home/task/zhi-audit/zhi-audit.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.ts b/src/app/home/task/zhi-audit/zhi-audit.component.ts new file mode 100644 index 0000000..e4c6be2 --- /dev/null +++ b/src/app/home/task/zhi-audit/zhi-audit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-zhi-audit', + templateUrl: './zhi-audit.component.html', + styleUrls: ['./zhi-audit.component.scss'] +}) +export class ZhiAuditComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.html b/src/app/home/task/zhi-indicators/zhi-indicators.component.html new file mode 100644 index 0000000..abf1c31 --- /dev/null +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.html @@ -0,0 +1 @@ +

zhi-indicators works!

diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts new file mode 100644 index 0000000..ff8729e --- /dev/null +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-zhi-indicators', + templateUrl: './zhi-indicators.component.html', + styleUrls: ['./zhi-indicators.component.scss'] +}) +export class ZhiIndicatorsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/assets/images/logo/logo.png b/src/assets/images/logo/logo.png new file mode 100644 index 0000000..a92fd73 Binary files /dev/null and b/src/assets/images/logo/logo.png differ diff --git a/src/assets/images/logo2.png b/src/assets/images/logo2.png deleted file mode 100644 index afada94..0000000 Binary files a/src/assets/images/logo2.png and /dev/null differ diff --git a/src/assets/images/test/dog.jpg b/src/assets/images/test/dog.jpg deleted file mode 100644 index 61e30f8..0000000 Binary files a/src/assets/images/test/dog.jpg and /dev/null differ