shaojiahao
/
Jinan_project
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]完善bug

非煤矿山灾害智能感知和预警系统
邵佳豪 2 years ago
parent
7972aed9e1
commit
48266667ee
13 changed files with 109 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/app/home/basic-info/unit-details/unit-details.component.html
  2. 4
      src/app/home/basic-info/unit-details/unit-details.component.scss
  3. 12
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
  4. 2
      src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
  5. 4
      src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
  6. 9
      src/app/home/task/station-task-execution/station-task-execution.component.html
  7. 8
      src/app/home/task/station-task-execution/station-task-execution.component.scss
  8. 25
      src/app/home/task/station-task-execution/station-task-execution.component.ts
  9. 20
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
  10. 13
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
  11. 21
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
  12. 4
      src/app/home/task/station-weekly-plan/task-details/task-details.component.ts
  13. 4
      src/app/home/task/zhi-indicators/zhi-indicators.component.ts

42
src/app/home/basic-info/unit-details/unit-details.component.html
Unescape View File

@ -163,8 +163,11 @@
<div style="width: 200px;">基本信息</div>
<div class="tabbtn">
<div class="bule" (click)="index = 1" [ngClass]="{'selected': index == 1}">切换为单位基本信息</div>
<span class="line">|</span>
<div class="bule" (click)="index = 4" [ngClass]="{'selected': index == 4}">切换为“防消联勤”工作检查情况登记表</div>
<span class="line">|</span>
<div class="bule" (click)="index = 2" [ngClass]="{'selected': index == 2}">切换为实战演练卡</div>
<span class="line">|</span>
<div class="bule" (click)="index = 3" [ngClass]="{'selected': index == 3}">切换为数字化预案卡</div>
</div>
</div>
@ -1588,15 +1591,16 @@
</div>
</div>
<div class="formbox" *ngIf="index == 3 && isHaveLastTask">
<button nz-button nzType="primary" *ngIf="!disableds" (click)="download(3)">下载表格</button>
<button nz-button nzType="primary" *ngIf="!disableds" (click)="download(3)">下载表格</button>
<div id="tablebox2">
<table cellspacing=" 0" cellpadding="0" style="border-collapse:collapse; margin:0 auto; width:488.45pt">
<tr style="height:18.4pt">
<td colspan="20"
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:1pt; padding-left:5.4pt; padding-right:5.4pt; vertical-align:middle; width:477.65pt">
<p style="margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:宋体; font-size:22pt; font-weight:bold">{{company}}</span><span
style="font-family:宋体; font-size:22pt; font-weight:bold">基本情况</span></p>
<p style="margin:0pt; orphans:0; text-align:center; widows:0">
<span style="font-family:宋体; font-size:22pt; font-weight:bold">{{company}}</span>
<span style="font-family:宋体; font-size:22pt; font-weight:bold">基本情况</span>
</p>
</td>
</tr>
<tr style="height:18.4pt">
@ -2200,30 +2204,34 @@
</div>
<div class="formbox" *ngIf="index == 4 && isHaveLastTask">
<button nz-button nzType="primary" *ngIf="!disableds" (click)="print()">打印表格</button>
<button nz-button nzType="primary" *ngIf="!disableds" (click)="print()">打印表格</button>
<iframe id="iframe1" style="display: none"></iframe>
<div id="tablebox3">
<p style="margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">“</span><span
style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">防消联勤</span><span
style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">”</span><span
style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">工作检查情况登记表</span></p>
<p style="margin:0pt; orphans:0; text-align:center; widows:0">
<span style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">“</span>
<span style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">防消联勤</span>
<span style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">”</span>
<span style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">工作检查情况登记表</span>
</p>
<p style="margin:0pt; orphans:0;text-align: center;">
<span style="font-family:仿宋_GB2312; font-size:12pt;margin-right: 50pt;">执勤中队：{{organization}}</span>
<span style="font-family:仿宋_GB2312; font-size:12pt;margin-left: 50pt;">检查日期：{{checkTime | date:"yyyy-MM-dd
HH:mm:ss" }}</span>
<span style="font-family:仿宋_GB2312; font-size:12pt;margin-left: 50pt;">
检查日期：{{checkTime | date:"yyyy-MM-dd HH:mm:ss" }}
</span>
</p>
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin:0 auto; width:475.65pt">
<tr style="height:20.8pt">
<td
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
<p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
style="font-family:宋体; font-size:9pt">单位名称</span></p>
<p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0">
<span style="font-family:宋体; font-size:9pt">单位名称</span>
</p>
</td>
<td colspan="2"
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
<p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
style="font-family:宋体; font-size:9pt">{{company}}</span></p>
<p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0">
<span style="font-family:宋体; font-size:9pt">{{company}}</span>
</p>
</td>
<td colspan="2"
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
@ -2386,7 +2394,7 @@
style="font-family:宋体; font-size:9pt">{{item.name}}</span></p>
<p *ngIf="item.name != '实战演练' && item.name != '数字化预案'"
style="margin:0pt; orphans:0; text-align:justify; widows:0">
<img *ngFor="let i of item.data.imgShow" [src]="i" width="145" height="82" alt=""
<img (click)="viewImg(i)" *ngFor="let i of item.data.imgShow" [src]="i" width="145" height="82" alt=""
style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline;margin-right: 3pt;" />
</p>
<p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span

4
src/app/home/basic-info/unit-details/unit-details.component.scss
Unescape View File

@ -63,9 +63,11 @@
display: flex;
.bule{
cursor: pointer;
margin-right: 10px;
color: #000;
}
.line{
margin: 0 10px;
}
.selected{
color: #2196F3;
}

12
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
Unescape View File

@ -119,7 +119,6 @@
{{o.name}}
</span>
</ng-template>
</span>
<ng-template #titleTemplate let-thing>
<ng-container *ngIf="i.relatedTaskId; else elseTemplate">
@ -139,8 +138,6 @@
{{o.name}}
</span>
</ng-template>
</ng-template>
<span>|</span>
<span>申请人: {{i.organization.level == 'battalion'? i.creator.name :
@ -148,23 +145,22 @@
</div>
<div class="img">
<ng-container
*ngIf="i.approvalStatus == '驳回' || i.approvalStatus == '通过'; else elseTemplate">
*ngIf="i.approvalStatus == '驳回' || i.approvalStatus == '通过'; else elseTemplate6">
<img *ngIf="i.approvalStatus == '驳回'"
src="../../../../assets/images/icon/reject.png">
<img *ngIf="i.approvalStatus == '通过'"
src="../../../../assets/images/icon/agree.png">
</ng-container>
<ng-template #elseTemplate>
<ng-container *ngIf="i.approvalStatus == '已检查'; else elseTemplate2">
<ng-template #elseTemplate6>
<ng-container *ngIf="i.approvalStatus == '已检查'; else elseTemplate8">
<span>{{i.inspectionResult}}</span>
</ng-container>
<ng-template #elseTemplate2>
<ng-template #elseTemplate8>
<span> {{i.approvalStatus}}</span>
</ng-template>
</ng-template>
</div>
</div>
</div>
</div>
</div>

2
src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
Unescape View File

@ -113,7 +113,7 @@ export class DaOneselfPlanComponent implements OnInit {
this.cardData.forEach(element => {
element.data.forEach(item => {
item.approvalStatus == '通过' ? element.passed += 1 : null
item.approvalStatus == '待检查' ? element.passed += 1 : null
item.approvalStatus == '已检查 ' ? element.inspected += 1 : null
})
})

4
src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
Unescape View File

@ -34,13 +34,13 @@ export class PlanAdjustmentComponent implements OnInit {
}
push(i, item, e) {
let body = {
approvalStatus: e ? '通过' : '待处理'
approvalStatus: e ? '待检查' : '待处理'
}
this.http.patch(`/api/PlanTasks/${i.id}`, body).subscribe({
next: (data) => {
this.message.create('success', '处理成功');
if (e) {
i.approvalStatus = '通过'
i.approvalStatus = '待检查'
let isTrue = this.data.data.find((item) => {
return item.name == i.taskType
})

9
src/app/home/task/station-task-execution/station-task-execution.component.html
Unescape View File

@ -89,9 +89,9 @@
</span>
</div>
<div class="flexcol">
<div class="flexcol time">
<span class="ellipsi" [title]="item.planTime | date:'yyyy-MM-dd'">
{{item.planTime | date:"yyyy-MM-dd"}}
{{item.planTime | date:"yyyy-MM-dd HH:mm:ss"}}
</span>
<span>
时间
@ -185,10 +185,11 @@
同步工作
</span>
</div>
<div class="flexcol">
<div class="flexcol flexcolcaozuo">
<span>
<a class="blue" (click)="look(item)" style="margin-right: 5px;">查看</a>
<a class="blue" (click)="complete(item)">完成</a>
<a class="blue" (click)="complete(item)" style="margin-right: 5px;">完成</a>
<a class="red" (click)="cancel(item)">驳回</a>
</span>
<span>
操作

8
src/app/home/task/station-task-execution/station-task-execution.component.scss
Unescape View File

@ -204,6 +204,10 @@
}
.flexcolcaozuo {
flex: 1.5;
}
.flexcolassistant {
flex: 2;
overflow: hidden;
@ -242,6 +246,10 @@
flex: 2;
}
.time {
flex: 2;
}
.flexcolcenter {
flex: 0.5;
align-items: center;

25
src/app/home/task/station-task-execution/station-task-execution.component.ts
Unescape View File

@ -54,8 +54,29 @@ export class StationTaskExecutionComponent implements OnInit {
this.getTaskList()
}
cancel(item, type) {
cancel(item) {
this.modal.confirm({
nzTitle: `确定要驳回该任务吗?`,
nzOkText: '确定',
nzOkType: 'default',
nzOnOk: () => {
item.isLoading = true
this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, {
params: {
approvalStatus: '驳回'
}
}).subscribe({
next: (data) => {
this.getTaskList()
this.message.create('success', '已驳回');
},
error: (err) => {
this.message.create('warning', '驳回失败');
}
})
},
nzCancelText: '取消'
});
}
delete(item) {

20
src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
Unescape View File

@ -100,10 +100,10 @@
<span class="itemtwocontentitemp1name">{{i.company.companyName}}</span>
<span class="marginr5">
<span class="green"
*ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId"
*ngIf="isExpand && i.approvalStatus!='已检查' && (i.relatedTaskId || i.creationType == '自主任务')"
(click)="accept(i,item)">接受</span>
<span class="red"
*ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId"
*ngIf="isExpand && i.approvalStatus!='已检查' && (i.relatedTaskId || i.creationType == '自主任务')"
(click)="reject(i,item)">拒绝</span>
<span *ngIf="isExpand">({{i.approvalStatus}})</span>
</span>
@ -111,9 +111,10 @@
<p>{{i.company.organization.name}}</p>
<p class="marginr5">
<span class=" green"
*ngIf="!isExpand && i.approvalStatus!='已检查' && !i.relatedTaskId"
*ngIf="!isExpand && i.approvalStatus!='已检查' && (i.relatedTaskId || i.creationType == '自主任务')"
(click)="accept(i,item)">接受</span>
<span class="red" *ngIf="!isExpand && i.approvalStatus!='已检查' && !i.relatedTaskId"
<span class="red"
*ngIf="!isExpand && i.approvalStatus!='已检查' && (i.relatedTaskId || i.creationType == '自主任务')"
(click)="reject(i,item)">拒绝</span>
<span *ngIf="!isExpand">({{i.approvalStatus}})</span>
</p>
@ -138,15 +139,15 @@
{{element.name}}
</span>
<span style="width: 8%;">单位总数: {{element.allUnitsNum}}/{{TuesdayThursdayNum}}</span>
<div style="width: 60%;" class="progress progresssquare">
<div style="width: 66%;" class="progress progresssquare">
<span>完成进度</span>
<nz-progress nzStrokeLinecap="square" [nzStrokeWidth]="16" nzStrokeColor="#42B983"
[nzPercent]="element.percentage"></nz-progress>
</div>
<button nz-button nzType="primary" style="margin-right: 12px;"
(click)="adjustment(element)">任务调整</button>
<button nz-button nzType="primary" (click)="createTask(element)">{{isSupervisor ? '协同任务' :
'生成周计划'}}</button>
<!-- <button nz-button nzType="primary" (click)="createTask(element)">{{isSupervisor ? '协同任务' :
'生成周计划'}}</button> -->
<span (click)="expandcarditem(element)" class="expand blue">
{{element.isExpand ? '收起' :'展开'}}
<i nz-icon [nzType]="element.isExpand ? 'down' : 'up'" nzTheme="outline"></i>
@ -247,9 +248,10 @@
同步工作
</span>
</div>
<div class="flexcol">
<div class="flexcol time">
<span>
<nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="i.planTime"
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss"
[nzDisabledDate]="disabledDate" [(ngModel)]="i.planTime"
nzPlaceHolder="请选择检查日期" nzBorderless
(ngModelChange)="checkTime($event,i,element)">
</nz-date-picker>

13
src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
Unescape View File

@ -14,6 +14,7 @@
padding: 10px 20px;
padding-bottom: 0px;
color: #000;
.inform {
width: 100%;
height: 100%;
@ -116,7 +117,8 @@
align-items: flex-start;
flex: 1;
box-sizing: border-box;
nz-badge{
nz-badge {
width: 80%;
color: #fff;
}
@ -391,13 +393,14 @@
color: #C7CAD0;
}
}
.flexcolcenter{
.flexcolcenter {
align-items: center;
}
.flexcolassistant {
flex: 2;
flex: 1.6;
overflow: hidden;
.assistant {
@ -433,7 +436,9 @@
width: 100%;
}
}
.time{
flex: 1.2;
}
.btnbox {
display: flex;
justify-content: flex-end;

21
src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
Unescape View File

@ -100,8 +100,15 @@ export class StationWeeklyPlanComponent implements OnInit {
})
}
checkTime(e, i, element) {
console.log(e)
if (e) {
i.planTime = moment(e).format('yyyy-MM-DD')
let time = new Date(moment(e).format('yyyy-MM-DD HH:mm:ss')).toISOString()
i.planTime = time
} else {
i.planTime = null
}
@ -238,7 +245,7 @@ export class StationWeeklyPlanComponent implements OnInit {
this.cardData.forEach(element => {
element.data.forEach(item => {
item.approvalStatus == '通过' ? element.passed += 1 : null
item.approvalStatus == '待检查' ? element.passed += 1 : null
item.approvalStatus == '已检查' ? element.inspected += 1 : null
})
})
@ -342,12 +349,12 @@ export class StationWeeklyPlanComponent implements OnInit {
item.isLoading = true
this.http.post(`/api/PlanTasks/Approval/${i.id}`, null, {
params: {
approvalStatus: '通过'
approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已接受');
i.approvalStatus = '通过'
i.approvalStatus = '待检查'
item.isLoading = false
item.passed += 1
this.getTaskListPass(this.stationData[0])
@ -571,7 +578,7 @@ export class StationWeeklyPlanComponent implements OnInit {
supervisorIds: this.isSupervisor ? [this.userId] : [],
assistantOrganizationIds: this.isSupervisor ? [] : [this.OrganizationId],
creationType: '自主任务',
approvalStatus: '通过'
approvalStatus: '待检查'
}
this.http.post('/api/PlanTasks', body).subscribe({
next: (data: any) => {
@ -663,13 +670,13 @@ export class StationWeeklyPlanComponent implements OnInit {
this.http.post(`/api/PlanTasks/ApprovalMany`, null, {
params: {
ids: ids,
approvalStatus: '通过'
approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '成功');
item.data.forEach(element => {
element.approvalStatus = '通过'
element.approvalStatus = '待检查'
});
this.getTaskListPass(this.stationData[0])
},

4
src/app/home/task/station-weekly-plan/task-details/task-details.component.ts
Unescape View File

@ -26,12 +26,12 @@ export class TaskDetailsComponent implements OnInit {
nzOnOk: () => {
this.http.post(`/api/PlanTasks/Approval/${i.id}`, null, {
params: {
approvalStatus: '通过'
approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已接受');
i.approvalStatus = '通过'
i.approvalStatus = '待检查'
this.parent.stationData.forEach(element => {
if (element.id == i.company.organizationId) {
if (element.isExpand) {

4
src/app/home/task/zhi-indicators/zhi-indicators.component.ts
Unescape View File

@ -805,12 +805,12 @@ export class ZhiIndicatorsComponent implements OnInit {
item.isLoading = true
this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, {
params: {
approvalStatus: '通过'
approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已派发');
item.approvalStatus = '通过'
item.approvalStatus = '待检查'
item.isLoading = false
item.passed += 1
type == '投诉举报' ? this.complaint.allocated += 1 : null

Write Preview
Loading…
Cancel
Save