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 bc3db28..2e9a563 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
@@ -283,8 +283,13 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
function integer(num) {
return Math.round(num * 100) || 0
}
- let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
- this.http.get('/api/PlanTasks/GetCountStat').subscribe(data => {
+ let selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth;
+ let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01'
+ this.http.get('/api/PlanTasks/GetCountStat', {
+ params: {
+ month: selectedTime
+ }
+ }).subscribe(data => {
console.log('统计信息', data)
this.countStat = {
statistics1: {
diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
index 03edaf1..e86125b 100644
--- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
+++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
@@ -25,12 +25,14 @@ export class DaOneselfPlanComponent implements OnInit {
selectedTime
selectMonth(item) {
this.selectedMonth = item.id
- // this.getTaskList()
+ this.getTasks()
+ this.getAllStation()
}
selectYear(e) {
this.selectedYear = e
console.log('年', e)
- // this.getTaskList()
+ this.getTasks()
+ this.getAllStation()
}
months = [
{ id: 1, name: '1月', isable: true },
@@ -55,7 +57,7 @@ export class DaOneselfPlanComponent implements OnInit {
formatOne = (percent: number): string => `${percent}%\n完成率`;
- //上级任务指标
+ //上部卡片
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: [] },
@@ -65,8 +67,16 @@ export class DaOneselfPlanComponent implements OnInit {
{ 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: [] }
]
+ openDetails(data, type) {
+ data.isDetails = type
+ }
async getTasks() {
+ this.cardData.forEach((item, key) => {
+ item.data = []
+ item.passed = 0
+ item.inspected = 0
+ });
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
let params = {
Month: selectedTime,
@@ -100,38 +110,6 @@ export class DaOneselfPlanComponent implements OnInit {
})
})
}
- openDetails(data, type) {
- data.isDetails = type
- }
-
-
-
- radioChange(e) {
- }
-
-
-
-
- nodes: any = []
- BuildingTypes
- adjustment(item) {
- console.log(item)
- const modal = this.modal.create({
- nzTitle: "任务调整",
- nzContent: PlanAdjustmentComponent,
- nzViewContainerRef: this.viewContainerRef,
- nzWidth: 900,
- nzComponentParams: {
-
- },
- nzOnOk: async () => {
- console.log(123);
- }
- });
- const instance = modal.getContentComponent();
-
- }
-
@@ -161,7 +139,6 @@ export class DaOneselfPlanComponent implements OnInit {
}
expandcarditem(item) {
item.isExpand = !item.isExpand
-
}
//获得消防站下的所有任务
PageNumber = 1
@@ -225,4 +202,26 @@ export class DaOneselfPlanComponent implements OnInit {
}
})
}
+
+
+
+
+ nodes: any = []
+ BuildingTypes
+ adjustment(item) {
+ const modal = this.modal.create({
+ nzTitle: "任务调整",
+ nzContent: PlanAdjustmentComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 900,
+ nzFooter: null,
+ nzComponentParams: {
+ data: item
+ }
+ });
+ const instance = modal.getContentComponent();
+ modal.afterClose.subscribe(result => {
+ this.getTaskListOfStation(item)
+ });
+ }
}
diff --git a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html
index 8ebc569..caf21ce 100644
--- a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html
+++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html
@@ -6,13 +6,14 @@
{{item.tag}}
-
+
-
\ No newline at end of file
diff --git a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
index c7e8546..6d67bb6 100644
--- a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
+++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-plan-adjustment',
@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./plan-adjustment.component.scss']
})
export class PlanAdjustmentComponent implements OnInit {
-
+ @Input() data?: any;
constructor() { }
list = [
{
@@ -37,34 +37,35 @@ export class PlanAdjustmentComponent implements OnInit {
list2 = [
]
- taskNumber=0
- task=false
+ taskNumber = 0
+ task = false
ngOnInit(): void {
+ console.log(this.data)
}
aaa(data) {
- if(data.checked && !this.task){
- this.list2.push({meu:this.list2.length,data})
+ if (data.checked && !this.task) {
+ this.list2.push({ meu: this.list2.length, data })
console.log(this.list2);
- this.taskNumber=this.list2.length
- if(this.taskNumber==8){
- this.task=true
+ this.taskNumber = this.list2.length
+ if (this.taskNumber == 8) {
+ this.task = true
}
- }else{
+ } else {
this.bbb(data)
}
}
bbb(e) {
console.log(e);
- e.checked=false
+ e.checked = false
for (let index = 0; index < this.list2.length; index++) {
- if(e==this.list2[index].data){
- this.list2.splice(this.list2[index].meu,1)
- this.taskNumber=this.list2.length
- if(this.taskNumber!=8){
- this.task=false
+ if (e == this.list2[index].data) {
+ this.list2.splice(this.list2[index].meu, 1)
+ this.taskNumber = this.list2.length
+ if (this.taskNumber != 8) {
+ this.task = false
}
}
-
+
}
}
}
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 4f7954d..ef04c20 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,8 @@ 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 selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth;
+ let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01'
let body = {
month: selectedTime,
taskName: instance.validateForm.value.taskname,
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 ce4727a..ff4994f 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,8 @@ 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 selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth;
+ let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01'
let body = {
month: selectedTime,
taskName: instance.validateForm.value.taskname,
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 42f2e26..74e421f 100644
--- a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts
+++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts
@@ -455,7 +455,8 @@ 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'
+ let selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth;
+ let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01'
this.http.post(`/api/PlanTasks/Many`, null, {
params: {
month: selectedTime,
@@ -478,7 +479,8 @@ export class ZhiIndicatorsComponent implements OnInit {
//双随机/熟悉演练 选择单位 确认按钮
selectedUnit2(data, type) {
- let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
+ let selectedMonth = this.selectedMonth < 10 ? "0" + this.selectedMonth : this.selectedMonth;
+ let selectedTime = this.selectedYear + '-' + selectedMonth + '-' + '01'
let arr = [...data.search1Value, ...data.search2Value]
let body = [...new Set(arr)]
data.isLoading = true