Browse Source

[完善]根据意见修改

beijing
邵佳豪 3 years ago
parent
commit
f7c5bec788
  1. 8
      src/app/http-interceptors/base-interceptor.ts
  2. 12
      src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
  3. 16
      src/app/pages/criminal-records-admin/criminal-records-admin.component.html
  4. 6
      src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
  5. 14
      src/app/pages/criminal-records/criminal-records.component.html
  6. 6
      src/app/pages/criminal-records/criminal-records.component.ts
  7. 15
      src/app/pages/home-page/home-page.component.ts
  8. 4
      src/app/pages/misinformation-list/misinformation-list.component.ts
  9. 17
      src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
  10. 2
      src/app/pages/plan-admin/file-license-list/file-license-list.component.html
  11. 24
      src/app/pages/plan-admin/update-license-list/update-license-list.component.html
  12. 7
      src/app/pages/plan-admin/update-license-list/update-license-list.component.ts
  13. 20
      src/app/pages/warning-statistics-list/warning-statistics-list.component.html
  14. 42
      src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
  15. 2
      src/app/system-management/user/adduser/adduser.component.html
  16. 2
      src/app/system-management/user/edituser/edituser.component.html
  17. 2
      src/app/system-management/user/user.component.ts
  18. BIN
      src/assets/images/packdown.png
  19. 116
      src/theme.less

8
src/app/http-interceptors/base-interceptor.ts

