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

[完善]大队页面细节

非煤矿山灾害智能感知和预警系统
邵佳豪 2 years ago
parent
2c965de920
commit
fb294c705c
12 changed files with 108 additions and 62 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. 4
      proxy.config.json
  2. 75
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
  3. 15
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss
  4. 18
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts
  5. 40
      src/app/home/task/da-oneself-plan/da-oneself-plan.component.html
  6. 7
      src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss
  7. 2
      src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
  8. 2
      src/app/home/task/station-task-apply/station-task-apply.component.html
  9. 2
      src/app/home/task/station-task-execution/station-task-execution.component.html
  10. 2
      src/app/home/task/station-task-execution/station-task-execution.component.ts
  11. 1
      src/app/home/task/station-task-execution/upload/upload.component.html
  12. 2
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts

4
proxy.config.json
Unescape View File

@ -1,11 +1,11 @@
{
"/api": {
"target": "https://fx.anxincloud.cn",
"target": "https://121.36.37.70:8204",
"secure": false,
"changeOrigin": true
},
"/hubs": {
"target": "https://fx.anxincloud.cn",
"target": "https://121.36.37.70:8204",
"secure": false,
"ws": true,
"logLevel": "debug"

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

@ -104,29 +104,40 @@
<div class="info">
<span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
<span *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
</span>
<ng-template #titleTemplate let-thing>
<span style="margin-right: 6px;" *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span style="margin-right: 6px;" *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
</ng-template>
<!-- <span class="blue" (click)="allot(i)">分配</span> -->
<span>|</span>
<span>申请人: {{i.organization.name}}</span>
<span>申请人: {{i.organization.level == 'battalion'? i.creator.name :
i.organization.name}}</span>
</div>
<div class="img">
<img *ngIf="i.approvalStatus == '驳回'" src="../../../../assets/images/icon/reject.png">
<img *ngIf="i.approvalStatus == '通过'" src="../../../../assets/images/icon/agree.png">
<ng-container
*ngIf="i.approvalStatus == '驳回' || i.approvalStatus == '通过'; else elseTemplate">
<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">
<span>{{i.inspectionResult}}</span>
</ng-container>
<ng-template #elseTemplate2>
<span> {{i.approvalStatus}}</span>
</ng-template>
</ng-template>
</div>
</div>
@ -347,7 +358,7 @@
<div class="maincontentitemright">
<div class="maincontentitemrightitem" *ngFor="let i of item.data">
<div class="flexcol namebox">
<span>
<span class="ellipsi" [title]="i.company.companyName">
{{i.company.companyName}}
</span>
<span>
@ -355,7 +366,7 @@
</span>
</div>
<div class="flexcol">
<span>
<span class="ellipsi" [title]="i.company.useNature">
{{i.company.useNature}}
</span>
<span>
@ -363,29 +374,30 @@
</span>
</div>
<div class="flexcol">
<span>
{{i.organization.name}}
<span class="ellipsi" [title]="i.organization.level == 'battalion'? i.creator.name :
i.organization.name">
{{i.organization.level == 'battalion'? i.creator.name :
i.organization.name}}
</span>
<span>
责任机构
</span>
</div>
<div class="flexcol flexcolassistant">
<span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
<span class="assistant ellipsi" nz-tooltip [nzTooltipTitle]="titleTemplate">
<span *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
<span></span>
</span>
<ng-template #titleTemplate let-thing>
<span style="margin-right: 6px;" *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span style="margin-right: 6px;" *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
</ng-template>
@ -394,16 +406,23 @@
</span>
</div>
<div class="flexcol">
<span>
宣传
<span class="ellipsi">
{{i.isSpread ? '已宣传' : '未宣传'}}
</span>
<span>
同步工作
</span>
</div>
<div class="flexcol">
<span class="ellipsi" [title]="i.approvalStatus">
{{i.approvalStatus}}
</span>
<span>
任务状态
</span>
</div>
<div class="flexcol">
<span class="ellipsi" [title]="i.inspectionResult">
{{i.inspectionResult}}
</span>
<span>

15
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss
Unescape View File

@ -279,11 +279,12 @@
.info {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
justify-content: flex-start;
.assistant {
width: 50%;
overflow: hidden;
span {
color: #303133;
@ -315,6 +316,10 @@
img {
margin-left: 40%;
}
span {
margin-left: 40%;
}
}
}
@ -650,3 +655,11 @@
width: 100%;
border-top: 1px dashed #C7CAD0;
}
.ellipsi {
width: 100%;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

18
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts
Unescape View File

@ -81,8 +81,8 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
// 下级任务申请
this.getTaskList()
this.getSupervisor('main')
this.getSupervisor('assisted')
// this.getSupervisor('main')
// this.getSupervisor('assisted')
//统计信息
this.getCountStat()
@ -200,17 +200,17 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
}
});
arr1.forEach(item => {
if (item.approvalStatus == '通过') {
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') {
this.taskData[0].finished += 1
}
});
arr2.forEach(item => {
if (item.approvalStatus == '通过') {
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') {
this.taskData[1].finished += 1
}
});
arr3.forEach(item => {
if (item.approvalStatus == '通过') {
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') {
this.taskData[2].finished += 1
}
});
@ -320,10 +320,10 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
num: data['任务总数']['总数'], percentageComplete: integer(data['任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['任务总数']['上级指派'] / data['任务总数']['总数']), item2: integer(data['任务总数']['自主任务'] / data['任务总数']['总数']), item3: integer(data['任务总数']['申领任务'] / data['任务总数']['总数'])
},
statistics2: {
num: data['消防救援任务总数']['总数'], percentageComplete: integer(data['任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['消防救援任务总数']['上级指派'] / data['消防救援任务总数']['总数']), item2: integer(data['消防救援任务总数']['自主任务'] / data['消防救援任务总数']['总数']), item3: integer(data['消防救援任务总数']['申领任务'] / data['消防救援任务总数']['总数'])
num: data['消防救援任务总数']['总数'], percentageComplete: integer(data['消防救援任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['消防救援任务总数']['上级指派'] / data['消防救援任务总数']['总数']), item2: integer(data['消防救援任务总数']['自主任务'] / data['消防救援任务总数']['总数']), item3: integer(data['消防救援任务总数']['申领任务'] / data['消防救援任务总数']['总数'])
},
statistics3: {
num: data['检查员任务总数']['总数'], percentageComplete: integer(data['任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['检查员任务总数']['上级指派'] / data['检查员任务总数']['总数']), item2: integer(data['检查员任务总数']['自主任务'] / data['检查员任务总数']['总数']), item3: integer(data['检查员任务总数']['申领任务'] / data['检查员任务总数']['总数'])
num: data['检查员任务总数']['总数'], percentageComplete: integer(data['检查员任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['检查员任务总数']['上级指派'] / data['检查员任务总数']['总数']), item2: integer(data['检查员任务总数']['自主任务'] / data['检查员任务总数']['总数']), item3: integer(data['检查员任务总数']['申领任务'] / data['检查员任务总数']['总数'])
}
}
})
@ -385,7 +385,7 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
Month: selectedTime,
CompanyOrganizationId: item.id,
PageNumber: 1,
approvalStatuses: '通过',
approvalStatuses: ['通过', '待检查', '已检查'],
PageSize: 9999
}
item.isLoading = true
@ -430,7 +430,7 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
i.approvalStatus == '已检查' ? element.finished += 1 : null
});
});
item.percentage = Math.round(item.inspected / item.allUnitsNum) * 100
item.percentage = Math.round((item.inspected / item.allUnitsNum) * 100)
},
error: (err) => {

40
src/app/home/task/da-oneself-plan/da-oneself-plan.component.html
Unescape View File

@ -130,7 +130,7 @@
<div class="maincontentitemright">
<div class="maincontentitemrightitem" *ngFor="let i of item.data">
<div class="flexcol namebox">
<span>
<span class="ellipsi" [title]="i.company.companyName">
{{i.company.companyName}}
</span>
<span>
@ -138,7 +138,7 @@
</span>
</div>
<div class="flexcol">
<span>
<span class="ellipsi" [title]="i.company.useNature">
{{i.company.useNature}}
</span>
<span>
@ -146,29 +146,30 @@
</span>
</div>
<div class="flexcol">
<span>
{{i.organization.name}}
<span class="ellipsi" [title]="i.organization.level == 'battalion'? i.creator.name :
i.organization.name">
{{i.organization.level == 'battalion'? i.creator.name :
i.organization.name}}
</span>
<span>
责任机构
</span>
</div>
<div class="flexcol flexcolassistant">
<span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
<span class="assistant ellipsi" nz-tooltip [nzTooltipTitle]="titleTemplate">
<span *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
<span></span>
</span>
<ng-template #titleTemplate let-thing>
<span style="margin-right: 6px;" *ngFor="let o of i.supervisors">
<img *ngIf="o.posts && o.posts[0] == '主查人员'"
src="../../../../assets/images/icon/main.png" alt="">
<img *ngIf="o.posts && o.posts[0] == '协查人员'"
src="../../../../assets/images/icon/assist.png" alt="">
{{o.name}}
</span>
<span style="margin-right: 6px;" *ngFor="let o of i.assistantOrganizations">
{{o.name}}
</span>
</ng-template>
@ -177,16 +178,23 @@
</span>
</div>
<div class="flexcol">
<span>
宣传
<span class="ellipsi">
{{i.isSpread ? '已宣传' : '未宣传'}}
</span>
<span>
同步工作
</span>
</div>
<div class="flexcol">
<span class="ellipsi" [title]="i.approvalStatus">
{{i.approvalStatus}}
</span>
<span>
任务状态
</span>
</div>
<div class="flexcol">
<span class="ellipsi" [title]="i.inspectionResult">
{{i.inspectionResult}}
</span>
<span>

7
src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss
Unescape View File

@ -406,3 +406,10 @@
width: 100%;
border-top: 1px dashed #C7CAD0;
}
.ellipsi {
width: 100%;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

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

@ -210,7 +210,7 @@ export class DaOneselfPlanComponent implements OnInit {
i.approvalStatus == '已检查' ? element.finished += 1 : null
});
});
item.percentage = Math.round(item.inspected / item.allUnitsNum) * 100
item.percentage = Math.round((item.inspected / item.allUnitsNum) * 100)
},
error: (err) => {
this.message.create('warning', '获取数据失败');

2
src/app/home/task/station-task-apply/station-task-apply.component.html
Unescape View File

@ -160,7 +160,7 @@
</div>
<div class="flexcol">
<span>
宣传
{{item.isSpread ? '已宣传' : '未宣传'}}
</span>
<span>
同步工作

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

@ -156,7 +156,7 @@
<div class="flexcol">
<span>
宣传
{{item.isSpread ? '已宣传' : '未宣传'}}
</span>
<span>
同步工作

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

@ -79,7 +79,7 @@ export class StationTaskExecutionComponent implements OnInit {
PageNumber: this.PageNumber,
PageSize: this.PageSize
}
this.http.get('/api/PlanTasks', {
this.http.get('/api/PlanTasks/GetMyTasks', {
params: params
}).subscribe((data: any) => {
this.isloading = false

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

@ -26,7 +26,6 @@
</li>
</ul>
</div>
</nz-form-item>
</form>
</div>

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

@ -617,7 +617,7 @@ export class StationWeeklyPlanComponent implements OnInit {
let taskIds = []
element.data.forEach(item => {
item.data.forEach(i => {
i.checkTime ? taskIds.push(i.id) : null
i.checkTime && i.approvalStatus != '已检查' ? taskIds.push(i.id) : null
});
});
let params = {

Write Preview
Loading…
Cancel
Save