@@ -336,7 +336,7 @@
已分配
- {{item.inspected}}
+ {{item.data.length}}
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 2e9a563..2ffbd38 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
@@ -17,6 +17,7 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
selectedTime
selectMonth(item) {
this.selectedMonth = item.id
+ this.getTuesdayThursdayNum()
this.getHigherTasks()
this.getTaskList()
this.getAllStation()
@@ -24,11 +25,24 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
}
selectYear(e) {
this.selectedYear = e
+ this.getTuesdayThursdayNum()
this.getHigherTasks()
this.getTaskList()
this.getAllStation()
this.getCountStat()
+
}
+
+ //当月有几个周二周四
+ TuesdayThursdayNum = 0
+ getTuesdayThursdayNum() {
+ let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
+ this.http.get(`/api/TaskTargets/GetTargetCount/${selectedTime}`).subscribe((data: any) => {
+ console.log('最大日期', data)
+ this.TuesdayThursdayNum = data
+ })
+ }
+
months = [
{ id: 1, name: '1月', isable: true },
{ id: 2, name: '2月', isable: true },
@@ -62,7 +76,7 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
//统计信息
this.getCountStat()
-
+ this.getTuesdayThursdayNum()
//本级部署
this.getAllStation()
}
diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html
index bf7885d..82cae9e 100644
--- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html
+++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html
@@ -95,7 +95,7 @@
- 单位总数:{{element.awaitInspect}}/{{element.allUnitsNum}}
+ 单位总数:{{element.allUnitsNum}}/{{TuesdayThursdayNum}}
@@ -119,7 +119,7 @@
已分配
- {{item.inspected}}
+ {{item.data.length}}
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 c834595..c277793 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
@@ -19,21 +19,35 @@ export class DaOneselfPlanComponent implements OnInit {
this.selectedMonth = new Date().getMonth() + 1
this.getTasks()
this.getAllStation()
+ this.getTuesdayThursdayNum()
}
selectedMonth
selectedYear = 2022
selectedTime
selectMonth(item) {
this.selectedMonth = item.id
+ this.getTuesdayThursdayNum()
this.getTasks()
this.getAllStation()
}
selectYear(e) {
this.selectedYear = e
console.log('年', e)
+ this.getTuesdayThursdayNum()
this.getTasks()
this.getAllStation()
}
+
+ //当月有几个周二周四
+ TuesdayThursdayNum = 0
+ getTuesdayThursdayNum() {
+ let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
+ this.http.get(`/api/TaskTargets/GetTargetCount/${selectedTime}`).subscribe((data: any) => {
+ console.log('最大日期', data)
+ this.TuesdayThursdayNum = data
+ })
+ }
+
months = [
{ id: 1, name: '1月', isable: true },
{ id: 2, name: '2月', isable: true },
diff --git a/src/app/home/task/station-task-apply/apply/apply.component.ts b/src/app/home/task/station-task-apply/apply/apply.component.ts
index 81d11c7..33d9f4a 100644
--- a/src/app/home/task/station-task-apply/apply/apply.component.ts
+++ b/src/app/home/task/station-task-apply/apply/apply.component.ts
@@ -33,13 +33,10 @@ export class ApplyComponent implements OnInit {
Promise.all([this.getCompanies(), this.getAllOrganization()])
.then((results) => {
-
let arr = [...JSON.parse(JSON.stringify(this.allOrList)), ...JSON.parse(JSON.stringify(this.unitList))]
- console.log(789456, this.allOrList)
- console.log(789456, this.unitList)
let nodes = [...this.toTree.toTree(arr)]
+ console.log('6666',nodes)
this.unitPopover.nodes = JSON.parse(JSON.stringify(nodes))
-
});
}
@@ -66,7 +63,12 @@ export class ApplyComponent implements OnInit {
element.disableCheckbox = true
});
this.allOrList = JSON.parse(JSON.stringify(data.items))
- this.allOrList.length == 1 ? this.allOrList[0].parentId = null : null
+ console.log(111,this.allOrList)
+ this.allOrList.forEach(element => {
+ if(element.id == JSON.parse(sessionStorage.getItem('userData')).organizationId){
+ element.parentId = null
+ }
+ });
resolve(data)
})
})
diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.html b/src/app/home/task/station-task-apply/station-task-apply.component.html
index 03cc44b..9dd6671 100644
--- a/src/app/home/task/station-task-apply/station-task-apply.component.html
+++ b/src/app/home/task/station-task-apply/station-task-apply.component.html
@@ -85,7 +85,7 @@
[ngClass]="{'greenborder': item.approvalStatus == '通过','redborder': item.approvalStatus == '驳回'}">
- {{item.taskName}}
+ {{item.taskType}}
任务名称
@@ -117,25 +117,41 @@
-
- 
- 
- {{i.name}}
-
+
+
+ {{i.name}}
+
+
+
+
+
+
+ {{i.name}}
+
+
-
-
-
- {{i.name}}
-
+
+
+ {{i.name}}
+
+
+
+
+
+
+ {{i.name}}
+
+
+
+
- 协助人员
+ {{isSupervisor ? '协助机构' : '协助人员'}}
-
- {{i.name}}
-
+
+
+ {{i.name}}
+
+
-
- {{i.name}}
-
+
+
+ {{i.name}}
+
+
@@ -149,13 +165,13 @@
+ *ngIf="item.approvalStatus == '通过'|| item.approvalStatus == '驳回' ; else elseTemplate4">
-
+
{{item.approvalStatus}}
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 0e1d83b..19544f9 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
@@ -55,12 +55,6 @@ export class StationTaskApplyComponent implements OnInit {
this.getTaskList()
}
- cancel(item, type) {
-
- }
- delete(item) {
-
- }
isloading = false
totalCount
@@ -72,12 +66,13 @@ export class StationTaskApplyComponent implements OnInit {
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
let params = {
Month: selectedTime,
- OrganizationId: this.OrganizationId,
TaskName: this.searchForm.taskname,
CompanyName: this.searchForm.unitname,
AssitantOrganizationId: this.searchForm.or,
+ CreatorId: this.isSupervisor ? this.userId : null,//如果是检查员需要传CreatorId只针对这个账户 如果是救援站就不需要
+ CreationTypes:['申领任务'],
+ OrganizationId: this.OrganizationId,
PageNumber: this.PageNumber,
- CreatorId: this.userId,
PageSize: this.PageSize
}
this.http.get('/api/PlanTasks', {
@@ -130,6 +125,7 @@ export class StationTaskApplyComponent implements OnInit {
element.title = element.name
element.disableCheckbox = true
element.selectable = false
+ element.level == 'squadron' ? element.disableCheckbox = false : null
});
this.organizationListAll = JSON.parse(JSON.stringify(data.items))
this.organizationList = JSON.parse(JSON.stringify(data.items)).filter(item => {
@@ -202,7 +198,8 @@ export class StationTaskApplyComponent implements OnInit {
Promise.all([this.getAllOrganization(), this.getSupervisor(), this.getUsers()])
.then((results) => {
if (this.isSupervisor) {
- let arr = [...this.users, ...this.organizationListAll]
+ // let arr = [...this.users, ...this.organizationListAll]
+ let arr = [...this.organizationListAll]
this.nodes = this.toTree.toTree(JSON.parse(JSON.stringify(arr)))
} else {
let arr = [...this.supervisorList, ...this.organizationList]
@@ -242,13 +239,10 @@ export class StationTaskApplyComponent implements OnInit {
}
}
mouseEnter() {
- // console.log('进入了')
window.clearInterval(this.timer);
}
mouseleave() {
-
this.rollStart()
-
}
ngOnDestroy(): void {
console.log('退出了')
@@ -288,7 +282,8 @@ export class StationTaskApplyComponent implements OnInit {
taskType: instance.validateForm.value.taskname,
companyId: instance.selectedUnitData.id,
organizationId: this.OrganizationId,
- supervisorIds: instance.validateForm.value.organization,
+ supervisorIds: this.isSupervisor ? [] : instance.validateForm.value.organization,
+ assitantOrganizationIds: this.isSupervisor ? instance.validateForm.value.organization : [],
creationType: '申领任务',
approvalStatus: '待处理'
}
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
index 231be00..bc0a800 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
@@ -129,13 +129,14 @@
{{element.name}}
- 单位总数: {{element.awaitInspect}}/{{element.allUnitsNum}}
+ 单位总数: {{element.allUnitsNum}}/{{TuesdayThursdayNum}}
{{element.name}}
- 单位总数: {{element.awaitInspect}}/{{element.allUnitsNum}}
+ 单位总数: {{element.allUnitsNum}}/{{TuesdayThursdayNum}}
完成进度
-
+