[完善]完善油站信息提交审核

src/app/pages/oil-station-info/oil-station-info.component.html

@@ -425,9 +425,11 @@
           </table> -->
         </div>
         <div class="btnbox">
-          <span style="color: #fff;">当前审核状态：{{httpBody.auditStatus | auditStatus}}</span>
+          <!-- <span style="color: #fff;">当前审核状态：{{httpBody.auditStatus | auditStatus}}</span> -->
+          <span style="color: #fff;margin-right: 30px;">当前审核状态：{{httpBody.auditLog.auditStatusDesc}}</span>
+          <span style="color: #fff;">审核意见：{{httpBody.auditLog.rejectReason}}</span>
           <button [nzLoading]="isSubmitAuditLoading" nz-button type="button" *ngIf="httpBody.auditStatus != 1 && httpBody.auditStatus != 2" (click)="submitAudit()">提交审核</button>
-          <!-- <button [nzLoading]="isRevocationAuditLoading" nz-button type="button" *ngIf="httpBody.auditStatus == 1" (click)="revocationAudit()">撤销审核</button> -->
+          <button [nzLoading]="isRevocationAuditLoading" nz-button type="button" *ngIf="httpBody.auditStatus == 1 || httpBody.auditStatus == 2" (click)="revocationAudit()">撤销审核</button>
           <button [nzLoading]="isLoadingSave" nz-button type="button" (click)="submitForm()" *ngIf="httpBody.auditStatus != 1" >保存</button>
           <button (click)="exportExcel()" nz-button type="button"><img style="vertical-align: top;margin-right: 6px;"
               src="../../../assets/images/excel.png" alt=""> 导出Excel</button>

src/app/pages/oil-station-info/oil-station-info.component.ts

@@ -138,6 +138,10 @@ export class OilStationInfoComponent implements OnInit {
     id: null,
     stationName: JSON.parse(sessionStorage.getItem('userdata')).organization.displayName,
     organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+    auditLog: {
+      auditStatusDesc:null,
+      rejectReason:null
+    },
     auditStatus: null,
     openTime: '',
     stationType: '',

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

@@ -371,7 +371,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
     },
     legend: {
       selectedMode: false, // 是否允许点击
-      data: ['事前准备', '事中操作', '全程监测'],
+      data: ['事前准备', '事中操作'],
       textStyle: {
         color: '#fff'
       },
@@ -423,27 +423,27 @@ export class OilUnloadingProcessListComponent implements OnInit {
         },
         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%'
-      }
+      // {
+      //   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',
@@ -509,12 +509,12 @@ export class OilUnloadingProcessListComponent implements OnInit {
     this.mybarChart.setOption(this.oilchartbarOption);
   }
   refreshEchartsData2(data) {
-    this.num = Number(data.proccessBeforeCount + data.proccessingCount + data.allProccessCount)
+    this.num = Number(data.proccessBeforeCount + data.proccessingCount)
     //饼图
     this.oilchartpieOptionPieData2 = [
       { name: '事前准备', value: data.proccessBeforeCount },
       { name: '事中操作', value: data.proccessingCount },
-      { name: '全程检测', value: data.allProccessCount }
+      // { name: '全程检测', value: data.allProccessCount }
     ]
     this.oilchartpieOption2.series[0].data = this.oilchartpieOptionPieData2
     this.myChart.setOption(this.oilchartpieOption2);
@@ -528,15 +528,15 @@ export class OilUnloadingProcessListComponent implements OnInit {
       monthArr.push(moment(element.key).format('MM.DD'))
       valuedataBefore.push(element.proccessBeforeCount)
       valuedataIng.push(element.proccessingCount)
-      valuedataAll.push(element.allProccessCount)
+      // valuedataAll.push(element.allProccessCount)
     });
     this.oilchartbarOption2.xAxis.data = monthArr
     this.oilchartbarOption2.series[0].name = '事前准备'
     this.oilchartbarOption2.series[0].data = valuedataBefore
     this.oilchartbarOption2.series[1].name = '事中操作'
     this.oilchartbarOption2.series[1].data = valuedataIng
-    this.oilchartbarOption2.series[2].name = '全程监测'
-    this.oilchartbarOption2.series[2].data = valuedataAll
+    // this.oilchartbarOption2.series[2].name = '全程监测'
+    // this.oilchartbarOption2.series[2].data = valuedataAll
     this.mybarChart.setOption(this.oilchartbarOption2);
   }
   goback() {

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

@@ -60,7 +60,7 @@
         </div>
         <div class="disposeTime" *ngIf="data.handleTime">
             <span style="margin-right: 12px;">
-                处置人：{{data.handleUsername}}
+                处置人：{{data.handleUserName}}
             </span>
             <span>
                 处置时间：{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}}

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

@@ -27,7 +27,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   isImage = true//传过来的文件是否是图片
   fileUrl
   ngOnInit(): void {
-    // console.log(this.data)
+    console.log(this.data)
     this.details = this.data.content1
     this.vedioUrl = this.data.violateVideo
     this.content = this.data.handleRecord