From 5b94df69abb872aa0ad3c60a8d6bcfe215b2c8fa Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 20 Aug 2022 15:59:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=95=91=E6=8F=B4=E7=AB=99?= =?UTF-8?q?=E5=92=8C=E6=A3=80=E6=9F=A5=E5=91=98=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.module.ts | 4 +- src/app/home/nav/nav.component.ts | 2 +- .../apply-look/apply-look.component.html | 10 +- .../apply/apply.component.ts | 7 +- .../station-task-apply.component.html | 46 ++- .../station-task-apply.component.scss | 37 ++ .../station-task-apply.component.ts | 103 +++-- .../station-weekly-plan.component.html | 288 ++++++++++--- .../station-weekly-plan.component.scss | 379 ++++++++++++++++-- .../station-weekly-plan.component.ts | 66 ++- src/app/home/task/task.component.html | 12 +- src/styles.scss | 1 + 12 files changed, 804 insertions(+), 151 deletions(-) diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index bd5b9a9..4006b56 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -57,6 +57,7 @@ import { NzSpinModule } from 'ng-zorro-antd/spin'; import { AllotPersonComponent } from './task/da-subordinate-audit/allot-person/allot-person.component'; import { ChangePasswordComponent } from './change-password/change-password.component'; import { NzUploadModule } from 'ng-zorro-antd/upload'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; @NgModule({ declarations: [ NavComponent, @@ -119,7 +120,8 @@ import { NzUploadModule } from 'ng-zorro-antd/upload'; NzRadioModule, NzDatePickerModule, NzSpinModule, - NzUploadModule + NzUploadModule, + NzToolTipModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent] }) diff --git a/src/app/home/nav/nav.component.ts b/src/app/home/nav/nav.component.ts index ccf936b..a812a6f 100644 --- a/src/app/home/nav/nav.component.ts +++ b/src/app/home/nav/nav.component.ts @@ -17,7 +17,7 @@ export class NavComponent implements OnInit { ngOnInit(): void { //调用服务中的function刷新token this.token.startUp() - this.user=JSON.parse(sessionStorage.getItem('userData')).organizationName + this.user=JSON.parse(sessionStorage.getItem('userData')).name } signOut() { this.router.navigate(['/login']) diff --git a/src/app/home/task/station-task-apply/apply-look/apply-look.component.html b/src/app/home/task/station-task-apply/apply-look/apply-look.component.html index 690b770..25347e1 100644 --- a/src/app/home/task/station-task-apply/apply-look/apply-look.component.html +++ b/src/app/home/task/station-task-apply/apply-look/apply-look.component.html @@ -2,5 +2,13 @@

任务名称: {{data.taskName}}

单位名称: {{data.company.companyName}}

-

协助机构: {{data.assitantOrganization.name}}

+

协助人员: + + + + {{i.name}} + +

\ No newline at end of file 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 4b73be2..c3c5730 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 @@ -15,6 +15,8 @@ export class ApplyComponent implements OnInit { @Input() nodes?: any; @Input() supervisorList?: any; @Input() organizationList?: any; + @Input() users?: any; + validateForm!: FormGroup; constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { } @@ -26,8 +28,9 @@ export class ApplyComponent implements OnInit { unitname: [null, [Validators.required]], organization: [null, [Validators.required]] }); - let arr = [...this.supervisorList, ...this.organizationList] - this.newTree = this.toTree.toTree(arr) + // let arr = [...this.supervisorList, ...this.organizationList] + // this.newTree = this.toTree.toTree(arr) + this.newTree = this.nodes } destroyModal(): void { 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 0d25615..450c929 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 @@ -81,10 +81,11 @@ nzTheme="outline">申请
-
+
- 熟悉演练 + {{item.taskName}} 任务名称 @@ -92,7 +93,7 @@
- 尬粒酒店管理有限公司济南泺文路分公司 + {{item.company.companyName}} 单位名称 @@ -100,7 +101,7 @@
- 重点单位 + {{item.company.useNature}} 级别 @@ -108,18 +109,33 @@
- 历下区A消防救援站 + {{item.organization.name}} 主负责人
-
- - 历下区B消防救援站 - - - 协助机构 +
+ + + + + {{i.name}} + + + + + + + {{i.name}} + + + + 协助人员
@@ -132,14 +148,18 @@
- + + + 待处理 结果
- + 查看 diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.scss b/src/app/home/task/station-task-apply/station-task-apply.component.scss index 73f58e0..0a5ecdc 100644 --- a/src/app/home/task/station-task-apply/station-task-apply.component.scss +++ b/src/app/home/task/station-task-apply/station-task-apply.component.scss @@ -5,6 +5,7 @@ display: flex; flex-direction: column; overflow: hidden; + .informbox { width: 100%; height: 60px; @@ -25,6 +26,7 @@ display: flex; align-items: center; margin-right: 20px; + img { margin: 0 20px; } @@ -144,6 +146,7 @@ display: flex; flex-direction: column; overflow-y: auto; + .applybtn { align-self: flex-start; margin: 18px 0; @@ -163,6 +166,7 @@ justify-content: space-around; padding-left: 80px; margin-bottom: 10px; + div { flex: 1; @@ -196,6 +200,29 @@ span:nth-child(2) { color: #C7CAD0; } + + } + + .flexcolassistant { + flex: 2; + overflow: hidden; + .assistant { + + display: flex; + width: 100%; + span { + color: #303133; + margin-right: 6px; + } + img { + width: 16px; + height: 16px; + vertical-align: text-bottom; + } + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } } .unitnamebox { @@ -203,6 +230,16 @@ } } + + .greenborder { + + border: 1px solid #42B983; + } + + .redborder { + + border: 1px solid #FF9203; + } } .operation { 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 f185ca6..995d4f3 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 @@ -7,6 +7,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { TreeService } from 'src/app/service/tree.service'; import { ApplyComponent } from './apply/apply.component'; import { ApplyLookComponent } from './apply-look/apply-look.component'; +import { ThisReceiver } from '@angular/compiler'; @Component({ @@ -67,7 +68,7 @@ export class StationTaskApplyComponent implements OnInit { totalCount PageNumber = 1 PageSize = 10 - taskLIst = [1, 1, 1] + taskLIst = [] getTaskList() { this.isloading = true let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' @@ -78,6 +79,7 @@ export class StationTaskApplyComponent implements OnInit { CompanyName: this.searchForm.unitname, AssitantOrganizationId: this.searchForm.or, PageNumber: this.PageNumber, + CreatorId: this.userId, PageSize: this.PageSize } this.http.get('/api/PlanTasks', { @@ -114,6 +116,7 @@ export class StationTaskApplyComponent implements OnInit { defaultOrId: string //获取所有组织机构 organizationList: any + organizationListAll: any nodes: any = [] async getAllOrganization() { let params = { @@ -130,7 +133,7 @@ export class StationTaskApplyComponent implements OnInit { element.disableCheckbox = true element.selectable = false }); - + this.organizationListAll = JSON.parse(JSON.stringify(data.items)) this.organizationList = JSON.parse(JSON.stringify(data.items)).filter(item => { return item.level != 'squadron' }) @@ -159,8 +162,38 @@ export class StationTaskApplyComponent implements OnInit { }) return p } + + //获得除了检查员的其他用户 + users + async getUsers() { + var p = new Promise((resolve, reject) => { + let params = { + OrganizationId: this.OrganizationId, + OrganizationLevel: 'squadron', + ContainsChildren: true, + PageNumber: 1, + PageSize: 9999 + } + this.http.get('/api/Users', { + params: params + }).subscribe((data: any) => { + console.log('用户列表', data.items) + data.items.forEach(element => { + element.key = element.id + element.title = element.name + element.parentId = element.organizationId + }); + this.users = data.items + resolve(data) + }) + }) + return p + } + + userId ngOnInit(): void { this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId + this.userId = JSON.parse(sessionStorage.getItem('userData')).id let roles = JSON.parse(sessionStorage.getItem('userData')).roles let isSupervisor = roles.find(item => { return item.name.indexOf('检查') != -1 @@ -168,10 +201,11 @@ export class StationTaskApplyComponent implements OnInit { isSupervisor ? this.isSupervisor = true : this.isSupervisor = false this.selectedMonth = new Date().getMonth() + 1 this.getTaskList() - Promise.all([this.getAllOrganization(), this.getSupervisor()]) + Promise.all([this.getAllOrganization(), this.getSupervisor(), this.getUsers()]) .then((results) => { if (this.isSupervisor) { - + let arr = [...this.users, ...this.organizationListAll] + this.nodes = this.toTree.toTree(JSON.parse(JSON.stringify(arr))) } else { let arr = [...this.supervisorList, ...this.organizationList] this.nodes = this.toTree.toTree(JSON.parse(JSON.stringify(arr))) @@ -234,9 +268,10 @@ export class StationTaskApplyComponent implements OnInit { nzMaskClosable: false, nzComponentParams: { title: this.isSupervisor ? ["联络指导", "双随机"] : ["熟悉演练"], - nodes: this.nodes, supervisorList: JSON.parse(JSON.stringify(this.supervisorList)), - organizationList: JSON.parse(JSON.stringify(this.organizationList)) + organizationList: JSON.parse(JSON.stringify(this.organizationList)), + users: JSON.parse(JSON.stringify(this.users)), + nodes: JSON.parse(JSON.stringify(this.nodes)) }, nzOnOk: async () => { console.log(instance.validateForm.value) @@ -244,9 +279,11 @@ export class StationTaskApplyComponent implements OnInit { await new Promise((resolve, reject) => { let body = { taskName: instance.validateForm.value.taskname, - organizationId: this.OrganizationId, + taskType: instance.validateForm.value.taskname, companyId: instance.validateForm.value.unitname, - assitantOrganizationId: instance.validateForm.value.organization, + organizationId: this.OrganizationId, + supervisorIds: instance.validateForm.value.organization, + approvalStatus: '待处理' } this.http.post('/api/PlanTasks', body).subscribe({ next: (data) => { @@ -284,39 +321,29 @@ export class StationTaskApplyComponent implements OnInit { nzComponentParams: { data: item, }, - nzFooter: null, - nzOnOk: async () => { - if (instance.validateForm.valid) { - await new Promise(resolve => { - let roleNames = [...instance.validateForm.value.role, ...instance.validateForm.value.role2] - let body = { - userName: instance.validateForm.value.account, - name: instance.validateForm.value.name, - organizationUnitId: Number(instance.validateForm.value.organization), - roleNames: roleNames, - phoneNumber: instance.validateForm.value.phonenum, - isActive: true - } - // this.http.post(this.addUrl, body).subscribe(data => { - // resolve(data) - // this.message.create('success', '创建成功！'); - // this.SkipCount = 0 - // this.getAllUsers() - // return true - // }, err => { - // resolve(err) - // this.message.create('warning', err.error.error.message); - // return false - // }) - }) - } else { - this.message.create('warning', '请填写完整！'); - return false - } - } + nzFooter: null }); const instance = modal.getContentComponent(); modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!')); modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result)); } + +} + +export enum ApprovalStatus { + 未派发 = 0, + 待处理 = 1, + 通过 = 2, + 驳回 = 3, + 待检查 = 4, + 已检查 = 5, } +export enum TaskType { + 双随机, + 熟悉演练, + 投诉举报, + 行政许可, + 联络指导, + 消防宣传, + 火灾调查 +} \ No newline at end of file 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 46471af..86ff1f1 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 @@ -1,60 +1,242 @@ -
-
-
- - 申请周计划 - - - - 任务申请已开始！剩余时间 3天13小时 / 生成周计划已开始！剩余时间 23:54:03 - +
+
+ + + + +
+ {{item.name}}
-
-
- - - - 任务类型 - 单位名称 - 单位级别 - 检查人 - 消防负责人 - 联系电话 - 操作 - - - - - 双随机 - 上海雅特酒店管理有限公司济南泺文路分公司 - - 一般单位 - - - 张三三 - - - 张三三 - - - 15022667845 - - - - - - - - +
+ +
+ +
+
+ 本级部署 + + {{isExpand ? '收起' :'展开'}} + + +
+
+
+
+
+
+ + {{item.name}} +
+
+

+ 任务分配 + +

+

5/9

+
+ +
+
+ + +
+
+
+

+ {{item.name}} + 返回 +

+
+
+

+ 济南历下森豪室内娱乐场 + + 接受 + 拒绝 + +

+

A消防救援站

+

+ 接受 + 拒绝 +

+
+
+
+
- + + +
+
+
+
+ + + {{item.name}} + + 单位总数: 7/8 +
+ 完成进度 + +
+ + + {{item.isExpand ? '收起' :'展开'}} + + +
+
+
+
+
+ + 重大活动 +
+
+
+ 已分配 + 1 +
+
+
+ 已完成 + 1 +
+
+
+
+
+ + 尬粒酒店管理有限公司济南泺文路分公司 + + + 单位名称 + +
+
+ + 重点单位 + + + 级别 + +
+
+ + 历下区A消防救援站 + + + 责任机构 + +
+
+ + 历下区B消防救援站 + + + 协助机构 + +
+
+ + + + + 同步工作 + +
+
+ + + + + + 进度 + +
+
+ + +
+
+
+
+ + 尬粒酒店管理有限公司济南泺文路分公司 + + + 单位名称 + +
+
+ + 重点单位 + + + 级别 + +
+
+ + 历下区A消防救援站 + + + 责任机构 + +
+
+ + 历下区B消防救援站 + + + 协助机构 + +
+
+ + + + + 同步工作 + +
+
+ + + + + + 进度 + +
+
+ + +
+
+ +
+
+
+
+ +
+
\ No newline at end of file diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss index 033d493..5d7f503 100644 --- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss +++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss @@ -1,52 +1,383 @@ .box { width: 100%; height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} - color: #303133; +.timebox { + width: 100%; + height: 68px; box-sizing: border-box; - padding: 20px; + padding: 0 20px; + display: flex; + align-items: center; + border-bottom: 1px dashed #C7CAD0; - .fffbox { - width: 100%; - height: 100%; + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; background: #FFFFFF; - box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); border-radius: 4px 4px 4px 4px; opacity: 1; border: 1px solid #E4E7EC; - display: flex; - flex-direction: column; + color: #303133; + margin-right: 16px; + cursor: pointer; } + .selectedMonth { - .header { - width: 100%; - height: 56px; + background: #2C4DC0; + color: #FFFFFF; + } +} + +.instrumentpanelbox { + box-sizing: border-box; + padding: 18px; + color: #303133; + + .instrumentpanelheader { display: flex; justify-content: space-between; align-items: center; - padding: 0 20px; - border-bottom: 1px solid #E4E7EC; + margin-bottom: 15px; + } - span { - color: #303133; - font-weight: 500; - font-size: 16px; + .instrumentpanel { + display: flex; + flex-wrap: wrap; + } + + .instrumentpanelitem { + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + display: flex; + + + .itemone { + width: 100%; + height: 100%; + display: flex; + + .instrumentpanelitemleft { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; + flex: 1; + box-sizing: border-box; + + + .panelheadername { + width: 80%; + height: 46px; + line-height: 46px; + text-align: center; + box-sizing: border-box; + border-radius: 6px 0px 6px 6px; + color: #fff; + + img { + vertical-align: text-top; + } + } + + .tasknum { + margin-left: 8px; + + p { + margin: 0; + } + } + + .btn { + margin-left: 8px; + width: 60%; + max-width: 96px; + height: 36px; + border-radius: 4px 4px 4px 4px; + background: #42B983; + color: white; + cursor: pointer; + } + } + + .instrumentpanelitemright { + flex: 1; + display: flex; + align-items: center; + + nz-progress { + margin-top: 65px; + } + } + } + + .itemtwo { + width: 100%; + height: 100%; + display: flex; + box-sizing: border-box; + padding: 16px; + flex-direction: column; + overflow: hidden; + + .itemtwotitle { + display: flex; + justify-content: space-between; + + .back { + cursor: pointer; + + i { + margin-right: 3px; + } + } + + margin-bottom: 0; + } + + .itemtwocontent { + flex: 1; + overflow-y: auto; + display: flex; + flex-direction: column; + + .itemtwocontentitem { + border-bottom: 1px dashed #C7CAD0; + height: 70px; + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; + box-sizing: border-box; + padding: 8px 0; + + p { + margin-bottom: 0; + } + + .itemtwocontentitemp1 { + width: 100%; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding-right: 5px; + + .itemtwocontentitemp1name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + } + } + } + + .instrumentpanelitemopen { + width: 24.3%; + height: 260px; + margin-bottom: 18px; + margin-right: 8px; + .itemone { + .instrumentpanelitemleft { + padding: 26px 0 26px 10%; + } + } + } + + .instrumentpanelitemclose { + width: 11.7%; + height: 200px; + margin-bottom: 0px; + margin-right: 1%; + .itemone { + .instrumentpanelitemleft { + padding: 15px 0 15px 10%; + } } } +} - .content { - flex: 1; +.stationcardlistbox { + .stationcardlistitembox { + width: 100%; + border-top: 1px dashed #C7CAD0; box-sizing: border-box; padding: 18px; - padding-top: 0px; - margin-top: 18px; - .operation { - nz-date-picker { - width: 140px; + .stationcardlistitem { + width: 100%; + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + border: 1px solid #E4E7EC; + color: #303133; + box-sizing: border-box; + padding: 0 18px; + + .header { + width: 100%; + height: 64px; + display: flex; + align-items: center; + text-align: left; + + .progress { + width: 200px; + display: flex; + align-items: center; + + span { + margin-right: 12px; + + } + + nz-progress { + width: 230px; + } + } + + .expand { + margin-left: 20px; + } + } + + .maincontent { + .maincontentitem { + box-sizing: border-box; + padding: 16px; + margin-bottom: 18px; + border-radius: 4px 4px 4px 4px; + border: 1px solid #42B983; + display: flex; + } + + .maincontentitemleft { + width: 170px; + box-sizing: border-box; + padding-right: 40px; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + border-right: 1px dashed #C7CAD0; + + .panelheadername { + width: 90%; + height: 38px; + line-height: 38px; + text-align: center; + box-sizing: border-box; + border-radius: 6px 0px 6px 6px; + color: #fff; + margin-bottom: 8px; + + img { + vertical-align: text-top; + } + } + + .num { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 8px; + + .round { + width: 8px; + height: 8px; + } + + .word { + margin: 0 6px; + } + + .boldspan { + font-weight: 800; + font-size: 25px; + } + } + } + + .maincontentitemright { + flex: 1; + box-sizing: border-box; + padding-left: 40px; + display: flex; + flex-direction: column; + justify-content: space-around; + // align-items: center; + + .maincontentitemrightitem { + display: flex; + align-items: center; + box-sizing: border-box; + padding: 12px 0px; + border-bottom: 1px dashed #C7CAD0; + + + + .flexcol { + display: flex; + flex-direction: column; + align-items: flex-start; + margin-right: 3%; + + span:nth-child(1) { + color: #303133; + margin-bottom: 8px; + } + + span:nth-child(2) { + color: #C7CAD0; + } + } + + .namebox { + width: 28%; + } + + .progressbox { + width: 220px; + + span:nth-child(1) { + width: 100%; + } + } + + .btnbox { + display: flex; + justify-content: flex-end; + align-self: flex-start; + } + } + + div:last-child { + border-bottom: 0px; + } + } } } } + +} + +.cutoffrule { + width: 100%; + border-top: 1px dashed #C7CAD0; } 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 0da35cd..7d4356c 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 @@ -12,28 +12,64 @@ import { TreeService } from 'src/app/service/tree.service'; }) export class StationWeeklyPlanComponent implements OnInit { - validateForm!: FormGroup; - constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient, private toTree: TreeService) { } - searchForm = { - taskname: '', - tasktime: '', - unitname: '', - unitlevel: '', - or: '' - } - usersNum - loading - usersLIst = [1] + constructor() { } + ngOnInit(): void { } - pageChange($event) { + months = [ + { name: '1月', isable: true }, + { name: '2月', isable: true }, + { name: '3月', isable: true }, + { name: '4月', isable: true }, + { name: '5月', isable: true }, + { name: '6月', isable: true }, + { name: '7月', isable: true }, + { name: '8月', isable: true }, + { name: '9月', isable: true }, + { name: '10月', isable: true }, + { name: '11月', isable: true }, + { name: '12月', isable: true } + ] + selectedMonth + selectMonth(item) { + this.selectedMonth = item.name + } + isExpand = true + expand() { + this.isExpand = !this.isExpand } - cancel(item, type) { + formatOne = (percent: number): string => `${percent}%\n完成率`; + + cardData = [ + { name: '双随机', isDetails: false, background: '#1D9DFF', icon: 'suiji.png' }, + { name: '行政许可', isDetails: false, background: '#42B983', icon: 'xuke.png' }, + { name: '熟悉演练', isDetails: false, background: '#9D80FF', icon: 'yanlian.png' }, + { name: '联络指导', isDetails: false, background: '#5483EA', icon: 'zhidao.png' }, + { name: '消防宣传', isDetails: false, background: '#FF5D2A', icon: 'xuanchuan.png' }, + { name: '投诉举报', isDetails: false, background: '#5087FF', icon: 'tousu.png' }, + { name: '火灾调查', isDetails: false, background: '#FF404D', icon: 'huozai.png' } + ] + + openDetails(data, type) { + data.isDetails = type } - delete(item) { + xxx = false + radioChange(e) { + + setTimeout(() => { + this.xxx = !this.xxx + }, 0); } + stationData = [ + { name: '历下区A消防救援站', isExpand: true }, + { name: '历下区B消防救援站', isExpand: false }, + { name: '历下区C消防救援站', isExpand: false } + ] + expandcarditem(item) { + item.isExpand = !item.isExpand + } } diff --git a/src/app/home/task/task.component.html b/src/app/home/task/task.component.html index 6262209..b7ee09c 100644 --- a/src/app/home/task/task.component.html +++ b/src/app/home/task/task.component.html @@ -15,7 +15,7 @@ 月度任务总览 - +
  • 本级计划 @@ -26,10 +26,10 @@ 任务执行
    • -
  • +
  • 任务申请 @@ -39,6 +39,12 @@ 生成周计划
    • +
      +
    • + + 协同工作任务 +
      • +
    diff --git a/src/styles.scss b/src/styles.scss index 00b0177..007e5bc 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -221,6 +221,7 @@ app-root { display: flex; align-items: center; justify-content: center; + z-index: 999; } #setPosition {