shaojiahao
/
Jinan_project
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

非煤矿山灾害智能感知和预警系统
邵佳豪 3 years ago
parent
2cb7b107cd 7e6ccc57fc
commit
0e5e46f544
6 changed files with 166 additions and 139 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/home/basic-info/unit-details/unit-details.component.html
  2. 11
      src/app/home/basic-info/unit-details/unit-details.component.scss
  3. 9
      src/app/home/basic-info/unit-details/unit-details.component.ts
  4. 250
      src/app/home/home.module.ts
  5. 15
      src/app/home/task/task.component.html
  6. 18
      src/app/home/task/task.component.ts

2
src/app/home/basic-info/unit-details/unit-details.component.html
Unescape View File

@ -104,6 +104,7 @@
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</form> </form>
</div> </div>
<div class="content-right mainright" style="width: 50%;" id="setPosition"> <div class="content-right mainright" style="width: 50%;" id="setPosition">
@ -147,6 +148,7 @@
</div> </div>
</div> </div>
<div class="title">基本信息</div>
<div [ngClass]="{'form': disableds}"> <div [ngClass]="{'form': disableds}">
<div class="formbox" #box> <div class="formbox" #box>
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin: 0 auto; "> <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin: 0 auto; ">

11
src/app/home/basic-info/unit-details/unit-details.component.scss
Unescape View File

