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

src/app/babylon/controller/serve-manager.ts

@@ -235,6 +235,7 @@ export class ServeManager {
     //#region 导出excel的信息
 
     saveGasStationExcelData(exportData: ExportData) {
+        // console.log("保存导出信息：", exportData);
         this.buildingBISrv.postGasStationExcelData(DataManager.institutionData_simple.name, DataManager.institutionData_simple.id, exportData)
             .subscribe(data => {
                 // console.log("保存导出信息成功：" + DataManager.institutionData_simple.id, `'${JSON.stringify(exportData)}'`);

src/app/pages/plan/plan.component.ts

@@ -73,6 +73,13 @@ export class PlanComponent implements OnInit {
     this.game.init(this.canvas);
     this.companyData = (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization || {}
     let editMode = sessionStorage.getItem('isGasStation')
+    let userdata = JSON.parse(sessionStorage.getItem('userdata'))
+    if (userdata.userName == 'superadmin') { //是superadmin，是内部制作账号
+      editMode = "false"; //客户要求，关闭所有三维编辑权，只留下超级管理员可编辑 2022年7月21日
+    } else {
+      editMode = "true";
+    }
+
     if (editMode == 'false') {
       this.editMode = true
       ModeManager.currentMode = ModeType.Edit
@@ -157,7 +164,7 @@ export class PlanComponent implements OnInit {
   ngOnDestroy(): void { //组件销毁前 销毁canvas
     if (this.selectFence === 8) { //初始化 应急预案模块
       this.initializePlan()
-    } 
+    }
     this.game.pauseRender();
     this.game = null;
   }
@@ -265,8 +272,8 @@ export class PlanComponent implements OnInit {
   //监听inputValue change事件
   changeTankFarmValue() {
     if (this.isShowChildComponent && this.leftDomain) {
-      this.leftDomain.FacilityList.forEach(item=>{
+      this.leftDomain.FacilityList.forEach(item => {
-        item.getPropertyData().tankFarm != undefined? item.getPropertyData().tankFarm = this.tankFarm.content : null;
+        item.getPropertyData().tankFarm != undefined ? item.getPropertyData().tankFarm = this.tankFarm.content : null;
       })
     }
   }
@@ -496,7 +503,7 @@ export class PlanComponent implements OnInit {
       let institutionKey = `${this.companyData.id}` || "ceshi"; //单位id
       let buildingKey = this.buildingUIItems.find(item => { return item.getBuildingID() == this.beforeOneBuildingID })
       let facility = this.beforeOnePropertyData
-      let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey? buildingKey.getBuildingID() : "building", facility.getType(), facility.getID(), null)
+      let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey ? buildingKey.getBuildingID() : "building", facility.getType(), facility.getID(), null)
       ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传
         this.beforeOnePropertyData.getPropertyData().img = ObjectsService.getFullPath(path + name)
         if (!this.beforeOnePropertyData.getPropertyData().is360) {

src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -427,6 +427,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
         name: '',
         data: [],
         type: 'bar',
+        label: {
+          show: true
+        },
         itemStyle: {
           color: {
             type: 'linear',
@@ -448,6 +451,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
         name: '',
         data: [],
         type: 'bar',
+        label: {
+          show: true
+        },
         itemStyle: {
           color: {
             type: 'linear',

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">

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],
+      role: [[], [Validators.required]],
-      role2: [null],
+      role2: [[]],
       phonenum: [null, [Validators.required]]
     });
 

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">

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]]
     });

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()
@@ -249,6 +251,14 @@ export class UserComponent implements OnInit {
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
+
+            for (let index = 0; index < instance.validateForm.value.role2.length; index++) {
+              const element = instance.validateForm.value.role2[index];
+              if (element.indexOf('HANDLE') != -1) {
+                instance.validateForm.value.role2.splice(index, 1)
+                index--
+              }
+            }
             let roleNames = [...instance.validateForm.value.role, ...instance.validateForm.value.role2]
             let body = {
               id: data.id,