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

[新增]大队自由调整任务检查时间

master
邵佳豪 6 months ago
parent
68177e7291
commit
88ba6c9f88
3 changed files with 556 additions and 275 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 12
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
  3. 817
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts

2
package.json
Unescape View File

@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.config.json --open --port 8888 ", "start": "ng serve --proxy-config proxy.config.json --open --port 8888 --host 192.168.1.46",
"build": "ng build", "build": "ng build",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test" "test": "ng test"

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

@ -451,6 +451,18 @@
检查结果 检查结果
</span> </span>
</div> </div>
<div class="flexcol" style="flex: 2;">
<span class="ellipsi">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="i.planTime" nzPlaceHolder="请选择检查日期" nzBorderless
(ngModelChange)="checkTime($event,i,element)">
</nz-date-picker>
</span>
<span>
检查时间
</span>
</div>
</div> </div>
</div> </div>

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

@ -3,45 +3,53 @@ import { Component, NgZone, OnInit, ViewContainerRef } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { AllotPersonComponent } from '../da-subordinate-audit/allot-person/allot-person.component'; import { AllotPersonComponent } from '../da-subordinate-audit/allot-person/allot-person.component';
import signalR from '../../../../signalR' import signalR from '../../../../signalR';
import * as moment from 'moment';
@Component({ @Component({
selector: 'app-da-monthly-task-overview', selector: 'app-da-monthly-task-overview',
templateUrl: './da-monthly-task-overview.component.html', templateUrl: './da-monthly-task-overview.component.html',
styleUrls: ['./da-monthly-task-overview.component.scss'] styleUrls: ['./da-monthly-task-overview.component.scss'],
}) })
export class DaMonthlyTaskOverviewComponent implements OnInit { export class DaMonthlyTaskOverviewComponent implements OnInit {
constructor(
constructor(private ngZone: NgZone, private http: HttpClient, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { } private ngZone: NgZone,
private http: HttpClient,
selectedMonth private modal: NzModalService,
selectedYear = 2024 private viewContainerRef: ViewContainerRef,
selectedTime private message: NzMessageService
) {}
selectedMonth;
selectedYear = 2024;
selectedTime;
selectMonth(item) { selectMonth(item) {
this.selectedMonth = item.id this.selectedMonth = item.id;
this.getTuesdayThursdayNum() this.getTuesdayThursdayNum();
this.getHigherTasks() this.getHigherTasks();
this.getTaskList() this.getTaskList();
this.getAllStation() this.getAllStation();
this.getCountStat() this.getCountStat();
} }
selectYear(e) { selectYear(e) {
this.selectedYear = e this.selectedYear = e;
this.getTuesdayThursdayNum() this.getTuesdayThursdayNum();
this.getHigherTasks() this.getHigherTasks();
this.getTaskList() this.getTaskList();
this.getAllStation() this.getAllStation();
this.getCountStat() this.getCountStat();
} }
//当月有几个周二周四 //当月有几个周二周四
TuesdayThursdayNum = 0 TuesdayThursdayNum = 0;
getTuesdayThursdayNum() { getTuesdayThursdayNum() {
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' let selectedTime =
this.http.get(`/api/TaskTargets/GetTargetCount/${selectedTime}`).subscribe((data: any) => { this.selectedYear + '-' + this.selectedMonth + '-' + '01';
console.log('最大日期', data) this.http
this.TuesdayThursdayNum = data .get(`/api/TaskTargets/GetTargetCount/${selectedTime}`)
}) .subscribe((data: any) => {
console.log('最大日期', data);
this.TuesdayThursdayNum = data;
});
} }
months = [ months = [
@ -56,194 +64,314 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
{ id: 9, name: '9月', isable: true }, { id: 9, name: '9月', isable: true },
{ id: 10, name: '10月', isable: true }, { id: 10, name: '10月', isable: true },
{ id: 11, name: '11月', isable: true }, { id: 11, name: '11月', isable: true },
{ id: 12, name: '12月', isable: true } { id: 12, name: '12月', isable: true },
] ];
OrganizationId;
OrganizationId
ngOnInit(): void { ngOnInit(): void {
// 接收来自中心的消息 // 接收来自中心的消息
(signalR.SR as any).on('receiveNotification', (message: string, senderName: string) => { (signalR.SR as any).on(
// 接收后要做的事 'receiveNotification',
console.log('收到消息---', message) (message: string, senderName: string) => {
}) // 接收后要做的事
console.log('收到消息---', message);
}
);
this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId this.OrganizationId = JSON.parse(
this.selectedMonth = new Date().getMonth() + 1 sessionStorage.getItem('userData')
).organizationId;
this.selectedMonth = new Date().getMonth() + 1;
//上级任务指标 //上级任务指标
this.getHigherTasks() this.getHigherTasks();
// 下级任务申请 // 下级任务申请
this.getTaskList() this.getTaskList();
// this.getSupervisor('main') // this.getSupervisor('main')
// this.getSupervisor('assisted') // this.getSupervisor('assisted')
//统计信息 //统计信息
this.getCountStat() this.getCountStat();
this.getTuesdayThursdayNum() this.getTuesdayThursdayNum();
//本级部署 //本级部署
this.getAllStation() this.getAllStation();
} }
//上级任务指标 //上级任务指标
cardData = [ cardData = [
{ name: '双随机', isDetails: false, isLoading: false, background: '#1D9DFF', icon: 'suiji.png', passed: 0, inspected: 0, percentage: 0, data: [] }, {
{ name: '行政许可', isDetails: false, isLoading: false, background: '#42B983', icon: 'xuke.png', passed: 0, inspected: 0, percentage: 0, data: [] }, name: '双随机',
{ name: '熟悉演练', isDetails: false, isLoading: false, background: '#9D80FF', icon: 'yanlian.png', passed: 0, inspected: 0, percentage: 0, data: [] }, isDetails: false,
{ name: '消防宣传', isDetails: false, isLoading: false, background: '#FF5D2A', icon: 'xuanchuan.png', passed: 0, inspected: 0, percentage: 0, data: [] }, isLoading: false,
{ name: '投诉举报', isDetails: false, isLoading: false, background: '#5087FF', icon: 'tousu.png', passed: 0, inspected: 0, percentage: 0, data: [] }, background: '#1D9DFF',
{ name: '火灾调查', isDetails: false, isLoading: false, background: '#FF404D', icon: 'huozai.png', passed: 0, inspected: 0, percentage: 0, data: [] } icon: 'suiji.png',
] passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
{
name: '行政许可',
isDetails: false,
isLoading: false,
background: '#42B983',
icon: 'xuke.png',
passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
{
name: '熟悉演练',
isDetails: false,
isLoading: false,
background: '#9D80FF',
icon: 'yanlian.png',
passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
{
name: '消防宣传',
isDetails: false,
isLoading: false,
background: '#FF5D2A',
icon: 'xuanchuan.png',
passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
{
name: '投诉举报',
isDetails: false,
isLoading: false,
background: '#5087FF',
icon: 'tousu.png',
passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
{
name: '火灾调查',
isDetails: false,
isLoading: false,
background: '#FF404D',
icon: 'huozai.png',
passed: 0,
inspected: 0,
percentage: 0,
data: [],
},
];
getHigherTasks() { getHigherTasks() {
this.cardData.forEach((item, key) => { this.cardData.forEach((item, key) => {
item.data = [] item.data = [];
item.passed = 0 item.passed = 0;
item.inspected = 0 item.inspected = 0;
}); });
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' let selectedTime =
this.selectedYear + '-' + this.selectedMonth + '-' + '01';
let params = { let params = {
Month: selectedTime, Month: selectedTime,
OrganizationId: this.OrganizationId, OrganizationId: this.OrganizationId,
PageNumber: 1, PageNumber: 1,
CreationTypes: ['上级指派'], CreationTypes: ['上级指派'],
PageSize: 9999 PageSize: 9999,
} };
this.http.get('/api/PlanTasks', { this.http
params: params .get('/api/PlanTasks', {
}).subscribe((data: any) => { params: params,
})
.subscribe((data: any) => {
data.items.forEach((element) => {
this.cardData.forEach((item, key) => {
element.taskType == item.name
? this.cardData[key].data.push(element)
: null;
});
});
data.items.forEach(element => { this.cardData.forEach((element) => {
this.cardData.forEach((item, key) => { element.data.forEach((item) => {
element.taskType == item.name ? this.cardData[key].data.push(element) : null item.approvalStatus == '通过' ? (element.passed += 1) : null;
item.approvalStatus == '已检查 ' ? (element.inspected += 1) : null;
});
});
this.cardData.forEach((element) => {
element.percentage =
Math.round((element.inspected / element.data.length) * 100) || 0;
}); });
this.cardData = [...this.cardData];
}); });
this.cardData.forEach(element => {
element.data.forEach(item => {
item.approvalStatus == '通过' ? element.passed += 1 : null
item.approvalStatus == '已检查 ' ? element.inspected += 1 : null
})
})
this.cardData.forEach(element => {
element.percentage = Math.round((element.inspected / element.data.length) * 100) || 0
})
this.cardData = [...this.cardData]
})
} }
openDetails(data, type) { openDetails(data, type) {
this.ngZone.run(() => { this.ngZone.run(() => {
//这里写需要立即渲染的代码 //这里写需要立即渲染的代码
data.isDetails = type data.isDetails = type;
}); });
} }
//下级任务申请打开关闭 //下级任务申请打开关闭
expand(data) { expand(data) {
this.ngZone.run(() => { this.ngZone.run(() => {
//这里写需要立即渲染的代码 //这里写需要立即渲染的代码
data.isExpand = !data.isExpand data.isExpand = !data.isExpand;
}); });
} }
istaskauditExpanded = true istaskauditExpanded = true;
istaskauditexpand() { istaskauditexpand() {
this.istaskauditExpanded = !this.istaskauditExpanded this.istaskauditExpanded = !this.istaskauditExpanded;
} }
taskData = [ taskData = [
{ id: 0, name: '熟悉演练任务', finished: 0, totalCount: 0, list: [], isExpand: true }, {
{ id: 1, name: '联络指导任务', finished: 0, totalCount: 0, list: [], isExpand: true }, id: 0,
{ id: 2, name: '双随机任务', finished: 0, totalCount: 0, list: [], isExpand: true } name: '熟悉演练任务',
] finished: 0,
totalCount: 0,
list: [],
isExpand: true,
},
{
id: 1,
name: '联络指导任务',
finished: 0,
totalCount: 0,
list: [],
isExpand: true,
},
{
id: 2,
name: '双随机任务',
finished: 0,
totalCount: 0,
list: [],
isExpand: true,
},
];
getTaskList() { getTaskList() {
this.taskData = [ this.taskData = [
{ id: 0, name: '熟悉演练任务', finished: 0, totalCount: 0, list: [], isExpand: true }, {
{ id: 1, name: '联络指导任务', finished: 0, totalCount: 0, list: [], isExpand: true }, id: 0,
{ id: 2, name: '双随机任务', finished: 0, totalCount: 0, list: [], isExpand: true } name: '熟悉演练任务',
finished: 0,
] totalCount: 0,
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' list: [],
isExpand: true,
},
{
id: 1,
name: '联络指导任务',
finished: 0,
totalCount: 0,
list: [],
isExpand: true,
},
{
id: 2,
name: '双随机任务',
finished: 0,
totalCount: 0,
list: [],
isExpand: true,
},
];
let selectedTime =
this.selectedYear + '-' + this.selectedMonth + '-' + '01';
let params = { let params = {
Month: selectedTime, Month: selectedTime,
OrganizationId: this.OrganizationId, OrganizationId: this.OrganizationId,
CreationTypes: ['申领任务'], CreationTypes: ['申领任务'],
PageNumber: 1, PageNumber: 1,
PageSize: 9999 PageSize: 9999,
} };
this.http.get('/api/PlanTasks', { this.http
params: params .get('/api/PlanTasks', {
}).subscribe((data: any) => { params: params,
let arr1 = [] })
let arr2 = [] .subscribe((data: any) => {
let arr3 = [] let arr1 = [];
data.items.forEach(element => { let arr2 = [];
if (element.taskName == '熟悉演练') { let arr3 = [];
arr1.push(element) data.items.forEach((element) => {
} if (element.taskName == '熟悉演练') {
if (element.taskName == '联络指导') { arr1.push(element);
arr2.push(element) }
} if (element.taskName == '联络指导') {
if (element.taskName == '双随机') { arr2.push(element);
arr3.push(element) }
} if (element.taskName == '双随机') {
}); arr3.push(element);
arr1.forEach(item => { }
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') { });
this.taskData[0].finished += 1 arr1.forEach((item) => {
} if (
}); item.approvalStatus == '通过' ||
arr2.forEach(item => { item.approvalStatus == '待检查' ||
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') { item.approvalStatus == '已检查'
this.taskData[1].finished += 1 ) {
} this.taskData[0].finished += 1;
}); }
arr3.forEach(item => { });
if (item.approvalStatus == '通过' || item.approvalStatus == '待检查' || item.approvalStatus == '已检查') { arr2.forEach((item) => {
this.taskData[2].finished += 1 if (
} item.approvalStatus == '通过' ||
item.approvalStatus == '待检查' ||
item.approvalStatus == '已检查'
) {
this.taskData[1].finished += 1;
}
});
arr3.forEach((item) => {
if (
item.approvalStatus == '通过' ||
item.approvalStatus == '待检查' ||
item.approvalStatus == '已检查'
) {
this.taskData[2].finished += 1;
}
});
this.taskData[0].list = [...arr1];
this.taskData[1].list = [...arr2];
this.taskData[2].list = [...arr3];
console.log('下级任务申请', this.taskData);
}); });
this.taskData[0].list = [...arr1]
this.taskData[1].list = [...arr2]
this.taskData[2].list = [...arr3]
console.log('下级任务申请', this.taskData)
})
} }
assitantsupervisorList assitantsupervisorList;
mainsupervisorList mainsupervisorList;
getSupervisor(type) { getSupervisor(type) {
let params = { let params = {
inspectorType: type inspectorType: type,
} };
this.http.get('/api/Users/Inspectors', { this.http
params: params .get('/api/Users/Inspectors', {
}).subscribe((data: any) => { params: params,
console.log('检查员列表', data) })
if (type == 'main') { .subscribe((data: any) => {
this.mainsupervisorList = data console.log('检查员列表', data);
} else { if (type == 'main') {
this.assitantsupervisorList = data this.mainsupervisorList = data;
} } else {
}) this.assitantsupervisorList = data;
}
});
} }
allot(item) { allot(item) {
console.log(item) console.log(item);
if (this.mainsupervisorList.length == 0 || this.assitantsupervisorList.length == 0) { if (
this.mainsupervisorList.length == 0 ||
this.assitantsupervisorList.length == 0
) {
this.message.create('warning', '请从用户管理添加检查人员'); this.message.create('warning', '请从用户管理添加检查人员');
return return;
} }
const modal = this.modal.create({ const modal = this.modal.create({
nzTitle: '分配监督检查员', nzTitle: '分配监督检查员',
@ -253,191 +381,332 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
nzMaskClosable: false, nzMaskClosable: false,
nzComponentParams: { nzComponentParams: {
mainsupervisorList: this.mainsupervisorList, mainsupervisorList: this.mainsupervisorList,
assitantsupervisorList: this.assitantsupervisorList assitantsupervisorList: this.assitantsupervisorList,
}, },
nzOnOk: async () => { nzOnOk: async () => {
if (instance.validateForm.valid) { if (instance.validateForm.valid) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
let body = { let body = {
mainSupervisorId: instance.validateForm.value.main, mainSupervisorId: instance.validateForm.value.main,
assitantSupervisorId: instance.validateForm.value.assitant assitantSupervisorId: 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) => {
this.message.create('success', '分配成功'); this.message.create('success', '分配成功');
resolve(data) resolve(data);
console.log(data); console.log(data);
this.getTaskList() this.getTaskList();
return true return true;
}, },
error: (err) => { error: (err) => {
this.message.create('warning', '分配失败'); this.message.create('warning', '分配失败');
reject(err) reject(err);
return false return false;
} },
}) });
}) });
} else { } else {
this.message.create('warning', '请填写完整！'); this.message.create('warning', '请填写完整！');
return false return false;
} }
} },
}); });
const instance = modal.getContentComponent(); const instance = modal.getContentComponent();
modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!')); modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result)); modal.afterClose.subscribe((result) =>
console.log('[afterClose] The result is:', result)
);
} }
//获得统计信息 //获得统计信息
countStat: any = { countStat: any = {
statistics1: { statistics1: {
num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 num: 0,
percentageComplete: 0,
item1: 0,
item2: 0,
item3: 0,
}, },
statistics2: { statistics2: {
num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 num: 0,
percentageComplete: 0,
item1: 0,
item2: 0,
item3: 0,
}, },
statistics3: { statistics3: {
num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 num: 0,
} percentageComplete: 0,
} item1: 0,
item2: 0,
item3: 0,
},
};
getCountStat() { getCountStat() {
function integer(num) { function integer(num) {
return Math.round(num * 100) || 0 return Math.round(num * 100) || 0;
} }
let selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth; let selectedMonth =
let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01' this.selectedMonth < 10 ? '0' + this.selectedMonth : this.selectedMonth;
this.http.get('/api/PlanTasks/GetCountStat', { let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01';
params: { this.http
month: selectedTime .get('/api/PlanTasks/GetCountStat', {
} params: {
}).subscribe(data => { month: selectedTime,
console.log('统计信息', data)
this.countStat = {
statistics1: {
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['消防救援任务总数']['总数']) .subscribe((data) => {
}, console.log('统计信息', data);
statistics3: { this.countStat = {
num: data['检查员任务总数']['总数'], percentageComplete: integer(data['检查员任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['检查员任务总数']['上级指派'] / data['检查员任务总数']['总数']), item2: integer(data['检查员任务总数']['自主任务'] / data['检查员任务总数']['总数']), item3: integer(data['检查员任务总数']['申领任务'] / data['检查员任务总数']['总数']) statistics1: {
} 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['消防救援任务总数']['总数']
),
},
statistics3: {
num: data['检查员任务总数']['总数'],
percentageComplete: integer(
data['检查员任务总数']['已完成'] / data['任务总数']['总数']
),
item1: integer(
data['检查员任务总数']['上级指派'] /
data['检查员任务总数']['总数']
),
item2: integer(
data['检查员任务总数']['自主任务'] /
data['检查员任务总数']['总数']
),
item3: integer(
data['检查员任务总数']['申领任务'] /
data['检查员任务总数']['总数']
),
},
};
});
} }
//本级部署打开关闭 //本级部署打开关闭
isdeployboxExpanded = true isdeployboxExpanded = true;
isdeployboxexpand() { isdeployboxexpand() {
this.isdeployboxExpanded = !this.isdeployboxExpanded this.isdeployboxExpanded = !this.isdeployboxExpanded;
} }
formatOne = (percent: number): string => `${percent}%\n完成率`; formatOne = (percent: number): string => `${percent}%\n完成率`;
//获得辖区下所有救援站 //获得辖区下所有救援站
stationData = [] stationData = [];
getAllStation() { getAllStation() {
let params = { let params = {
ContainsChildren: "true", ContainsChildren: 'true',
PageNumber: 1, PageNumber: 1,
PageSize: 9999 PageSize: 9999,
} };
this.http.get('/api/Organizations', { this.http
params: params .get('/api/Organizations', {
}).subscribe((data: any) => { params: params,
this.ngZone.run(() => {
data.items = data.items.filter(element => {
return element.level == 'squadron'
});
data.items.forEach(element => {
element.isExpand = false
element.isLoading = false
});
this.stationData = data.items
this.stationData[0].isExpand = true
this.stationData.forEach(item => {
this.getTaskListOfStation(item)
})
}) })
.subscribe((data: any) => {
}) this.ngZone.run(() => {
// data.items = data.items.filter((element) => {
// return element.level == 'squadron';
// });
data.items.forEach((element) => {
element.isExpand = false;
element.isLoading = false;
});
this.stationData = data.items;
this.stationData[0].isExpand = true;
this.stationData.forEach((item) => {
this.getTaskListOfStation(item);
});
});
});
} }
expandcarditem(item) { expandcarditem(item) {
item.isExpand = !item.isExpand item.isExpand = !item.isExpand;
} }
//获得消防站下的所有任务 //获得消防站下的所有任务
getTaskListOfStation(item) { getTaskListOfStation(item) {
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' let selectedTime =
this.selectedYear + '-' + this.selectedMonth + '-' + '01';
let params = { let params = {
Month: selectedTime, Month: selectedTime,
CompanyOrganizationId: item.id, CompanyOrganizationId: item.id,
PageNumber: 1, PageNumber: 1,
approvalStatuses: ['通过', '待检查', '已检查'], approvalStatuses: ['通过', '待检查', '已检查'],
PageSize: 9999 PageSize: 9999,
} };
item.isLoading = true item.isLoading = true;
this.http.get('/api/PlanTasks', { this.http
params: params .get('/api/PlanTasks', {
}).subscribe({ params: params,
next: (data: any) => { })
item.isLoading = false .subscribe({
let listData = [ next: (data: any) => {
{ name: '双随机', background: '#1D9DFF', icon: 'suiji.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, item.isLoading = false;
{ name: '行政许可', background: '#42B983', icon: 'xuke.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, let listData = [
{ name: '熟悉演练', background: '#9D80FF', icon: 'yanlian.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, {
{ name: '联络指导', background: '#5483EA', icon: 'zhidao.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, name: '双随机',
{ name: '消防宣传', background: '#FF5D2A', icon: 'xuanchuan.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, background: '#1D9DFF',
{ name: '投诉举报', background: '#5087FF', icon: 'tousu.png', scale: '0/0', data: [], inspected: 0, finished: 0 }, icon: 'suiji.png',
{ name: '火灾调查', background: '#FF404D', icon: 'huozai.png', scale: '0/0', data: [], inspected: 0, finished: 0 } scale: '0/0',
] data: [],
data.items.forEach(element => { inspected: 0,
listData.forEach((item, key) => { finished: 0,
element.taskType == item.name ? listData[key].data.push(element) : null },
{
name: '行政许可',
background: '#42B983',
icon: 'xuke.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
{
name: '熟悉演练',
background: '#9D80FF',
icon: 'yanlian.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
{
name: '联络指导',
background: '#5483EA',
icon: 'zhidao.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
{
name: '消防宣传',
background: '#FF5D2A',
icon: 'xuanchuan.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
{
name: '投诉举报',
background: '#5087FF',
icon: 'tousu.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
{
name: '火灾调查',
background: '#FF404D',
icon: 'huozai.png',
scale: '0/0',
data: [],
inspected: 0,
finished: 0,
},
];
data.items.forEach((element) => {
listData.forEach((item, key) => {
element.taskType == item.name
? listData[key].data.push(element)
: null;
});
}); });
}); for (let index = 0; index < listData.length; index++) {
for (let index = 0; index < listData.length; index++) { const element = listData[index];
const element = listData[index]; if (element.data.length == 0) {
if (element.data.length == 0) { listData.splice(index, 1);
listData.splice(index, 1) index--;
index-- }
} }
} item.data = listData;
item.data = listData console.log('当前登录用户所有通过的任务', item);
console.log('当前登录用户所有通过的任务', item); item.allUnitsNum = 0;
item.allUnitsNum = 0 item.awaitInspect = 0;
item.awaitInspect = 0 item.inspected = 0;
item.inspected = 0 item.finished = 0;
item.finished = 0 item.data.forEach((element) => {
item.data.forEach(element => { item.allUnitsNum += element.data.length;
item.allUnitsNum += element.data.length element.data.forEach((i) => {
element.data.forEach(i => { i.approvalStatus == '待检查' ? (item.awaitInspect += 1) : null;
i.approvalStatus == '待检查' ? item.awaitInspect += 1 : null i.approvalStatus == '已检查' ? (item.inspected += 1) : null;
i.approvalStatus == '已检查' ? item.inspected += 1 : null i.approvalStatus == '待检查' ? (element.inspected += 1) : null;
i.approvalStatus == '待检查' ? element.inspected += 1 : null i.approvalStatus == '已检查' ? (element.finished += 1) : null;
i.approvalStatus == '已检查' ? element.finished += 1 : null });
}); });
}); item.percentage = Math.round(
item.percentage = Math.round((item.inspected / item.allUnitsNum) * 100) (item.inspected / item.allUnitsNum) * 100
);
},
error: (err) => {
this.message.create('warning', '获取数据失败');
item.isLoading = false;
},
});
}
checkTime(e, i, element) {
if (e) {
let time = new Date(
moment(e).format('yyyy-MM-DD HH:mm:ss')
).toISOString();
i.planTime = time;
} else {
i.planTime = null;
}
let month = moment(e).format('yyyy-MM-01')
element.isLoading = true;
let body = {
planTime: i.planTime,
month:month
};
this.http.patch(`/api/PlanTasks/${i.id}`, body).subscribe({
next: (data) => {
this.message.create('success', '检查日期分配成功');
element.isLoading = false;
}, },
error: (err) => { error: (err) => {
this.message.create('warning', '获取数据失败'); this.message.create('warning', '检查日期分配失败');
item.isLoading = false element.isLoading = false;
} },
}) });
} }
} }

Write Preview
Loading…
Cancel
Save