Browse Source

[修改]日期完善

非煤矿山灾害智能感知和预警系统
邵佳豪 2 years ago
parent
commit
06dbf36dd6
  1. 2
      src/app/home/basic-info/unit-details/operation-log/operation-log.component.html
  2. 2
      src/app/home/nav/nav.component.html
  3. 6
      src/app/home/task/station-task-execution/station-task-execution.component.html
  4. 3
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts

2
src/app/home/basic-info/unit-details/operation-log/operation-log.component.html

@ -1,6 +1,6 @@
<div class="box">
<div *ngFor="let item of logList" class="item">
{{item.userName}}在{{item.auditTime | date:"yyyy-MM-dd hh:mm:ss"}}进行了{{item.entityState}}操作
{{item.userName}}在{{item.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}进行了{{item.entityState}}操作
<div *ngIf="item.list.length != 0">
操作内容 :
<span *ngFor="let item of item.list">

2
src/app/home/nav/nav.component.html

@ -29,7 +29,7 @@
<div class="messageBox">
<nz-list nzBordered [nzBordered]="false">
<nz-list-item *ngFor="let item of methodService.notificationsList">
<nz-list-item-meta [nzDescription]="item.creationTime | date:'yyyy-MM-dd hh:mm:ss'">
<nz-list-item-meta [nzDescription]="item.creationTime | date:'yyyy-MM-dd HH:mm:ss'">
<nz-list-item-meta-title>
{{ item.content }}
</nz-list-item-meta-title>

6
src/app/home/task/station-task-execution/station-task-execution.component.html

@ -49,9 +49,9 @@
<div class="searchbox">
<div class="search">
<nz-select nzPlaceHolder="任务名称" [(ngModel)]="searchForm.taskname" nzAllowClear>
<nz-option *ngIf="isSupervisor" nzValue="双随机" nzLabel="双随机"></nz-option>
<nz-option *ngIf="isSupervisor" nzValue="联络指导" nzLabel="联络指导"></nz-option>
<nz-option *ngIf="!isSupervisor" nzValue="熟悉演练" nzLabel="熟悉演练"></nz-option>
<nz-option nzValue="双随机" nzLabel="双随机"></nz-option>
<nz-option nzValue="联络指导" nzLabel="联络指导"></nz-option>
<nz-option nzValue="熟悉演练" nzLabel="熟悉演练"></nz-option>
</nz-select>
<input type="text" nz-input placeholder="单位名称" [(ngModel)]="searchForm.unitname" nzAllowClear />
<!-- <nz-select nzPlaceHolder="单位级别" [(ngModel)]="searchForm.unitlevel">

3
src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts

@ -665,7 +665,8 @@ export class StationWeeklyPlanComponent implements OnInit {
nzOnOk: () => {
let ids = []
item.data.forEach(element => {
ids.push(element.id)
if (element.approvalStatus == '待处理' || element.approvalStatus == '驳回')
ids.push(element.id)
});
this.http.post(`/api/PlanTasks/ApprovalMany`, null, {
params: {

Loading…
Cancel
Save