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

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

@@ -628,6 +628,11 @@ export class CriminalRecordsAdminComponent implements OnInit {
   warningLevelsCopy: any
   warningType() {
     this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+
+      data.result = data.result.filter((item) => {
+        return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
+      })
+      console.log(7894,data.result)
       this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
       this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
       this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });

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

@@ -131,7 +131,7 @@
 
         .centerContent {
           position: absolute;
-          top: 34%;
+          top: 40%;
           left: 50%;
           transform: translateX(-50%);
           width: 170px;

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

@@ -156,40 +156,40 @@ export class WarningStatisticsListComponent implements OnInit {
   echartsData: any
   //一级饼图
   oilchartpieOption = {
-    color: ['#FF4B65', '#36A2FF'],
+    color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'],
     tooltip: {
       trigger: 'item'//触发类型
     },
-    legend: {
+    // legend: {
-      bottom: '12%',
+    //   bottom: '12%',
-      left: 'center',
+    //   left: 'center',
-      itemGap: 40,
+    //   itemGap: 40,
-      itemWidth: 8,
+    //   itemWidth: 8,
-      itemHeight: 8,
+    //   itemHeight: 8,
-      formatter: (name) => {
+    //   formatter: (name) => {
-        let data = this.oilchartpieOptionPieData1
+    //     let data = this.oilchartpieOptionPieData1
-        let value
+    //     let value
-        for (var i = 0, l = data.length; i < l; i++) {
+    //     for (var i = 0, l = data.length; i < l; i++) {
-          if (data[i].name == name) {
+    //       if (data[i].name == name) {
-            value = data[i].value;
+    //         value = data[i].value;
-          }
+    //       }
-        }
+    //     }
-        return '{a|' + name + '}' + '{b|' + value + '}';
+    //     return '{a|' + name + '}' + '{b|' + value + '}';
-      },
+    //   },
-      textStyle: {
+    //   textStyle: {
-        color: '#fff',
+    //     color: '#fff',
-        rich: {
+    //     rich: {
-          a: {
+    //       a: {
-            width: 80
+    //         width: 80
-          }
+    //       }
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
     series: [
       {
         type: 'pie',
         radius: ['50%', '60%'],
-        bottom: '10%',
+        // bottom: '10%',
         avoidLabelOverlap: false,//防止标签重叠策略
         label: {//每一个标签外网延伸的引导说明
           show: false,
@@ -310,185 +310,8 @@ export class WarningStatisticsListComponent implements OnInit {
     }
   };
 
-  //二级饼图
-  oilchartpieOption2 = {
-    color: ['#36A2FF', '#FFBD4B', '#46DFFF'],
-    tooltip: {
-      trigger: 'item'//触发类型
-    },
-    legend: {
-      bottom: '8%',
-      left: 'center',
-      itemGap: 10,
-      itemWidth: 8,
-      itemHeight: 8,
-      formatter: (name) => {
-        let data = this.oilchartpieOptionPieData2
-        let value
-        for (var i = 0, l = data.length; i < l; i++) {
-          if (data[i].name == name) {
-            value = data[i].value;
-          }
-        }
-        return '{a|' + name + '}' + '{b|' + value + '}';
-      },
-      textStyle: {
-        color: '#fff',
-        rich: {
-          a: {
-            width: 60
-          }
-        }
-      }
-    },
-    series: [
-      {
-        type: 'pie',
-        radius: ['50%', '60%'],
-        bottom: '10%',
-        avoidLabelOverlap: false,//防止标签重叠策略
-        label: {//每二个标签外网延伸的引导说明
-          show: false,
-          position: 'outside'
-        },
-        data: [],
-        tooltip: {//鼠标移入提示
-          position: 'right',
-          padding: [14, 19],
-          backgroundColor: 'rgba(28, 129, 218, 0.4)',
-          textStyle: {
-            color: '#fff',
-            fontSize: 12
-          }
-        }
-      }
-    ]
-  };
-  oilchartpieOptionPieData2: any
-  //二级柱状图
-  oilchartbarOption2 = {
-    tooltip: {
-      // trigger: 'axis'
-    },
-    xAxis: {
-      type: 'category',
-      data: [],
-      axisLine: {
-        show: false,
-        lineStyle: {
-          color: '#91CCFF'
-        }
-      },
-      axisTick: {//刻度线
-        show: false
-      },
-      inverse: true
 
-    },
+
-    yAxis: {
-      type: 'value',
-      nameTextStyle: {
-        color: '#C4E2FC'
-      },
-      splitLine: {//分割线
-        lineStyle: {
-          color: ['#0f4374'],
-          width: 2
-        }
-      },
-      axisTick: {//刻度线
-        show: false
-      },
-      axisLine: {//轴线
-        show: false,
-        lineStyle: {
-          color: '#C4E2FC'
-        }
-      }
-    },
-    legend: {
-      selectedMode: false, // 是否允许点击
-      data: ['事前准备', '事中操作', '全程监测'],
-      textStyle: {
-        color: '#fff'
-      },
-      right: 18,
-      top: 18,
-      itemWidth: 8,
-      itemHeight: 8,
-    },
-    series: [
-      {
-        name: '',
-        data: [],
-        type: 'bar',
-        itemStyle: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [{
-              offset: 0, color: 'rgba(54, 162, 255, 1)' // 0% 处的颜色
-            }, {
-              offset: 1, color: 'rgba(54, 162, 255, 0.1)' // 100% 处的颜色
-            }],
-            global: false // 缺省为 false
-          }
-        },
-        barWidth: '25%'
-      },
-      {
-        name: '',
-        data: [],
-        type: 'bar',
-        itemStyle: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [{
-              offset: 0, color: 'rgba(255, 189, 75, 1)' // 0% 处的颜色
-            }, {
-              offset: 1, color: 'rgba(255, 189, 75, 0.1)' // 100% 处的颜色
-            }],
-            global: false // 缺省为 false
-          }
-        },
-        barWidth: '25%'
-      },
-      {
-        name: '',
-        data: [],
-        type: 'bar',
-        itemStyle: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [{
-              offset: 0, color: 'rgba(70, 223, 255, 1)' // 0% 处的颜色
-            }, {
-              offset: 1, color: 'rgba(70, 223, 255, 0.1)' // 100% 处的颜色
-            }],
-            global: false // 缺省为 false
-          }
-        },
-        barWidth: '25%'
-      }
-    ],
-    grid: {
-      left: '42px',
-      right: '30px',
-      bottom: '38px',
-      top: '80px'
-    }
-  };
   isgoback: boolean = false
   //获取统计信息
   chartsSpin: boolean = false
@@ -582,20 +405,15 @@ export class WarningStatisticsListComponent implements OnInit {
       });
       this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
         console.log('预警事件', data.result)
-        let option1
+
-        let option2
         data.result.forEach(element => {
-          if (element.violationType == '证照资质') {
+          if (element.violationType == '设备监测' || element.violationType == '证照资质') {
-            option1 = element.id
+            this.eventSystemNameOption.push(
-          }
+              { id: element.id, name: element.eventSystemName }
-          if (element.violationType == '设备监测') {
+            )
-            option2 = element.id
           }
         });
-        this.eventSystemNameOption = [
+
-          { id: option1, name: '证照预警' },
-          { id: option2, name: '消防设施预警' },
-        ]
         this.list = []
         this.SkipCount = '0'
         this.getLicenseList()
@@ -635,7 +453,6 @@ export class WarningStatisticsListComponent implements OnInit {
         ViolationIds.push(element.id)
       });
     }
