Browse Source

[新增]统计分析真数据

非煤矿山灾害智能感知和预警系统
邵佳豪 2 years ago
parent
commit
7edb57a09a
  1. 7
      src/app/home/home.module.ts
  2. 16
      src/app/home/statistic-analysis/home/home.component.html
  3. 15
      src/app/home/statistic-analysis/home/home.component.ts
  4. 8
      src/app/home/task/zhi-indicators/zhi-indicators.component.ts
  5. 7
      src/app/pipe/pipe.ts

7
src/app/home/home.module.ts

@ -73,7 +73,7 @@ import { ChatWindowComponent } from './commonComponents/chat-window/chat-window.
import { AngularDraggableModule } from 'angular2-draggable'; import { AngularDraggableModule } from 'angular2-draggable';
import { HomeComponent } from './statistic-analysis/home/home.component'; import { HomeComponent } from './statistic-analysis/home/home.component';
import { UploadComponent } from './task/station-task-execution/upload/upload.component'; import { UploadComponent } from './task/station-task-execution/upload/upload.component';
import { chineseNumbers, fileName } from '../pipe/pipe'; import { chineseNumbers, fileName, absoluteValue } from '../pipe/pipe';
import { TaskDetailsPagesComponent } from './task/station-task-execution/task-details/task-details.component'; import { TaskDetailsPagesComponent } from './task/station-task-execution/task-details/task-details.component';
import { NzTabsModule } from 'ng-zorro-antd/tabs'; import { NzTabsModule } from 'ng-zorro-antd/tabs';
import { CheckagainComponent } from './task/da-oneself-plan/checkagain/checkagain.component'; import { CheckagainComponent } from './task/da-oneself-plan/checkagain/checkagain.component';
@ -121,7 +121,8 @@ import { CheckagainComponent } from './task/da-oneself-plan/checkagain/checkagai
UploadComponent, UploadComponent,
fileName, fileName,
chineseNumbers, chineseNumbers,
CheckagainComponent CheckagainComponent,
absoluteValue
], ],
imports: [ imports: [
CommonModule, CommonModule,
@ -163,6 +164,6 @@ import { CheckagainComponent } from './task/da-oneself-plan/checkagain/checkagai
NzTabsModule NzTabsModule
], ],
providers: [StationTaskExecutionComponent, StationWeeklyPlanComponent], providers: [StationTaskExecutionComponent, StationWeeklyPlanComponent],
entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent, EditOrComponent, CreateTaskComponent, UploadComponent,CheckagainComponent] entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent, EditOrComponent, CreateTaskComponent, UploadComponent, CheckagainComponent]
}) })
export class HomeModule { } export class HomeModule { }

16
src/app/home/statistic-analysis/home/home.component.html

@ -146,16 +146,14 @@
</div> </div>
<div class="num"> <div class="num">
<span>{{item.num}}</span> <span>{{item.num}}</span>
<!-- <ng-container *ngIf="item.type == 'up'; else elseTemplate"> <img *ngIf="item.type == 'up'" src="../../../../assets/statistic-analysis/up.png"
<img src="../../../../assets/statistic-analysis/up.png" alt=""> alt="">
</ng-container> <img *ngIf="item.type == 'down'" src="../../../../assets/statistic-analysis/down.png"
<ng-template #elseTemplate> alt="">
<img src="../../../../assets/statistic-analysis/down.png" alt=""> <span *ngIf="item.changeNum != 0" class="numchange"
</ng-template>
<span class="numchange"
[ngClass]="{'numchangered': item.type == 'down','invariant': item.type == 'invariant','numchangegreen': item.type == 'up'}"> [ngClass]="{'numchangered': item.type == 'down','invariant': item.type == 'invariant','numchangegreen': item.type == 'up'}">
{{item.changeNum}} {{item.changeNum | absoluteValue}}
</span> --> </span>
</div> </div>
</div> </div>
</div> </div>

15
src/app/home/statistic-analysis/home/home.component.ts

@ -152,7 +152,8 @@ export class HomeComponent implements OnInit {
val: { val: {
fontSize: 28, fontSize: 28,
fontWeight: 'bold', fontWeight: 'bold',
color: '#333333' color: '#333333',
}, },
name: { name: {
fontSize: 14, fontSize: 14,
@ -464,8 +465,14 @@ export class HomeComponent implements OnInit {
obj.name = element.organization.name obj.name = element.organization.name
obj.num = element.totalCount obj.num = element.totalCount
obj.percentage = Math.round((element.totalCount / rankingList2[0].totalCount) * 100) obj.percentage = Math.round((element.totalCount / rankingList2[0].totalCount) * 100)
obj.type = "up" if (element.differenceCount == 0) {
obj.changeNum = 2 obj.type = "="
} else if (element.differenceCount < 0) {
obj.type = "down"
} else if (element.differenceCount > 0) {
obj.type = "up"
}
obj.changeNum = element.differenceCount
this.rankingList2.push(obj) this.rankingList2.push(obj)
}); });
@ -483,7 +490,7 @@ export class HomeComponent implements OnInit {
let taskBary1 = [] let taskBary1 = []
let taskBary2 = [] let taskBary2 = []
taskBar.forEach(element => { taskBar.forEach(element => {
taskBarx.push(element.organization.name) taskBarx.push(element.organization.name)
taskBary1.push(element.completeCount)//已完成 taskBary1.push(element.completeCount)//已完成
taskBary2.push(element.uncompleteCount)//未完成 taskBary2.push(element.uncompleteCount)//未完成
}); });

8
src/app/home/task/zhi-indicators/zhi-indicators.component.ts

@ -304,7 +304,7 @@ export class ZhiIndicatorsComponent implements OnInit {
ContainsChildren: "true", ContainsChildren: "true",
PageNumber: 1, PageNumber: 1,
PageSize: 9999, PageSize: 9999,
code:'0000' code: '0000'
} }
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
this.http.get('/api/Organizations', { this.http.get('/api/Organizations', {
@ -498,10 +498,10 @@ export class ZhiIndicatorsComponent implements OnInit {
let iszhanxun = roles.find(item => { let iszhanxun = roles.find(item => {
return item.name.indexOf('战训') != -1 return item.name.indexOf('战训') != -1
}) })
if(iszhanxun){ if (iszhanxun) {
this.iszhanxun = true this.iszhanxun = true
} }
console.log('iszhanxun',iszhanxun) console.log('iszhanxun', iszhanxun)
} }
//投诉举报/行政许可 选择单位 确认按钮 //投诉举报/行政许可 选择单位 确认按钮
selectedUnit(data, type) { selectedUnit(data, type) {
@ -781,7 +781,7 @@ export class ZhiIndicatorsComponent implements OnInit {
if (instance.validateForm.valid) { if (instance.validateForm.valid) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
let body = { let body = {
supervisorIds: [...instance.validateForm.value.main, ...instance.validateForm.value.assitant] supervisorIds: [instance.validateForm.value.main, instance.validateForm.value.assitant]
} }
this.http.patch(`/api/PlanTasks/${item.id}`, body).subscribe({ this.http.patch(`/api/PlanTasks/${item.id}`, body).subscribe({
next: async (data) => { next: async (data) => {

7
src/app/pipe/pipe.ts

@ -16,3 +16,10 @@ export class chineseNumbers implements PipeTransform {
return arr[value] return arr[value]
} }
} }
@Pipe({ name: 'absoluteValue' })
export class absoluteValue implements PipeTransform {
transform(number: any): number {
return Math.abs(number)
}
}

Loading…
Cancel
Save