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

src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts

@@ -27,7 +27,7 @@ export class AuditInformTimeComponent implements OnInit {
     this.tableScrollHeight = '0px'
     this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
       let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px'
+      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
     });
 
     this.getTimeList()
@@ -59,7 +59,7 @@ export class AuditInformTimeComponent implements OnInit {
 
         setTimeout(() => {
           let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-          this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px'
+          this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
         }, 0);
         resolve(data)
       })

src/app/pages/audit/audit-ing/audit-ing.component.ts

@@ -27,7 +27,7 @@ export class AuditIngComponent implements OnInit {
     // 页面监听
     this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
       let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
+      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
     });
     this.getStationList()
   }
@@ -70,7 +70,7 @@ export class AuditIngComponent implements OnInit {
       this.tableSpin = false
       setTimeout(() => {
         let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-        this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
+        this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
       }, 0);
 
       console.log(this.list)

src/app/pages/audit/audit-record/audit-record.component.scss

@@ -1,6 +1,8 @@
 .box {
   width: 100%;
   height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 
 .search {
@@ -57,7 +59,7 @@
 
 .tablebox {
   width: 100%;
-  height: 100%;
+  flex: 1;
 
   .operation {
     span {

src/app/pages/audit/audit-record/audit-record.component.ts

@@ -30,7 +30,7 @@ export class AuditRecordComponent implements OnInit {
     // 页面监听
     this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
       let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
+      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
     });
     this.validateForm = this.fb.group({
       type: [null],
@@ -203,7 +203,7 @@ export class AuditRecordComponent implements OnInit {
       console.log('审核历史纪录', this.list)
       setTimeout(() => {
         let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-        this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
+        this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
       }, 0);
     })
   }

src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts

@@ -75,6 +75,7 @@ export class OilStationListComponent implements OnInit {
 
 
   look(item) {
+    console.log(item)
     let gastionobj = {
       organization: {
         displayName: item.stationName,
@@ -88,32 +89,29 @@ export class OilStationListComponent implements OnInit {
       name: 'oilstation'
     }
     this.navChangeService.sendMessage(obj);//发布一条消息
+    if (!item.hasBuildingInfo) {
+      this.modal.create({
+        nzContent: GasBaseInfoComponent,
+        nzViewContainerRef: this.viewContainerRef,
+        nzWidth: 700,
+        nzBodyStyle: {
+          'border': '1px solid #91CCFF',
+          'border-radius': '0px',
+          'padding': '7px',
+          'box-shadow': '0 0 8px 0 #fff',
+          'background-image': 'linear-gradient(#003665, #000f25)'
+        },
+        nzStyle: {
+          'top': '50px',
+        },
+        nzComponentParams: {
+          data: { organizationId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
+        },
+        nzFooter: null,
+        nzClosable: false,
+      });
+    }
 
-    let params = { organizationUnitId: item.organizationUnitId }
-    this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any) => {
-      if (!data.result.hasBuildingInfo) {
-        this.modal.create({
-          nzContent: GasBaseInfoComponent,
-          nzViewContainerRef: this.viewContainerRef,
-          nzWidth: 700,
-          nzBodyStyle: {
-            'border': '1px solid #91CCFF',
-            'border-radius': '0px',
-            'padding': '7px',
-            'box-shadow': '0 0 8px 0 #fff',
-            'background-image': 'linear-gradient(#003665, #000f25)'
-          },
-          nzStyle: {
-            'top': '50px',
-          },
-          nzComponentParams: {
-            data: { organizationId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
-          },
-          nzFooter: null,
-          nzClosable: false,
-        });
-      }
-    })
   }
 
   tableSpin: boolean

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

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="名称">名称</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input nz-input type="text" formControlName="name" placeholder="请输入名称" />

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

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="名称">名称</nz-form-label>
       <nz-form-control nzErrorTip="请输入名称">
         <nz-input-group>
           <input [(ngModel)]="datacopy.displayName" nz-input type="text" formControlName="name" placeholder="请输入名称" />

src/app/system-management/push/edit-push-item/edit-push-item.component.html

@@ -1,6 +1,7 @@
 <div class="box">
     <form nz-form [formGroup]="validateForm">
         <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="推送范围">推送范围</nz-form-label>
             <nz-form-control>
                 <nz-select [(ngModel)]="multiplePushValue" formControlName="push" nzPlaceHolder="请选择推送范围"
                     nzMode="multiple">
@@ -9,6 +10,7 @@
             </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="处置范围">处置范围</nz-form-label>
             <nz-form-control>
                 <nz-select [(ngModel)]="multipleHandleValue" formControlName="handle" nzPlaceHolder="请选择处置范围"
                     nzMode="multiple">

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

@@ -108,7 +108,7 @@ export class PushComponent implements OnInit {
       nzTitle: '编辑推送设置',
       nzContent: EditPushItemComponent,
       nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 300,
+      nzWidth: 400,
       nzComponentParams: {
         data: item,
         pushRoleIds: this.pushRoleIds,

src/app/system-management/role/addrole/addrole.component.html

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="名称">名称</nz-form-label>
       <nz-form-control nzErrorTip="请输入名称">
         <nz-input-group>
           <input nz-input type="text" formControlName="name" placeholder="请输入名称" />
@@ -8,6 +9,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="权限">权限</nz-form-label>
       <nz-form-control>
         <nz-select formControlName="power" nzPlaceHolder="请选择权限" nzMode="multiple">
           <nz-option *ngFor="let o of optionList" [nzValue]="o" [nzLabel]="o.displayName"></nz-option>
@@ -18,4 +20,4 @@
       </nz-form-control>
     </nz-form-item>
   </form>
-</div>
+</div>

src/app/system-management/role/editrole/editrole.component.html

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="名称">名称</nz-form-label>
       <nz-form-control nzErrorTip="请输入名称">
         <nz-input-group>
           <input [(ngModel)]="data.name" nz-input type="text" formControlName="name" placeholder="请输入名称" />
@@ -8,6 +9,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="权限">权限</nz-form-label>
       <nz-form-control>
         <nz-select [(ngModel)]="multipleValue" formControlName="power" nzPlaceHolder="请选择权限" nzMode="multiple">
           <nz-option *ngFor="let o of optionList" [nzValue]="o.name" [nzLabel]="o.displayName"></nz-option>

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

@@ -43,8 +43,9 @@ export class RoleComponent implements OnInit {
       nzTitle: '新增角色',
       nzContent: AddroleComponent,
       nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 288,
+      nzWidth: 400,
       nzComponentParams: {},
+      nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
@@ -91,12 +92,13 @@ export class RoleComponent implements OnInit {
       nzTitle: '编辑角色',
       nzContent: EditroleComponent,
       nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 325,
+      nzWidth: 400,
       // nzOkLoading: true,
       nzComponentParams: {
         data: item,
         optionList: this.optionList
       },
+      nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           await new Promise(resolve => {

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

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="账号">账号</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input nz-input type="text" formControlName="account" placeholder="请输入账号" />
@@ -8,6 +9,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="姓名">姓名</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input nz-input type="text" formControlName="name" placeholder="请输入姓名" />
@@ -15,9 +17,11 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="所属机构">所属机构</nz-form-label>
       <nz-form-control>
-        <nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes"
-          nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl">
+        <nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'"
+          formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
+          [nzExpandedIcon]="multiExpandedIconTpl">
         </nz-tree-select>
         <ng-template #multiExpandedIconTpl let-node let-origin="origin">
           <ng-container *ngIf="node.children.length == 0; else elseTemplate">
@@ -31,6 +35,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <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">
@@ -39,6 +44,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="手机号">手机号</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input nz-input type="text" formControlName="phonenum" placeholder="请输入手机号" />

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

@@ -1,6 +1,7 @@
 <div class="box">
   <form nz-form [formGroup]="validateForm">
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="账号">账号</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input [(ngModel)]="data.userName" nz-input type="text" formControlName="account" placeholder="请输入账号" />
@@ -8,6 +9,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="姓名">姓名</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input [(ngModel)]="data.name" nz-input type="text" formControlName="name" placeholder="请输入姓名" />
@@ -15,9 +17,10 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="所属机构">所属机构</nz-form-label>
       <nz-form-control>
-        <nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId"
-          formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
+        <nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'"
+          [(ngModel)]="data.organizationUnitId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
           [nzExpandedIcon]="multiExpandedIconTpl">
         </nz-tree-select>
         <ng-template #multiExpandedIconTpl let-node let-origin="origin">
@@ -32,6 +35,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="角色">角色</nz-form-label>
       <nz-form-control>
         <nz-select [(ngModel)]="data.roleNames" formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
           <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName">
@@ -40,6 +44,7 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="手机号">手机号</nz-form-label>
       <nz-form-control>
         <nz-input-group>
           <input [(ngModel)]="data.phoneNumber" nz-input type="text" formControlName="phonenum" placeholder="请输入手机号" />

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

@@ -106,7 +106,7 @@ export class UserComponent implements OnInit {
       nzTitle: '新增用户',
       nzContent: AdduserComponent,
       nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 360,
+      nzWidth: 450,
       nzMaskClosable: false,
       nzComponentParams: {
         title: '',
@@ -156,7 +156,7 @@ export class UserComponent implements OnInit {
       nzTitle: '编辑用户',
       nzContent: EdituserComponent,
       nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 360,
+      nzWidth: 450,
       nzMaskClosable: false,
       // nzOkLoading: true,
       nzComponentParams: {