@ -54,10 +54,17 @@
border-radius: 10px; border-radius: 10px;
padding-left: 10px; padding-left: 10px;
} }
.content { .content {
border: 1px solid; border: 1px solid;
.content-left{
display: flex;
justify-content: center;
align-items: center;
form{
width: 100%;
}
}
.mainright { .mainright {
color: #000; color: #000;
float: left; float: left;

9
src/app/home/basic-info/unit-details/unit-details.component.ts
Unescape View File

@ -3,6 +3,9 @@ import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { Router } from '@angular/router'; 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 { TreeService } from 'src/app/service/tree.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { asBlob } from 'html-docx-js-typescript' import { asBlob } from 'html-docx-js-typescript'
@ -17,6 +20,8 @@ declare var AMap: any;
export class UnitDetailsComponent implements OnInit { export class UnitDetailsComponent implements OnInit {
@ViewChild('box') box: ElementRef; @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) { 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[] = []; listOfData: any[] = [];

250
src/app/home/home.module.ts
Unescape View File

@ -1,124 +1,126 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
import { HomeRoutingModule } from './home-routing.module'; import { HomeRoutingModule } from './home-routing.module';
import { NavComponent } from './nav/nav.component'; import { NavComponent } from './nav/nav.component';
import { NzLayoutModule } from 'ng-zorro-antd/layout'; import { NzLayoutModule } from 'ng-zorro-antd/layout';
import { BasicInfoComponent } from './basic-info/basic-info.component'; import { BasicInfoComponent } from './basic-info/basic-info.component';
import { TaskComponent } from './task/task.component'; import { TaskComponent } from './task/task.component';
import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component';
import { SystemManagementComponent } from './system-management/system-management.component'; import { SystemManagementComponent } from './system-management/system-management.component';
import { UserComponent } from './system-management/user/user.component'; import { UserComponent } from './system-management/user/user.component';
import { RoleComponent } from './system-management/role/role.component'; import { RoleComponent } from './system-management/role/role.component';
import { OrComponent } from './system-management/or/or.component'; import { OrComponent } from './system-management/or/or.component';
import { UnitComponent } from './basic-info/unit/unit.component'; import { UnitComponent } from './basic-info/unit/unit.component';
import { UnitDetailsComponent } from './basic-info/unit-details/unit-details.component'; import { UnitDetailsComponent } from './basic-info/unit-details/unit-details.component';
import { NzInputModule } from 'ng-zorro-antd/input'; import { NzInputModule } from 'ng-zorro-antd/input';
import { NzIconModule } from 'ng-zorro-antd/icon'; import { NzIconModule } from 'ng-zorro-antd/icon';
import { ZhiIndicatorsComponent } from './task/zhi-indicators/zhi-indicators.component'; import { ZhiIndicatorsComponent } from './task/zhi-indicators/zhi-indicators.component';
import { ZhiAuditComponent } from './task/zhi-audit/zhi-audit.component'; import { ZhiAuditComponent } from './task/zhi-audit/zhi-audit.component';
import { DaMonthlyTaskOverviewComponent } from './task/da-monthly-task-overview/da-monthly-task-overview.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 { DaSubordinateAuditComponent } from './task/da-subordinate-audit/da-subordinate-audit.component';
import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.component'; import { DaOneselfPlanComponent } from './task/da-oneself-plan/da-oneself-plan.component';
import { StationTaskExecutionComponent } from './task/station-task-execution/station-task-execution.component'; import { StationTaskExecutionComponent } from './task/station-task-execution/station-task-execution.component';
import { StationTaskApplyComponent } from './task/station-task-apply/station-task-apply.component'; import { StationTaskApplyComponent } from './task/station-task-apply/station-task-apply.component';
import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-weekly-plan.component'; import { StationWeeklyPlanComponent } from './task/station-weekly-plan/station-weekly-plan.component';
import { NzProgressModule } from 'ng-zorro-antd/progress'; import { NzProgressModule } from 'ng-zorro-antd/progress';
import { NzEmptyModule } from 'ng-zorro-antd/empty'; import { NzEmptyModule } from 'ng-zorro-antd/empty';
import { NzButtonModule } from 'ng-zorro-antd/button'; import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzTableModule } from 'ng-zorro-antd/table'; import { NzTableModule } from 'ng-zorro-antd/table';
import { NzFormModule } from 'ng-zorro-antd/form'; import { NzFormModule } from 'ng-zorro-antd/form';
import { AddroleComponent } from './system-management/role/addrole/addrole.component'; import { AddroleComponent } from './system-management/role/addrole/addrole.component';
import { EditroleComponent } from './system-management/role/editrole/editrole.component'; import { EditroleComponent } from './system-management/role/editrole/editrole.component';
import { NzSelectModule } from 'ng-zorro-antd/select'; import { NzSelectModule } from 'ng-zorro-antd/select';
import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NzModalModule } from 'ng-zorro-antd/modal'; import { NzModalModule } from 'ng-zorro-antd/modal';
import { NzMessageModule } from 'ng-zorro-antd/message'; import { NzMessageModule } from 'ng-zorro-antd/message';
import { AdduserComponent } from './system-management/user/adduser/adduser.component'; import { AdduserComponent } from './system-management/user/adduser/adduser.component';
import { EdituserComponent } from './system-management/user/edituser/edituser.component'; import { EdituserComponent } from './system-management/user/edituser/edituser.component';
import { NzPaginationModule } from 'ng-zorro-antd/pagination'; import { NzPaginationModule } from 'ng-zorro-antd/pagination';
import { NzTreeModule } from 'ng-zorro-antd/tree'; import { NzTreeModule } from 'ng-zorro-antd/tree';
import { AddorComponent } from './system-management/or/addor/addor.component'; import { AddorComponent } from './system-management/or/addor/addor.component';
import { EditorComponent } from './system-management/or/editor/editor.component'; import { EditorComponent } from './system-management/or/editor/editor.component';
import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; import { AddUnitComponent } from './basic-info/add-unit/add-unit.component';
import { NzCollapseModule } from 'ng-zorro-antd/collapse'; import { NzCollapseModule } from 'ng-zorro-antd/collapse';
import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzPopoverModule } from 'ng-zorro-antd/popover';
import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
import { ScrollingModule } from '@angular/cdk/scrolling'; import { ScrollingModule } from '@angular/cdk/scrolling';
import { NzGridModule } from 'ng-zorro-antd/grid'; import { NzGridModule } from 'ng-zorro-antd/grid';
import { NzRadioModule } from 'ng-zorro-antd/radio'; import { NzRadioModule } from 'ng-zorro-antd/radio';
import { ApplyComponent } from './task/station-task-apply/apply/apply.component'; import { ApplyComponent } from './task/station-task-apply/apply/apply.component';
import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component'; import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component';
import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component'; import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component';
import { UnitEditComponent } from './basic-info/unit-edit/unit-edit.component'; import { UnitEditComponent } from './basic-info/unit-edit/unit-edit.component';
import { NzSpinModule } from 'ng-zorro-antd/spin'; import { NzSpinModule } from 'ng-zorro-antd/spin';
import { AllotPersonComponent } from './task/da-subordinate-audit/allot-person/allot-person.component'; import { AllotPersonComponent } from './task/da-subordinate-audit/allot-person/allot-person.component';
import { ChangePasswordComponent } from './change-password/change-password.component'; import { ChangePasswordComponent } from './change-password/change-password.component';
@NgModule({ import { NzUploadModule } from 'ng-zorro-antd/upload';
declarations: [ @NgModule({
NavComponent, declarations: [
BasicInfoComponent, NavComponent,
TaskComponent, BasicInfoComponent,
StatisticAnalysisComponent, TaskComponent,
SystemManagementComponent, StatisticAnalysisComponent,
UserComponent, SystemManagementComponent,
RoleComponent, UserComponent,
OrComponent, RoleComponent,
UnitComponent, OrComponent,
UnitDetailsComponent, UnitComponent,
ZhiIndicatorsComponent, UnitDetailsComponent,
ZhiAuditComponent, ZhiIndicatorsComponent,
DaMonthlyTaskOverviewComponent, ZhiAuditComponent,
DaSubordinateAuditComponent, DaMonthlyTaskOverviewComponent,
DaOneselfPlanComponent, DaSubordinateAuditComponent,
StationTaskExecutionComponent, DaOneselfPlanComponent,
StationTaskApplyComponent, StationTaskExecutionComponent,
StationWeeklyPlanComponent, StationTaskApplyComponent,
AddroleComponent, StationWeeklyPlanComponent,
EditroleComponent, AddroleComponent,
AdduserComponent, EditroleComponent,
EdituserComponent, AdduserComponent,
AddorComponent, EdituserComponent,
EditorComponent, AddorComponent,
AddUnitComponent, EditorComponent,
ApplyComponent, AddUnitComponent,
ApplyLookComponent, ApplyComponent,
LookTaskComponent, ApplyLookComponent,
UnitEditComponent, LookTaskComponent,
AllotPersonComponent, UnitEditComponent,
ChangePasswordComponent AllotPersonComponent,
], ChangePasswordComponent
imports: [ ],
CommonModule, imports: [
HomeRoutingModule, CommonModule,
NzLayoutModule, HomeRoutingModule,
NzDropDownModule, NzLayoutModule,
NzTableModule, NzDropDownModule,
NzIconModule, NzTableModule,
NzProgressModule, NzIconModule,
NzEmptyModule, NzProgressModule,
NzButtonModule, NzEmptyModule,
NzFormModule, NzButtonModule,
NzSelectModule, NzFormModule,
NzTreeSelectModule, NzSelectModule,
FormsModule, NzTreeSelectModule,
ReactiveFormsModule, FormsModule,
NzModalModule, ReactiveFormsModule,
NzMessageModule, NzModalModule,
NzInputModule, NzMessageModule,
NzPaginationModule, NzInputModule,
NzTreeModule, NzPaginationModule,
NzCollapseModule, NzTreeModule,
NzPopoverModule, NzCollapseModule,
NzCheckboxModule, NzPopoverModule,
ScrollingModule, NzCheckboxModule,
NzGridModule, ScrollingModule,
NzRadioModule, NzGridModule,
NzDatePickerModule, NzRadioModule,
NzSpinModule NzDatePickerModule,
], NzSpinModule,
entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent] NzUploadModule
}) ],
export class HomeModule { } entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent]
})
export class HomeModule { }

15
src/app/home/task/task.component.html
Unescape View File

@ -10,30 +10,31 @@
工作审批 工作审批
</li> --> </li> -->
</ul> </ul>
<ul *ngIf="level == 'battalion'"> <ul *ngIf="level == 'battalion' && !user">
<li [routerLink]="['/task/monthlytaskoverview']" routerLinkActive="router-link-active"> <li [routerLink]="['/task/monthlytaskoverview']" routerLinkActive="router-link-active">
<i nz-icon nzType="appstore" nzTheme="outline"></i> <i nz-icon nzType="appstore" nzTheme="outline"></i>
月度任务总览 月度任务总览
</li> </li>
<li [routerLink]="['/task/subordinateaudit']" routerLinkActive="router-link-active">
<i nz-icon nzType="file-protect" nzTheme="outline"></i>
下级任务申请
</li>
<li [routerLink]="['/task/oneselfplan']" routerLinkActive="router-link-active"> <li [routerLink]="['/task/oneselfplan']" routerLinkActive="router-link-active">
<i nz-icon nzType="file-text" nzTheme="outline"></i> <i nz-icon nzType="file-text" nzTheme="outline"></i>
本级计划 本级计划
</li> </li>
</ul> </ul>
<ul *ngIf="level == 'squadron'"> <ul *ngIf="level == 'squadron' || user">
<li [routerLink]="['/task/taskexecution']" routerLinkActive="router-link-active"> <li [routerLink]="['/task/taskexecution']" routerLinkActive="router-link-active">
<i nz-icon nzType="file-protect" nzTheme="outline"></i> <i nz-icon nzType="file-protect" nzTheme="outline"></i>
任务执行 任务执行
</li> </li>
<li [routerLink]="['/task/subordinateaudit']" routerLinkActive="router-link-active">
<i nz-icon nzType="file-protect" nzTheme="outline"></i>
任务处理
</li>
<li [routerLink]="['/task/taskapply']" routerLinkActive="router-link-active"> <li [routerLink]="['/task/taskapply']" routerLinkActive="router-link-active">
<i nz-icon nzType="file-text" nzTheme="outline"></i> <i nz-icon nzType="file-text" nzTheme="outline"></i>
任务申请 任务申请
</li> </li>
<li [routerLink]="['/task/weeklyplan']" routerLinkActive="router-link-active"> <li *ngIf="level=='squadron'" [routerLink]="['/task/weeklyplan']" routerLinkActive="router-link-active">
<i nz-icon nzType="container" nzTheme="outline"></i> <i nz-icon nzType="container" nzTheme="outline"></i>
生成周计划 生成周计划
</li> </li>

18
src/app/home/task/task.component.ts
Unescape View File

@ -8,20 +8,32 @@ import { Router } from '@angular/router';
}) })
export class TaskComponent implements OnInit { export class TaskComponent implements OnInit {
level="" level=""
user=false
constructor(private router: Router) { } constructor(private router: Router) { }
ngOnInit(): void { ngOnInit(): void {
console.log(JSON.parse(sessionStorage.getItem('userData')));
this.level=JSON.parse(sessionStorage.getItem('userData')).organizationLevel this.level=JSON.parse(sessionStorage.getItem('userData')).organizationLevel
let user=JSON.parse(sessionStorage.getItem('userData')).roles
for (let index = 0; index < user.length; index++) {
const element = user[index].name;
if(element.indexOf('检查') != -1){
this.user=true
}
}
if(this.router.url=="/task"){ if(this.router.url=="/task"){
if(this.level=="brigade"){ if(this.level=="brigade"){
this.router.navigate(['/task/indicators']) this.router.navigate(['/task/indicators'])
}else if(this.level=="battalion"){ }else if(this.level=="battalion" && !this.user){
this.router.navigate(['/task/monthlytaskoverview']) this.router.navigate(['/task/monthlytaskoverview'])
}else if(this.level=="squadron"){ }else if(this.level=="squadron" || this.user){
this.router.navigate(['/task/taskexecution']) this.router.navigate(['/task/taskexecution'])
} }
} }
} }
} }

Write Preview
Loading…
Cancel
Save