Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/system-management/navigation/navigation.component.html

@@ -8,13 +8,17 @@
       <div class="photograph">
         <img src="../../../assets/images/userbig.png" alt="">
       </div>
-      <span>Administrator</span>
-      <span><img src="../../../assets/images/icon/admin.png" alt=""> 管理员</span>
+      <!-- <span>Administrator</span> -->
+      <span class="namebox">
+        <img src="../../../assets/images/icon/admin.png" alt="">
+        <span class="name">{{name}}</span>
+      </span>
     </div>
     <div class="nav">
       <ul>
-        <li *ngFor="let item of menuList2" [routerLink]="item.url"  routerLinkActive="router-link-active"><img [src]="item.img" alt="">{{item.name}}</li>
-        
+        <li *ngFor="let item of menuList2" [routerLink]="item.url" routerLinkActive="router-link-active"><img
+            [src]="item.img" alt="">{{item.name}}</li>
+
       </ul>
     </div>
   </nz-sider>
@@ -35,4 +39,4 @@
       <router-outlet></router-outlet>
     </nz-content>
   </nz-layout>
-</nz-layout>
+</nz-layout>

src/app/system-management/navigation/navigation.component.scss

@@ -25,12 +25,12 @@ nz-sider {
     align-items: center;
     margin-top: 46px;
     margin-bottom: 46px;
-    .photograph {
-      // width: 140px;
-      // height: 140px;
-      // border: 4px solid #FFFFFF;
-      // opacity: 1;
-      // border-radius: 32px;
+
+    .namebox {
+      img {
+        margin-right: 3px;
+        vertical-align: text-top;
+      }
     }
 
     span {

src/app/system-management/navigation/navigation.component.ts

@@ -9,11 +9,11 @@ import { Router } from '@angular/router';
 export class NavigationComponent implements OnInit {
 
   constructor(private router: Router) { }
-  userMenu=[]
-  menu=[]
-  tap=[]
-  menuList1=[]
-  menuList2=[]
+  userMenu = []
+  menu = []
+  tap = []
+  menuList1 = []
+  menuList2 = []
   menu1 = [
     { name: '首页', url: '/homepage' },
     { name: '数字油站', url: '/plan' },
@@ -22,46 +22,49 @@ export class NavigationComponent implements OnInit {
     { name: '证照管理', url: '/audit' },
   ]
   menu3 = [
-    { name: '组织机构管理', url: '/system/organization' ,img:'../../../assets/images/icon/organization.png'},
-    { name: '用户管理', url: '/system/user' ,img:'../../../assets/images/icon/user.png'},
-    { name: '角色管理', url: '/system/role' ,img:'../../../assets/images/icon/role.png'},
-    { name: '分析主机管理', url: '/system/host' ,img:'../../../assets/images/icon/host.png'},
-    { name: '推送管理', url: '/system/push' ,img:'../../../assets/images/icon/push.png'},
-    { name: '经营类证照管理', url: '/system/updateOfLicense' ,img:'../../../assets/images/icon/license.png'},
-    { name: '资产类证照管理', url: '/system/fileOfLicense' ,img:'../../../assets/images/icon/license.png'},
-    { name: '菜单管理', url: '/system/menu' ,img:'../../../assets/images/icon/license.png'},
+    { name: '组织机构管理', url: '/system/organization', img: '../../../assets/images/icon/organization.png' },
+    { name: '用户管理', url: '/system/user', img: '../../../assets/images/icon/user.png' },
+    { name: '角色管理', url: '/system/role', img: '../../../assets/images/icon/role.png' },
+    { name: '分析主机管理', url: '/system/host', img: '../../../assets/images/icon/host.png' },
+    { name: '推送管理', url: '/system/push', img: '../../../assets/images/icon/push.png' },
+    { name: '经营类证照管理', url: '/system/updateOfLicense', img: '../../../assets/images/icon/license.png' },
+    { name: '资产类证照管理', url: '/system/fileOfLicense', img: '../../../assets/images/icon/license.png' },
+    { name: '菜单管理', url: '/system/menu', img: '../../../assets/images/icon/license.png' },
   ]
+
+  name
   ngOnInit(): void {
-    let a= sessionStorage.getItem('userdata')
-    this.userMenu=JSON.parse(a).menus
+    let a = sessionStorage.getItem('userdata')
+    this.userMenu = JSON.parse(a).menus
+    this.name = JSON.parse(a).name
     for (let index = 0; index < this.userMenu.length; index++) {
-      let a=this.userMenu[index].name
+      let a = this.userMenu[index].name
       this.tap.push(a)
-      
+
     }
     for (let index = 0; index < this.menu1.length; index++) {
       for (let k = 0; k < this.tap.length; k++) {
-        if (this.tap[k]==this.menu1[index].name) {
+        if (this.tap[k] == this.menu1[index].name) {
           this.menuList1.push(this.menu1[index])
         }
       }
       // console.log(this.menuList1);
     }
     for (let index = 0; index < this.menu3.length; index++) {
-      if(JSON.parse(a).userName=="admin"){
-        this.menuList2=this.menu3
-      }else{
+      if (JSON.parse(a).userName == "admin") {
+        this.menuList2 = this.menu3
+      } else {
         for (let k = 0; k < this.tap.length; k++) {
-          if (this.tap[k]==this.menu3[index].name) {
-            this.menuList2.push(this.menu3[index]) 
-  
+          if (this.tap[k] == this.menu3[index].name) {
+            this.menuList2.push(this.menu3[index])
+
           }
-          
+
         }
       }
-      
+
     }
-    
+
   }
   signOut() {
     this.router.navigate(['/login'])

src/app/system-management/organization/addor/addor.component.html

@@ -20,5 +20,10 @@
         <label nz-checkbox formControlName="isGasStation">是否为加油站</label>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <label nz-checkbox formControlName="isParticipationAudit">是否参与审核</label>
+      </nz-form-control>
+    </nz-form-item>
   </form>
 </div>

src/app/system-management/organization/addor/addor.component.ts

@@ -16,7 +16,8 @@ export class AddorComponent implements OnInit {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
       // code: [null, [Validators.required]],
-      isGasStation: [false]
+      isGasStation: [false],
+      isParticipationAudit: [true]
     });
   }
   destroyModal(): void {

src/app/system-management/organization/editor/editor.component.html

@@ -20,5 +20,10 @@
         <label [(ngModel)]="datacopy.isGasStation" nz-checkbox formControlName="isGasStation">是否为加油站</label>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <label [(ngModel)]="isParticipationAudit" nz-checkbox formControlName="isParticipationAudit">是否参与审核</label>
+      </nz-form-control>
+    </nz-form-item>
   </form>
-</div>
+</div>

src/app/system-management/organization/editor/editor.component.ts

@@ -13,14 +13,16 @@ export class EditorComponent implements OnInit {
   validateForm!: FormGroup;
   constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
 
-  datacopy:any
+  datacopy: any
+  isParticipationAudit
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
-      // code: [null, [Validators.required]],
-      isGasStation: []
+      isGasStation: [],
+      isParticipationAudit: []
     });
-    this.datacopy = JSON.parse(JSON.stringify(this.data)) 
+    this.datacopy = JSON.parse(JSON.stringify(this.data))
+    this.isParticipationAudit = !this.datacopy.isSkipAudit
   }
   destroyModal(): void {
     this.modal.destroy({ data: 'this the result data' });

src/app/system-management/organization/organization.component.ts

@@ -62,6 +62,7 @@ export class OrganizationComponent implements OnInit {
       this.nodes = [...this.toTree.toTree(data.result.items)]
       this.defaultExpandedKeys = [this.nodes[0].id]
       this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+      console.log(this.nodes)
     })
   }
 
@@ -87,9 +88,9 @@ export class OrganizationComponent implements OnInit {
           await new Promise(resolve => {
             let body = {
               parentId: node ? Number(node.key) : null,
-              // code: instance.validateForm.value.code,
               displayName: instance.validateForm.value.name,
-              isGasStation: instance.validateForm.value.isGasStation
+              isGasStation: instance.validateForm.value.isGasStation,
+              isSkipAudit: !instance.validateForm.value.isParticipationAudit
             }
             this.http.post('/api/services/app/Organization/Create', body).subscribe(data => {
               resolve(data)
@@ -115,7 +116,6 @@ export class OrganizationComponent implements OnInit {
 
   }
   editOr(node) {
-    // console.log(node)
     const modal = this.modal.create({
       nzTitle: '编辑组织机构',
       nzContent: EditorComponent,
@@ -131,9 +131,9 @@ export class OrganizationComponent implements OnInit {
             let body = {
               id: node.origin.id,
               parentId: node.origin.parentId,
-              // code: instance.validateForm.value.code,
               displayName: instance.validateForm.value.name,
-              isGasStation: instance.validateForm.value.isGasStation
+              isGasStation: instance.validateForm.value.isGasStation,
+              isSkipAudit: !instance.validateForm.value.isParticipationAudit
             }
             this.http.put('/api/services/app/Organization/Update', body).subscribe(data => {
               resolve(data)

src/app/system-management/user/user.component.html

@@ -23,7 +23,7 @@
       </nz-tree>
       <ng-template #nzTreeTemplate let-node let-origin="origin">
         <div class="nodebox">
-          <span class="name" (click)="xxx(node)">{{ node.title }}</span>
+          <span class="name">{{ node.title }}</span>
           <span class="name">({{node.origin.products? node.origin.products.usersCount : 0}})</span>
         </div>
       </ng-template>

src/app/system-management/user/user.component.ts

@@ -151,9 +151,7 @@ export class UserComponent implements OnInit {
       })
     })
   }
-  xxx(node){
-    console.log(node)
-  }
+
   //搜索框提交
   submitForm(): void {
     for (const i in this.validateForm.controls) {