-    console.log('xxx', this.validateForm.value.licenseType)
     let params = {
       ViolationIds: ViolationIds,
       organizationUnitId: organizationUnitId,

src/app/pages/today-warning-admin/today-warning-admin.component.html

@@ -153,13 +153,13 @@
           <img src="../../../assets/images/warning2.png">
         </span>
         <span
-          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证件临期' && item.violation.violationType != '器材临期' ">
+          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
           <img src=" ../../../assets/images/warning1.png">
         </span>
-        <span *ngIf="item.violation.violationType === '证件临期'">
+        <span *ngIf="item.violation.violationType === '证照资质'">
           <img src="../../../assets/images/warning3.png">
         </span>
-        <span *ngIf="item.violation.violationType === '器材临期'">
+        <span *ngIf="item.violation.violationType === '设备监测'">
           <img src="../../../assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">

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

@@ -49,13 +49,14 @@
                 <div class="btn">
                     <span *ngIf="!data.handleTime && isMisinformation"
                         style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span>
-                    <span *ngIf="!data.handleTime" style="color: #36A2FF;cursor: pointer;" (click)="submit()">提交</span>
+                    <span *ngIf="!data.handleTime && isOilStationUser" style="color: #36A2FF;cursor: pointer;"
+                        (click)="submit()">提交</span>
                     <span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span>
                 </div>
             </ng-template>
         </div>
         <div class="disposeContent">
-            <textarea *ngIf="!data.handleTime" [(ngModel)]="content"></textarea>
+            <textarea *ngIf="!data.handleTime && isOilStationUser" [(ngModel)]="content"></textarea>
             <span *ngIf="data.handleTime">{{content}}</span>
         </div>
         <div class="disposeTime" *ngIf="data.handleTime">

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

@@ -28,6 +28,9 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   fileUrl
 
   isLicenseWarning = false
+
+
+  isOilStationUser
   ngOnInit(): void {
 
     if (this.data.violation.violationType == '证照资质') {
@@ -63,8 +66,10 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
+      this.isOilStationUser = true
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
+      this.isOilStationUser = false
     }
 
     if (loginUserInfo.roles.find((item) => {

src/app/pages/today-warning/today-warning.component.html

@@ -125,13 +125,13 @@
           <img src="../../../assets/images/warning2.png">
         </span>
         <span
-          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证件临期' && item.violation.violationType != '器材临期' ">
+          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
           <img src=" ../../../assets/images/warning1.png">
         </span>
-        <span *ngIf="item.violation.violationType === '证件临期'">
+        <span *ngIf="item.violation.violationType === '证照资质'">
           <img src="../../../assets/images/warning3.png">
         </span>
-        <span *ngIf="item.violation.violationType === '器材临期'">
+        <span *ngIf="item.violation.violationType === '设备监测'">
           <img src="../../../assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">

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

@@ -22,7 +22,7 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label>
       <nz-form-control>
-          <nz-tree-select [nzCheckStrictly]="true"  #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
+          <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [nzCheckStrictly]="true"  #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
               [nzExpandedIcon]="multiExpandedIconTpl">
           </nz-tree-select>
       </nz-form-control>

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

@@ -19,7 +19,7 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label>
       <nz-form-control>
-          <nz-tree-select [nzCheckStrictly]="true"  #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
+          <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [nzCheckStrictly]="true"  #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
               [nzExpandedIcon]="multiExpandedIconTpl">
           </nz-tree-select>
       </nz-form-control>