diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html index fc2ec10..042f91c 100644 --- a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html +++ b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html @@ -40,7 +40,7 @@ 完成率 {{item.percentage}}%

- @@ -150,43 +150,46 @@
任务总数 + {{countStat.statistics1.num}}
完成 -
+ [nzPercent]="countStat.statistics1.percentageComplete" nzStrokeColor="#87D068" + [nzShowInfo]="false" [nzStrokeWidth]="18"> - 75% + {{countStat.statistics1.percentageComplete}}% - -
-
-
- +
-
+
上级指派46%
+ style="margin-right: 5px;">上级指派{{countStat.statistics1.item1}}% +
自主任务46%
+ style="margin-right: 5px;">自主任务{{countStat.statistics1.item2}}% +
申领任务46%
+ style="margin-right: 5px;">申领任务{{countStat.statistics1.item3}}% +
@@ -195,6 +198,8 @@
消防救援任务总数 + {{countStat.statistics2.num}}
@@ -204,31 +209,37 @@ + [nzPercent]="countStat.statistics2.percentageComplete" nzStrokeColor="#87D068" + [nzShowInfo]="false" [nzStrokeWidth]="18"> - 75% + {{countStat.statistics2.percentageComplete}}%
- +
-
+
上级指派46%
+ style="margin-right: 5px;">上级指派{{countStat.statistics2.item1}}% +
-
+
自主任务46%
+ style="margin-right: 5px;">自主任务{{countStat.statistics2.item2}}% +
申领任务46%
+ style="margin-right: 5px;">申领任务{{countStat.statistics2.item3}}% +
@@ -237,6 +248,8 @@
检查员任务总数 + {{countStat.statistics3.num}}
@@ -246,31 +259,37 @@ + [nzPercent]="countStat.statistics3.percentageComplete" nzStrokeColor="#E6D91D" + [nzShowInfo]="false" [nzStrokeWidth]="18"> - 75% + {{countStat.statistics3.percentageComplete}}%
- +
-
+
上级指派46%
+ style="margin-right: 5px;">上级指派{{countStat.statistics3.item1}}% +
-
+
自主任务46%
+ style="margin-right: 5px;">自主任务{{countStat.statistics3.item2}}% +
申领任务46%
+ style="margin-right: 5px;">申领任务{{countStat.statistics3.item3}}% +
@@ -298,7 +317,7 @@
完成进度 -
@@ -320,7 +339,7 @@ {{item.inspected}}
-
+
已完成 {{item.finished}}
diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss index 1d880b9..3eae21b 100644 --- a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss +++ b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss @@ -359,7 +359,7 @@ justify-content: space-between; .deploycontentitem { - width: 32%; + width: 33%; height: 110px; background: linear-gradient(180deg, #7AA3FC 0%, #2C4DC0 100%); box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); @@ -380,6 +380,8 @@ .title { text-align: left; + display: flex; + align-items: center; } .details { @@ -454,7 +456,7 @@ .deploycontentitem:nth-child(3) { - background: linear-gradient(180deg, #73D9AA 0%, #42B983 100%); + background: linear-gradient(180deg, #9ef3cc 0%, #42B983 100%); } } } diff --git a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts index a5ff8bd..bc3db28 100644 --- a/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts +++ b/src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts @@ -20,13 +20,14 @@ export class DaMonthlyTaskOverviewComponent implements OnInit { this.getHigherTasks() this.getTaskList() this.getAllStation() + this.getCountStat() } selectYear(e) { this.selectedYear = e - console.log('年', e) this.getHigherTasks() this.getTaskList() this.getAllStation() + this.getCountStat() } months = [ { id: 1, name: '1月', isable: true }, @@ -59,6 +60,9 @@ export class DaMonthlyTaskOverviewComponent implements OnInit { this.getSupervisor('main') this.getSupervisor('assisted') + //统计信息 + this.getCountStat() + //本级部署 this.getAllStation() } @@ -93,22 +97,22 @@ export class DaMonthlyTaskOverviewComponent implements OnInit { 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((item, key) => { + element.taskType == item.name ? this.cardData[key].data.push(element) : null }); + }); - 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.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] + }) + this.cardData.forEach(element => { + element.percentage = Math.round(element.inspected / element.data.length) * 100 || 0 + }) + this.cardData = [...this.cardData] }) } @@ -263,6 +267,45 @@ export class DaMonthlyTaskOverviewComponent implements OnInit { + //获得统计信息 + countStat: any = { + statistics1: { + num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 + }, + statistics2: { + num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 + }, + statistics3: { + num: 0, percentageComplete: 0, item1: 0, item2: 0, item3: 0 + } + } + getCountStat() { + function integer(num) { + return Math.round(num * 100) || 0 + } + let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' + this.http.get('/api/PlanTasks/GetCountStat').subscribe(data => { + 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['消防救援任务总数']['总数']) + }, + statistics3: { + num: data['检查员任务总数']['总数'], percentageComplete: integer(data['任务总数']['已完成'] / data['任务总数']['总数']), item1: integer(data['检查员任务总数']['上级指派'] / data['检查员任务总数']['总数']), item2: integer(data['检查员任务总数']['自主任务'] / data['检查员任务总数']['总数']), item3: integer(data['检查员任务总数']['申领任务'] / data['检查员任务总数']['总数']) + } + } + }) + } + + + + + + + //本级部署打开关闭 diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.ts b/src/app/home/task/station-task-apply/station-task-apply.component.ts index c78fa9a..4f7954d 100644 --- a/src/app/home/task/station-task-apply/station-task-apply.component.ts +++ b/src/app/home/task/station-task-apply/station-task-apply.component.ts @@ -280,7 +280,9 @@ export class StationTaskApplyComponent implements OnInit { console.log(instance.validateForm.value) if (instance.validateForm.valid) { await new Promise((resolve, reject) => { + let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' let body = { + month: selectedTime, taskName: instance.validateForm.value.taskname, taskType: instance.validateForm.value.taskname, companyId: instance.validateForm.value.unitname, diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts index 28ee8ba..ce4727a 100644 --- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts +++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts @@ -476,7 +476,9 @@ export class StationWeeklyPlanComponent implements OnInit { console.log(instance.validateForm.value) if (instance.validateForm.valid) { await new Promise((resolve, reject) => { + let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' let body = { + month: selectedTime, taskName: instance.validateForm.value.taskname, taskType: instance.validateForm.value.taskname, companyId: instance.validateForm.value.unitname.id, diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts index 2e674fd..42f2e26 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts @@ -455,8 +455,10 @@ export class ZhiIndicatorsComponent implements OnInit { let arr = [...data.search1Value, ...data.search2Value] let arrSet = [...new Set(arr)] data.isLoading = true + let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' this.http.post(`/api/PlanTasks/Many`, null, { params: { + month: selectedTime, companyIds: arrSet, taskType: type }