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

src/app/home/basic-info/unit-details/unit-details.component.html

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

src/app/home/basic-info/unit-details/unit-details.component.scss

@@ -57,7 +57,14 @@
   
   .content {
     border: 1px solid;
-
+    .content-left{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      form{
+        width: 100%;
+      }
+    }
     .mainright {
       color: #000;
       float: left;

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) {
 
   }
@@ -323,8 +328,6 @@ export class UnitDetailsComponent implements OnInit {
   
 
 
-
-
   listOfData: any[] = [];
   listOfData2: any[] = [];
 

src/app/home/home.module.ts

@@ -56,6 +56,7 @@ 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,
@@ -117,7 +118,8 @@ import { ChangePasswordComponent } from './change-password/change-password.compo
     NzGridModule,
     NzRadioModule,
     NzDatePickerModule,
-    NzSpinModule
+    NzSpinModule,
+    NzUploadModule
   ],
   entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent]
 })

src/app/home/task/task.component.html

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

src/app/home/task/task.component.ts

@@ -8,20 +8,32 @@ import { Router } from '@angular/router';
 })
 export class TaskComponent implements OnInit {
   level=""
+  user=false
   constructor(private router: Router) { }
 
   ngOnInit(): void {
+    console.log(JSON.parse(sessionStorage.getItem('userData')));
     
     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.level=="brigade"){
         this.router.navigate(['/task/indicators'])
-      }else if(this.level=="battalion"){
+      }else if(this.level=="battalion" && !this.user){
         this.router.navigate(['/task/monthlytaskoverview'])
-      }else if(this.level=="squadron"){
+      }else if(this.level=="squadron" || this.user){
         this.router.navigate(['/task/taskexecution'])
       }
     }
-  }
     
+    
+    
+  }
 }