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

src/app/pages/home-page/home-page.component.html

@@ -190,7 +190,11 @@
                         <img src="../../../assets/images/modelNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
+<<<<<<< HEAD
+                            <span>预警分析模型（个）</span>
+=======
                             <span>预警分析模型(个)</span>
+>>>>>>> 5d6008ac406e0fecb3c5dca4e0b3eceef5bc4fac
                         </div>
                     </div>
                     <div class="numlistbox">

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html

@@ -148,7 +148,7 @@
         </nz-form-item>
         <nz-form-item class="btn">
           <nz-form-control>
-            <button nz-button type="button" class="reset" (click)="exportExcel()"><i nz-icon
+            <button nz-button type="button" *ngIf="button" class="reset" (click)="exportExcel()"><i nz-icon
                 [nzType]="'file'"></i>导出</button>
           </nz-form-control>
         </nz-form-item>

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts

@@ -287,7 +287,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
 
   startdate
   enddate
-
+  button=false
   isMisinformation: boolean = false//误报按钮的显隐
 
   tableScrollHeight
@@ -311,8 +311,10 @@ export class CriminalRecordsAdminComponent implements OnInit {
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
+      this.returnLastMenus(true)
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
+      this.returnLastMenus(false)
     }
 
     if (loginUserInfo.permissions.find((item) => {
@@ -888,7 +890,27 @@ export class CriminalRecordsAdminComponent implements OnInit {
     });
     const instance = modal.getContentComponent();
   }
-
+  returnLastMenus(e) {
+    if(e){
+      let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
+    
+    for (let index = 0; index < userMenu.length; index++) {
+      if (userMenu[index].parentId == 5) {
+        this.button = true
+      }
+    }
+    }else{
+      let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus
+      console.log(userMenu,900);
+      
+    for (let index = 0; index < userMenu.length; index++) {
+      if (userMenu[index].parentId == 5) {
+        this.button = true
+      }
+    }
+    }
+    return
+  }
   exportExcel() {
     let ViolationIds = []
     if (this.validateForm.value.event) {

src/app/pages/records/criminal-records/criminal-records.component.ts

@@ -322,10 +322,10 @@ export class CriminalRecordsComponent implements OnInit {
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
-      this.returnLastMenus()
+      this.returnLastMenus(true)
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
-
+      this.returnLastMenus(false)
     }
 
     if (loginUserInfo.permissions.find((item) => {
@@ -372,14 +372,25 @@ export class CriminalRecordsComponent implements OnInit {
   ngOnDestroy(): void {
     this.resizeListener.unsubscribe()
   }
-  returnLastMenus() {
-    let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
-
+  returnLastMenus(e) {
+    if(e){
+      let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
+    
+    for (let index = 0; index < userMenu.length; index++) {
+      if (userMenu[index].parentId == 5) {
+        this.button = true
+      }
+    }
+    }else{
+      let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus
+      console.log(userMenu,900);
+      
     for (let index = 0; index < userMenu.length; index++) {
       if (userMenu[index].parentId == 5) {
         this.button = true
       }
     }
+    }
     return
   }
   //刷新饼图图表数据

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

@@ -88,9 +88,10 @@ export class OilUnloadingProcessListComponent implements OnInit {
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
-      this.returnLastMenus()
+      this.returnLastMenus(true)
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
+      this.returnLastMenus(false)
     }
 
     if (loginUserInfo.roles.find((item) => {
@@ -133,15 +134,28 @@ export class OilUnloadingProcessListComponent implements OnInit {
   ngOnDestroy(): void {
     this.resizeListener.unsubscribe()
   }
-  returnLastMenus() {
-    let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
-    
-    for (let index = 0; index < userMenu.length; index++) {
-      if (userMenu[index].parentId==6) {
-        this.button=true
+  returnLastMenus(e) {
+    if(e){
+      let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
+      for (let index = 0; index < userMenu.length; index++) {
+        if (userMenu[index].parentId==6) {
+          this.button=true
+        }
+      }
+    }else{
+      let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus
+      console.log(userMenu);
+      
+      for (let index = 0; index < userMenu.length; index++) {
+        if (userMenu[index].parentId==6) {
+          this.button=true
+          
+        }
       }
+      
+      
     }
-    return
+
   }
   //刷新饼图图表数据
   num
@@ -486,8 +500,8 @@ export class OilUnloadingProcessListComponent implements OnInit {
     this.num = data.totalCount
     //饼图
     this.oilchartpieOptionPieData1 = [
-      { name: '预警事件', value: data.notCorrectCount },
-      { name: '正常操作', value: data.correctCount },
+      { name: '预警车次', value: data.notCorrectCount },
+      { name: '合规车次', value: data.correctCount },
     ]
     this.oilchartpieOption.series[0].data = this.oilchartpieOptionPieData1
     this.myChart.setOption(this.oilchartpieOption);
@@ -497,7 +511,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
       this.myChart.setOption({
         legend: { selected: { [params.name]: true } }
       })
-      if (params.name == '预警事件') {
+      if (params.name == '预警车次') {
         this.isgoback = true
         this.refreshEchartsData2(this.echartsData)
         this.validateForm.patchValue({
@@ -509,7 +523,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
       }
     });
     this.myChart.on('click', (params) => {
-      if (params.name == '预警事件') {
+      if (params.name == '预警车次') {
         this.isgoback = true
         this.refreshEchartsData2(this.echartsData)
         this.validateForm.patchValue({

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@@ -52,10 +52,10 @@ export class WarningStatisticsListComponent implements OnInit {
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
-      this.returnLastMenus()
+      this.returnLastMenus(true)
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
-      this.button = false
+      this.returnLastMenus(false)
     }
 
     if (loginUserInfo.roles.find((item) => {
@@ -101,14 +101,24 @@ export class WarningStatisticsListComponent implements OnInit {
   ngOnDestroy(): void {
     this.resizeListener.unsubscribe()
   }
-  returnLastMenus() {
-    let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
+  returnLastMenus(e) {
+    if(e){
+      let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
 
     for (let index = 0; index < userMenu.length; index++) {
       if (userMenu[index].parentId == 7) {
         this.button = true
       }
     }
+    }else{
+      let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus
+
+    for (let index = 0; index < userMenu.length; index++) {
+      if (userMenu[index].parentId == 7) {
+        this.button = true
+      }
+    }
+    }
     return
   }
   listOfData//证照列表

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@@ -72,7 +72,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
 
     if (loginUserInfo.permissions.find((item) => {
       return item.name == 'Data.Violation.Positive.Censor'
-    }) && this.data.violation.violationType != '证照资质') {
+    }) && this.data.violation.eventSystemName.indexOf("证照有效期") ==-1) {
       this.isMisinformation = true
     } else {
       this.isMisinformation = false

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

@@ -8,10 +8,13 @@
         <nz-input-group nzPrefixIcon="search">
           <input type="text" nz-input placeholder="请输入机构名称" [(ngModel)]="searchValue" />
         </nz-input-group>
+        
       </div>
     </div>
+    
     <div class="treeTitle">
-      <span>组织机构</span>
+      组织机构
+      <div><label nz-checkbox [(ngModel)]="IsContainsChildren" (ngModelChange)="getAllUsers()">是否包含子节点</label></div>
     </div>
     <div class="treebox">
       <nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes" [nzExpandedKeys]="defaultExpandedKeys"

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

@@ -14,6 +14,10 @@
   overflow: auto;
   flex-direction: column;
   }
+  .check{
+    width: 100%;
+    float:right;
+  }
   .topbox2 {
     width: 100%;
     height: 36px;
@@ -60,13 +64,20 @@
     line-height: 55px;
     margin-top: 12px;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     color: #000D21;
     box-sizing: border-box;
     padding-left: 30px;
-    padding-right: 180px;
+    // padding-right: 180px;
     background: rgba(145, 204, 255, 0.2);
     border: 1px solid rgba(145, 204, 255, 0.2);
+    div{
+      flex: 1;
+      width: 100px;
+      margin-left: 55px;
+      // height: 55px;
+      // line-height: 55px;
+    }
   }
   .nodebox {
     font-size: 15px;

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

@@ -42,6 +42,7 @@ export class UserComponent implements OnInit {
   }
   nzSelectedKeys: any[] = []
   defaultExpandedKeys = [];
+  IsContainsChildren=true
   searchValue = '';
   totalCount: string
   //获取所有用户
@@ -56,7 +57,7 @@ export class UserComponent implements OnInit {
       SkipCount: String(this.SkipCount),
       MaxResultCount: String(this.MaxResultCount),
       OrganizationUnitId: this.OrganizationUnitId,
-      IsContainsChildren: "true"
+      IsContainsChildren: String(this.IsContainsChildren)
     }
     this.http.get(this.getAllUrl, {
       params: params
@@ -103,12 +104,15 @@ export class UserComponent implements OnInit {
       this.http.get('/api/services/app/Organization/GetAll', {
         params: params
       }).subscribe((data: any) => {
+        console.log(data,80801);
+        
         data.result.items.forEach(element => {
           if (element.id == OrganizationUnitId) {
             element.parentId = null
           }
           element.key = element.id
           element.title = element.displayName
+          //+"  共有"+this.usersNum+"位用户"
         });
         this.nodes = [...this.toTree.toTree(data.result.items)]
         resolve(data)