From 359efe31c8c8c734263aad8408df53d7e0fa366e Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 20 Jul 2022 10:15:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oil-unloading-process-list.component.ts                 | 6 ++++++
 .../system-management/user/adduser/adduser.component.html   | 2 +-
 src/app/system-management/user/adduser/adduser.component.ts | 4 ++--
 .../system-management/user/edituser/edituser.component.html | 2 +-
 .../system-management/user/edituser/edituser.component.ts   | 2 +-
 src/app/system-management/user/user.component.ts            | 2 ++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
index 0c6ffda..a0a972f 100644
--- a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
+++ b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
@@ -428,6 +428,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
         name: '',
         data: [],
         type: 'bar',
+        label: {
+          show: true
+        },
         itemStyle: {
           color: {
             type: 'linear',
@@ -449,6 +452,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
         name: '',
         data: [],
         type: 'bar',
+        label: {
+          show: true
+        },
         itemStyle: {
           color: {
             type: 'linear',
diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html
index 45c5db3..1b0a396 100644
--- a/src/app/system-management/user/adduser/adduser.component.html
+++ b/src/app/system-management/user/adduser/adduser.component.html
@@ -35,7 +35,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="角色">角色</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="角色">角色</nz-form-label>
       <nz-form-control>
         <nz-select formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
           <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName">
diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts
index ba82e66..82ba289 100644
--- a/src/app/system-management/user/adduser/adduser.component.ts
+++ b/src/app/system-management/user/adduser/adduser.component.ts
@@ -20,8 +20,8 @@ export class AdduserComponent implements OnInit {
       account: [null, [Validators.required]],
       name: [null, [Validators.required]],
       organization: [null, [Validators.required]],
-      role: [null],
-      role2: [null],
+      role: [[], [Validators.required]],
+      role2: [[]],
       phonenum: [null, [Validators.required]]
     });
 
diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html
index a1fb0c6..0772a04 100644
--- a/src/app/system-management/user/edituser/edituser.component.html
+++ b/src/app/system-management/user/edituser/edituser.component.html
@@ -35,7 +35,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="角色">角色</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="角色">角色</nz-form-label>
       <nz-form-control>
         <nz-select formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
           <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName">
diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts
index 3af3660..dcb193b 100644
--- a/src/app/system-management/user/edituser/edituser.component.ts
+++ b/src/app/system-management/user/edituser/edituser.component.ts
@@ -33,7 +33,7 @@ export class EdituserComponent implements OnInit {
       account: [null, [Validators.required]],
       name: [null, [Validators.required]],
       organization: [null, [Validators.required]],
-      role: [roleData1],
+      role: [roleData1, [Validators.required]],
       role2: [roleData2],
       phonenum: [null, [Validators.required]]
     });
diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts
index 170a71d..5b860c9 100644
--- a/src/app/system-management/user/user.component.ts
+++ b/src/app/system-management/user/user.component.ts
@@ -115,6 +115,7 @@ export class UserComponent implements OnInit {
   }
   //获取所有组织机构
   nodes: any = []
+  organization
   async getAllOrganization() {
     let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
     let params = {
@@ -125,6 +126,7 @@ export class UserComponent implements OnInit {
       this.http.get('/api/services/app/Organization/GetAll', {
         params: params
       }).subscribe(async (data: any) => {
+        this.organization = data.result.items
         await this.getuser(data.result.items)
         resolve(data)
         this.getAllUsers()