@ -72,7 +72,6 @@ export class BaseInterceptor implements HttpInterceptor {
// 用户认证失败返回登录页
if (error.status === 401 || error.status === 614) {
sessionStorage.clear()
// window.localStorage.clear()
localStorage.removeItem("isautologin")
this.message.create('error', `用户认证信息过期,请重新登录!`);
this.router.navigate(['/login'])
@ -84,8 +83,11 @@ export class BaseInterceptor implements HttpInterceptor {
this.message.create('error', `请核对您的输入信息或格式是否正确!`);
}
if (error.status === 500) {
// console.log('xxxx',error)
this.message.create('error', `状态500,服务器错误!${error.error.error.message}`);
if(error.error.error.message){
this.message.create('error', `${error.error.error.message}`);
}else{
this.message.create('error', `状态500`);
}
}
if (error.status === 404) {
this.message.create('error', `实体未找到!${error.error.error.message}`);

12
src/app/pages/audit/audit-inform-time/audit-inform-time.component.html

@ -10,8 +10,8 @@
<th colspan="2">办理提醒时间</th>
<th colspan="2">临期提醒时间</th>
<th colspan="2">年检设置</th>
<th rowspan="2">提交审核时间</th>
<th rowspan="2">审核状态</th>
<!-- <th rowspan="2">提交审核时间</th>
<th rowspan="2">审核状态</th> -->
<th rowspan="2">操作</th>
</tr>
<tr>
@ -34,13 +34,13 @@
<td>{{item.closingRemindDays}}天</td>
<td>{{item.isYearlyCheckDefault ? '是' : '否'}}</td>
<td>{{item.yearlyCheckDate | date:"MM/dd"}}</td>
<td>{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}</td>
<td>{{item.auditStatus | auditStatus}}</td>
<!-- <td>{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}</td>
<td>{{item.auditStatus | auditStatus}}</td> -->
<td class="operation">
<span class="blueColor" (click)="edit(item)"
[ngClass]="{'greyColor': item.auditStatus == 1}">编辑</span>
<span class="blueColor" (click)="unCommit(item)"
*ngIf="item.auditStatus == 1">撤销审核</span>
<!-- <span class="blueColor" (click)="unCommit(item)"
*ngIf="item.auditStatus == 1">撤销审核</span> -->
<span class="blueColor" (click)="details(item)">详情</span>
</td>
</tr>

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

@ -13,7 +13,12 @@
</div>
</div>
</div>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
<ng-container *ngIf="isEcharts; else elseTemplate">
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
</ng-container>
<ng-template #elseTemplate>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
</ng-template>
</div>
<div class="chartsbox" [hidden]="!isEcharts">
@ -35,7 +40,7 @@
<div class="rightbox" style="position: relative;">
<span class="chartname">
<img src="../../../assets/images/flower.png" alt="">
一个月预警统计
30天预警统计
</span>
<div class="btnbox">
<div class="btn" (click)="echartClick('分布')" [ngClass]="{'selectedbtn': selectedType == '分布'}">统计</div>
@ -121,7 +126,7 @@
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item class="searchParams">
<nz-form-control>
<nz-select nzAllowClear formControlName="disposalState" nzPlaceHolder="请选择处置状态">
@ -146,7 +151,8 @@
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon
[nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
@ -159,7 +165,7 @@
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="button" class="reset" (click)="exportExcel()"><i nz-icon
[nzType]="'file'"></i>导出文档</button>
[nzType]="'file'"></i>导出</button>
</nz-form-control>
</nz-form-item>
</form>

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

@ -437,7 +437,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
let body: any = {
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
isContainsChildren: true,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
}
this.validateForm.value.level ? body.level = this.validateForm.value.level : null
this.validateForm.value.site ? body.violateArea = this.validateForm.value.site : null
@ -483,7 +483,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
OrganizationUnitId: this.validateForm.value.organization,
IsContainsChildren: 'true',
IsHandled: disposalState,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
SkipCount: this.SkipCount,
MaxResultCount: this.MaxResultCount,
Positive: this.validateForm.value.misinformation
@ -891,7 +891,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
OrganizationUnitId: this.validateForm.value.organization,
IsContainsChildren: 'true',
IsHandled: disposalState,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
Positive: this.validateForm.value.misinformation
}
};

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

@ -13,7 +13,12 @@
</div>
</div>
</div>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
<ng-container *ngIf="isEcharts; else elseTemplate">
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
</ng-container>
<ng-template #elseTemplate>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
</ng-template>
</div>
<div class="chartsbox" [hidden]="!isEcharts">
<div class="chart">
@ -34,7 +39,7 @@
<div class="rightbox" style="position: relative;">
<span class="chartname">
<img src="../../../assets/images/flower.png" alt="">
一个月预警统计
30天预警统计
</span>
<div class="btnbox">
<!-- <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('站点排名')"
@ -121,7 +126,8 @@
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon
[nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
@ -134,7 +140,7 @@
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="button" class="reset" (click)="exportExcel()"><i nz-icon
[nzType]="'file'"></i>导出文档</button>
[nzType]="'file'"></i>导出</button>
</nz-form-control>
</nz-form-item>
</form>

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

@ -417,7 +417,7 @@ export class CriminalRecordsComponent implements OnInit {
let body: any = {
organizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id,
isContainsChildren: true,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
}
this.validateForm.value.level ? body.level = this.validateForm.value.level : null
this.validateForm.value.site ? body.violateArea = this.validateForm.value.site : null
@ -462,7 +462,7 @@ export class CriminalRecordsComponent implements OnInit {
ViolateAreas: this.validateForm.value.site,
OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id,
IsContainsChildren: 'true',
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
IsHandled: disposalState,
SkipCount: this.SkipCount,
MaxResultCount: this.MaxResultCount,
@ -797,7 +797,7 @@ export class CriminalRecordsComponent implements OnInit {
ViolateAreas: this.validateForm.value.site,
OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id,
IsContainsChildren: 'true',
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
IsHandled: disposalState,
Positive: this.validateForm.value.misinformation
}

15
src/app/pages/home-page/home-page.component.ts

@ -492,21 +492,6 @@ export class HomePageComponent implements OnInit {
this.eventEcharts(data.result)
})
// let starttime = moment(new Date()).format('YYYY-MM-DD') + '\xa0' + '00:00'
// let endtime = moment(new Date()).format('YYYY-MM-DD') + '\xa0' + '23:59'
// let params = {
// organizationUnitId: organizationUnitId,
// ViolateTime: [starttime, endtime],
// IsContainsChildren: 'true',
// SkipCount: '0',
// MaxResultCount: '1'
// }
// this.http.get('/api/services/app/ViolateRecord/GetAll', {
// params: params
// }).subscribe((data: any) => {
// this.totalCount = data.result.totalCount
// })
}
//预警图表
equipmentechartdata

4
src/app/pages/misinformation-list/misinformation-list.component.ts

@ -440,7 +440,7 @@ export class MisinformationListComponent implements OnInit {
let body: any = {
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
isContainsChildren: true,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
}
this.validateForm.value.level ? body.level = this.validateForm.value.level : null
this.validateForm.value.site ? body.violateArea = this.validateForm.value.site : null
@ -485,7 +485,7 @@ export class MisinformationListComponent implements OnInit {
OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
IsContainsChildren: 'true',
IsHandled: disposalState,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
SkipCount: this.SkipCount,
MaxResultCount: this.MaxResultCount
}

17
src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html

@ -13,7 +13,12 @@
</div>
</div>
</div>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
<ng-container *ngIf="isEcharts; else elseTemplate">
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
</ng-container>
<ng-template #elseTemplate>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
</ng-template>
</div>
<div class="chartsbox" [hidden]="!isEcharts">
@ -53,8 +58,7 @@
<form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
<nz-form-item class="searchParams">
<nz-form-control>
<nz-select nzAllowClear formControlName="state"
nzPlaceHolder="请选择状态">
<nz-select nzAllowClear formControlName="state" nzPlaceHolder="请选择状态">
<nz-option nzValue="0" nzLabel="预警"></nz-option>
<nz-option nzValue="1" nzLabel="合规"></nz-option>
</nz-select>
@ -87,14 +91,15 @@
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon
[nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
[nzType]="'sync'"></i>重置</button>
<button [nzLoading]="isLoading" nz-button type="button" class="reset"
(click)="resetForm($event)"><i nz-icon [nzType]="'sync'"></i>重置</button>
</nz-form-control>
</nz-form-item>
</form>

2
src/app/pages/plan-admin/file-license-list/file-license-list.component.html

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

24
src/app/pages/plan-admin/update-license-list/update-license-list.component.html

@ -1,4 +1,4 @@
<div class="box" id="statisticsList">
<div class="box" id="statisticsList2">
<div class="search">
<div class="legendbox">
<div class="legendItem">
@ -40,30 +40,32 @@
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon
[nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
[nzType]="'sync'"></i>重置</button>
<button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i
nz-icon [nzType]="'sync'"></i>重置</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="button" class="reset" (click)="exportExcel()"><i nz-icon
[nzType]="'file'"></i>导出文档</button>
[nzType]="'file'"></i>导出</button>
</nz-form-control>
</nz-form-item>
</form>
</div>
<div class="tablebox" id="tablebox">
<nz-table [nzLoading]="tableSpin" [nzPageSize]='999' #headerTable [nzData]="list" [nzShowPagination]="false"
[nzScroll]="{ y:tableScrollHeight }" [nzNoResult]='null' nzTableLayout="fixed">
<nz-table [nzLoading]="tableSpin" [nzPageSize]='9999' #headerTable [nzData]="list" [nzShowPagination]="false"
[nzScroll]="{ x: tableScrollWeight,y:tableScrollHeight}" [nzNoResult]='null' nzTableLayout="fixed">
<thead>
<tr>
<th style="text-align: center">序号</th>
<th *ngFor="let item of headerTable.data[0]">
<th style="text-align: center" nzLeft="0px" nzWidth="100px">序号</th>
<th *ngFor="let item of headerTable.data[0];let k = index"
[nzLeft]=" k <=2 ? (k*180 +100)+'px' : false" nzWidth="180px">
{{item.name}}
</th>
@ -71,9 +73,9 @@
</thead>
<tbody id="table">
<tr *ngFor="let item of headerTable.data;let key = index">
<td style="text-align: center">{{key + 1}}</td>
<td style="text-align: center" nzLeft="0px">{{key + 1}}</td>
<td *ngFor="let i of item">
<td *ngFor="let i of item;let k = index" [nzLeft]=" k <=2 ? (k*180 +100)+'px' : false">
<ng-container *ngIf="i.value; else elseTemplate">
<ng-container *ngIf="i.value.endDate; else elseTemplate">
<span (click)="lookDetails(i.value)" style="cursor: pointer;"

7
src/app/pages/plan-admin/update-license-list/update-license-list.component.ts

@ -23,11 +23,13 @@ export class UpdateLicenseListComponent implements OnInit {
constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router, private message: NzMessageService) { }
tableScrollHeight
tableScrollWeight
resizeListener
async ngOnInit(): Promise<void> {
this.tableScrollHeight = '100px'
this.tableScrollWeight = '100px'
// 页面监听
this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
@ -162,15 +164,12 @@ export class UpdateLicenseListComponent implements OnInit {
}
let atLastArr = newArr.concat(newElement);
arr.push(atLastArr)
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
}, 0);
});
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
this.tableScrollWeight = (this.list[0].length+1)*100 +'px'
}, 0);
this.list = this.list.concat(arr);

20
src/app/pages/warning-statistics-list/warning-statistics-list.component.html

@ -12,7 +12,12 @@
</div>
</div>
</div>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
<ng-container *ngIf="isEcharts; else elseTemplate">
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
</ng-container>
<ng-template #elseTemplate>
<img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
</ng-template>
</div>
<div class="chartsbox" [hidden]="!isEcharts">
@ -85,14 +90,21 @@
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon
[nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
[nzType]="'sync'"></i>重置</button>
<button [nzLoading]="isLoading" nz-button type="button" class="reset"
(click)="resetForm($event)"><i nz-icon [nzType]="'sync'"></i>重置</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="button" class="reset" (click)="exportExcel()"><i nz-icon
[nzType]="'file'"></i>导出</button>
</nz-form-control>
</nz-form-item>
</form>

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

@ -559,7 +559,6 @@ export class WarningStatisticsListComponent implements OnInit {
}
let ViolationIds = []
// console.log(456, this.validateForm.value)
if (this.validateForm.value.eventSystemName) {
ViolationIds.push(this.validateForm.value.eventSystemName)
} else {
@ -570,7 +569,7 @@ export class WarningStatisticsListComponent implements OnInit {
let params = {
ViolationIds: ViolationIds,
organizationUnitId: organizationUnitId,
ViolateTime: (this.validateForm.value.datePicker[0] && this.validateForm.value.datePicker[1]) ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD HH:mm:ss')] : null,
ViolateTime: (this.validateForm.value.datePicker[0] && this.validateForm.value.datePicker[1]) ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
IsContainsChildren: 'true',
SkipCount: this.SkipCount,
MaxResultCount: '50'
@ -589,7 +588,46 @@ export class WarningStatisticsListComponent implements OnInit {
console.log('证照预警列表', data.result.items)
})
}
exportExcel() {
let organizationUnitId
if (this.router.url.indexOf('petrolStation') != -1) {
organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
} else {
organizationUnitId = this.validateForm.value.organization
}
let ViolationIds = []
if (this.validateForm.value.eventSystemName) {
ViolationIds.push(this.validateForm.value.eventSystemName)
} else {
this.eventSystemNameOption.forEach(element => {
ViolationIds.push(element.id)
});
}
const httpOptions = {
responseType: 'blob' as 'json',
params: {
ViolationIds: ViolationIds,
organizationUnitId: organizationUnitId,
ViolateTime: (this.validateForm.value.datePicker[0] && this.validateForm.value.datePicker[1]) ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
}
};
this.http.get(`/api/services/app/ViolateRecord/ExportExcel`, httpOptions).subscribe((data: any) => {
// console.log('导出成功')
// 文件名中有中文 则对文件名进行转码
const link = document.createElement('a');
const blob = new Blob([data], { type: 'application/vnd.ms-excel' });
link.setAttribute('href', window.URL.createObjectURL(blob));
link.setAttribute('download', '证照预警记录' + '.xls');
link.style.visibility = 'hidden';
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
this.message.create('success', `导出成功`);
}, err => {
this.message.create('error', `导出失败`);
})
}
submitForm(): void {
for (const i in this.validateForm.controls) {

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

@ -16,7 +16,7 @@
</nz-form-item>
<nz-form-item>
<nz-form-control>
<nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes"
<nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes"
nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl">
</nz-tree-select>
<ng-template #multiExpandedIconTpl let-node let-origin="origin">

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

@ -16,7 +16,7 @@
</nz-form-item>
<nz-form-item>
<nz-form-control>
<nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId"
<nz-tree-select [nzShowSearch]='true' [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId"
formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
[nzExpandedIcon]="multiExpandedIconTpl">
</nz-tree-select>

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

@ -107,6 +107,7 @@ export class UserComponent implements OnInit {
nzContent: AdduserComponent,
nzViewContainerRef: this.viewContainerRef,
nzWidth: 360,
nzMaskClosable: false,
nzComponentParams: {
title: '',
subtitle: ''
@ -156,6 +157,7 @@ export class UserComponent implements OnInit {
nzContent: EdituserComponent,
nzViewContainerRef: this.viewContainerRef,
nzWidth: 360,
nzMaskClosable: false,
// nzOkLoading: true,
nzComponentParams: {
data: data,

BIN
src/assets/images/packdown.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

116
src/theme.less

@ -46,7 +46,7 @@
}
}
@ -479,6 +479,117 @@
}
}
#statisticsList2 {
::-webkit-input-placeholder {
color: #345d85;
}
//滚动条样式
::-webkit-scrollbar {
width: 5px;
height: 10px;
}
::-webkit-scrollbar-thumb {
background-image: linear-gradient(#2495f8, #1c73c2, #0a3d6a, #061d3c);
}
::-webkit-scrollbar-track {
background-color: #061d3c;
}
::-webkit-scrollbar-corner{
background-color: #061d3c;
}
.ant-table table {
border-collapse: collapse;
}
nz-table {
flex: 1;
width: 100%;
}
.ant-table {
background: #002247;
}
.ant-table-thead>tr {
height: 40px;
line-height: 40px;
background: rgba(35, 153, 255, 0.2);
border: 1px solid rgba(35, 217, 255, 0.4);
box-shadow: 0 0 3px 0 rgba(35, 217, 255, 0.4) inset;
}
.ant-table-thead>tr>th {
background: none;
border-bottom: none;
padding: 0;
color: #23D9FF;
line-height: 28px;
}
.ant-table-thead>tr {
.ant-table-cell-fix-left {
background: #073a6c;
}
}
.ant-table-tbody>tr {
height: 40px;
line-height: 40px;
border-bottom: 1px solid #0d3761;
}
.ant-table-tbody>tr>td {
font-weight: 300;
font-family: synormal;
background: none;
border-bottom: none;
padding: 0;
color: #C4E2FC;
}
.ant-table-tbody>tr {
.ant-table-cell-fix-left {
background: #002247;
}
}
.look {
color: #36A2FF;
cursor: pointer;
}
.ant-table-measure-now {
display: none;
}
.ant-empty-description {
color: #23D9FF;
}
.ant-table-tbody>tr>td {
border-bottom: none;
}
.ant-table-tbody>tr>td:hover {
background: none;
}
.ant-select,
.ant-select-arrow {
color: #fff;
}
}
//蓝色 表格 tree-通知时间
.informTime {
@ -564,6 +675,7 @@
text-align: center;
}
}
.eventInput {
.ant-select-selection-item {
background: #143c61;
@ -573,4 +685,4 @@
.ant-select-selection-item-remove {
color: #fff;
}
}
}

Loading…
Cancel
Save