Browse Source

[新增]admin用户显示处置按钮

beijing
邵佳豪 3 years ago
parent
commit
2521cb4904
  1. 4
      src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
  2. 13
      src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
  3. 4
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
  4. 16
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

4
src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html

@ -82,10 +82,10 @@
</nz-form-control>
</nz-form-item>
</div>
<div *ngIf="!data2.handleTime &&!isOilStationUser" style="height: 30px;">
<div *ngIf="!data2.handleTime &&!isSubmit" style="height: 30px;">
</div>
<div class="btnbox" *ngIf="!data2.handleTime && isOilStationUser">
<div class="btnbox" *ngIf="!data2.handleTime && isSubmit">
<button nz-button type="submit" class="ok" (click)="ok()">确定</button>
<button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
</div>

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

@ -21,7 +21,7 @@ export class DisposeequipmentComponent implements OnInit {
isScraped
newdata
isOilStationUser
isSubmit
ngOnInit(): void {
this.data2 = JSON.parse(JSON.stringify(this.data))
this.copydata2 = JSON.parse(JSON.stringify(this.data))
@ -57,11 +57,16 @@ export class DisposeequipmentComponent implements OnInit {
maintenanceDate: [null, [Validators.required]],
validityEndTime: [null, [Validators.required]]
});
let loginUserInfo
if (sessionStorage.getItem('isGasStation') == 'true') {
this.isOilStationUser = true
loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
} else {
loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
}
if (sessionStorage.getItem('isGasStation') == 'true' || loginUserInfo.userName == 'admin') {
this.isSubmit = true
} else {
this.isOilStationUser = false
this.isSubmit = false
}
}

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

@ -48,14 +48,14 @@
<div class="btn">
<span *ngIf="!data.handleTime && isMisinformation"
style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span>
<span *ngIf="!data.handleTime && isOilStationUser" style="color: #36A2FF;cursor: pointer;"
<span *ngIf="!data.handleTime && isSubmit" 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 && isOilStationUser" [(ngModel)]="content"></textarea>
<textarea *ngIf="!data.handleTime && isSubmit" [(ngModel)]="content"></textarea>
<span *ngIf="data.handleTime">{{content}}</span>
</div>
<div class="disposeTime" *ngIf="data.handleTime">

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

@ -2,6 +2,7 @@ import { HttpClient } from '@angular/common/http';
import { Component, OnInit, Input } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DomSanitizer } from '@angular/platform-browser';
import { Console } from 'console';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
@Component({
@ -30,7 +31,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
isLicenseWarning = false
isOilStationUser
isSubmit
ngOnInit(): void {
if (this.data.violation.violationType == '证照资质') {
@ -64,15 +65,22 @@ 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.userName == 'admin' || sessionStorage.getItem('isGasStation') == 'true') {
this.isSubmit = true
} else {
this.isSubmit = false
}
console.log('this.isSubmit', this.isSubmit)
if (loginUserInfo.permissions.find((item) => {
return item.name == 'Data.Violation.Positive.Censor'
}) && this.data.violation.eventSystemName.indexOf("证照有效期") ==-1) {
}) && this.data.violation.eventSystemName.indexOf("证照有效期") == -1) {
this.isMisinformation = true
} else {
this.isMisinformation = false

Loading…
Cancel
Save