diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html index 59e47a9..3391e34 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.html +++ b/src/app/home/basic-info/unit-details/unit-details.component.html @@ -104,6 +104,7 @@ +
@@ -147,6 +148,7 @@
+
基本信息
diff --git a/src/app/home/basic-info/unit-details/unit-details.component.scss b/src/app/home/basic-info/unit-details/unit-details.component.scss index 017d4d3..9f7e868 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.scss +++ b/src/app/home/basic-info/unit-details/unit-details.component.scss @@ -54,10 +54,17 @@ border-radius: 10px; padding-left: 10px; } - + .content { border: 1px solid; - + .content-left{ + display: flex; + justify-content: center; + align-items: center; + form{ + width: 100%; + } + } .mainright { color: #000; float: left; diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index 7eb9d64..2cd09f4 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -3,6 +3,9 @@ import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzMessageService } from 'ng-zorro-antd/message'; import { Router } from '@angular/router'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { Observable, Observer } from 'rxjs'; +import { NzUploadChangeParam } from 'ng-zorro-antd/upload'; import { TreeService } from 'src/app/service/tree.service'; import { HttpClient } from '@angular/common/http'; import { asBlob } from 'html-docx-js-typescript' @@ -17,6 +20,8 @@ declare var AMap: any; export class UnitDetailsComponent implements OnInit { @ViewChild('box') box: ElementRef; + loading = false; + avatarUrl?: string; constructor(private message: NzMessageService, private router: Router, private toTree: TreeService, private fb: FormBuilder, private http: HttpClient, private renderer: Renderer2, private el: ElementRef, public renderer2: Renderer2, private elementRef: ElementRef) { } @@ -320,9 +325,7 @@ export class UnitDetailsComponent implements OnInit { } } - - - + listOfData: any[] = []; diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index d9817ca..bd5b9a9 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -1,124 +1,126 @@ -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'; -import { BasicInfoComponent } from './basic-info/basic-info.component'; -import { TaskComponent } from './task/task.component'; -import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; -import { SystemManagementComponent } from './system-management/system-management.component'; -import { UserComponent } from './system-management/user/user.component'; -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 { NzInputModule } from 'ng-zorro-antd/input'; -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'; -import { NzProgressModule } from 'ng-zorro-antd/progress'; -import { NzEmptyModule } from 'ng-zorro-antd/empty'; -import { NzButtonModule } from 'ng-zorro-antd/button'; -import { NzTableModule } from 'ng-zorro-antd/table'; -import { NzFormModule } from 'ng-zorro-antd/form'; -import { AddroleComponent } from './system-management/role/addrole/addrole.component'; -import { EditroleComponent } from './system-management/role/editrole/editrole.component'; -import { NzSelectModule } from 'ng-zorro-antd/select'; -import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { NzModalModule } from 'ng-zorro-antd/modal'; -import { NzMessageModule } from 'ng-zorro-antd/message'; -import { AdduserComponent } from './system-management/user/adduser/adduser.component'; -import { EdituserComponent } from './system-management/user/edituser/edituser.component'; -import { NzPaginationModule } from 'ng-zorro-antd/pagination'; -import { NzTreeModule } from 'ng-zorro-antd/tree'; -import { AddorComponent } from './system-management/or/addor/addor.component'; -import { EditorComponent } from './system-management/or/editor/editor.component'; -import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; -import { NzCollapseModule } from 'ng-zorro-antd/collapse'; -import { NzPopoverModule } from 'ng-zorro-antd/popover'; -import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { NzGridModule } from 'ng-zorro-antd/grid'; -import { NzRadioModule } from 'ng-zorro-antd/radio'; -import { ApplyComponent } from './task/station-task-apply/apply/apply.component'; -import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component'; -import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; -import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component'; -import { UnitEditComponent } from './basic-info/unit-edit/unit-edit.component'; -import { NzSpinModule } from 'ng-zorro-antd/spin'; -import { AllotPersonComponent } from './task/da-subordinate-audit/allot-person/allot-person.component'; -import { ChangePasswordComponent } from './change-password/change-password.component'; -@NgModule({ - declarations: [ - NavComponent, - BasicInfoComponent, - TaskComponent, - StatisticAnalysisComponent, - SystemManagementComponent, - UserComponent, - RoleComponent, - OrComponent, - UnitComponent, - UnitDetailsComponent, - ZhiIndicatorsComponent, - ZhiAuditComponent, - DaMonthlyTaskOverviewComponent, - DaSubordinateAuditComponent, - DaOneselfPlanComponent, - StationTaskExecutionComponent, - StationTaskApplyComponent, - StationWeeklyPlanComponent, - AddroleComponent, - EditroleComponent, - AdduserComponent, - EdituserComponent, - AddorComponent, - EditorComponent, - AddUnitComponent, - ApplyComponent, - ApplyLookComponent, - LookTaskComponent, - UnitEditComponent, - AllotPersonComponent, - ChangePasswordComponent - ], - imports: [ - CommonModule, - HomeRoutingModule, - NzLayoutModule, - NzDropDownModule, - NzTableModule, - NzIconModule, - NzProgressModule, - NzEmptyModule, - NzButtonModule, - NzFormModule, - NzSelectModule, - NzTreeSelectModule, - FormsModule, - ReactiveFormsModule, - NzModalModule, - NzMessageModule, - NzInputModule, - NzPaginationModule, - NzTreeModule, - NzCollapseModule, - NzPopoverModule, - NzCheckboxModule, - ScrollingModule, - NzGridModule, - NzRadioModule, - NzDatePickerModule, - NzSpinModule - ], - entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent] -}) -export class HomeModule { } +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'; +import { BasicInfoComponent } from './basic-info/basic-info.component'; +import { TaskComponent } from './task/task.component'; +import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; +import { SystemManagementComponent } from './system-management/system-management.component'; +import { UserComponent } from './system-management/user/user.component'; +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 { NzInputModule } from 'ng-zorro-antd/input'; +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'; +import { NzProgressModule } from 'ng-zorro-antd/progress'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { AddroleComponent } from './system-management/role/addrole/addrole.component'; +import { EditroleComponent } from './system-management/role/editrole/editrole.component'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzMessageModule } from 'ng-zorro-antd/message'; +import { AdduserComponent } from './system-management/user/adduser/adduser.component'; +import { EdituserComponent } from './system-management/user/edituser/edituser.component'; +import { NzPaginationModule } from 'ng-zorro-antd/pagination'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { AddorComponent } from './system-management/or/addor/addor.component'; +import { EditorComponent } from './system-management/or/editor/editor.component'; +import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; +import { NzCollapseModule } from 'ng-zorro-antd/collapse'; +import { NzPopoverModule } from 'ng-zorro-antd/popover'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { ScrollingModule } from '@angular/cdk/scrolling'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { ApplyComponent } from './task/station-task-apply/apply/apply.component'; +import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component'; +import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; +import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component'; +import { UnitEditComponent } from './basic-info/unit-edit/unit-edit.component'; +import { NzSpinModule } from 'ng-zorro-antd/spin'; +import { AllotPersonComponent } from './task/da-subordinate-audit/allot-person/allot-person.component'; +import { ChangePasswordComponent } from './change-password/change-password.component'; +import { NzUploadModule } from 'ng-zorro-antd/upload'; +@NgModule({ + declarations: [ + NavComponent, + BasicInfoComponent, + TaskComponent, + StatisticAnalysisComponent, + SystemManagementComponent, + UserComponent, + RoleComponent, + OrComponent, + UnitComponent, + UnitDetailsComponent, + ZhiIndicatorsComponent, + ZhiAuditComponent, + DaMonthlyTaskOverviewComponent, + DaSubordinateAuditComponent, + DaOneselfPlanComponent, + StationTaskExecutionComponent, + StationTaskApplyComponent, + StationWeeklyPlanComponent, + AddroleComponent, + EditroleComponent, + AdduserComponent, + EdituserComponent, + AddorComponent, + EditorComponent, + AddUnitComponent, + ApplyComponent, + ApplyLookComponent, + LookTaskComponent, + UnitEditComponent, + AllotPersonComponent, + ChangePasswordComponent + ], + imports: [ + CommonModule, + HomeRoutingModule, + NzLayoutModule, + NzDropDownModule, + NzTableModule, + NzIconModule, + NzProgressModule, + NzEmptyModule, + NzButtonModule, + NzFormModule, + NzSelectModule, + NzTreeSelectModule, + FormsModule, + ReactiveFormsModule, + NzModalModule, + NzMessageModule, + NzInputModule, + NzPaginationModule, + NzTreeModule, + NzCollapseModule, + NzPopoverModule, + NzCheckboxModule, + ScrollingModule, + NzGridModule, + NzRadioModule, + NzDatePickerModule, + NzSpinModule, + NzUploadModule + ], + entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent] +}) +export class HomeModule { } diff --git a/src/app/home/task/task.component.html b/src/app/home/task/task.component.html index bcbcb1c..6262209 100644 --- a/src/app/home/task/task.component.html +++ b/src/app/home/task/task.component.html @@ -10,30 +10,31 @@ 工作审批 --> -