From 39865d218df160677045c12a7eec5615561d8d43 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Mon, 22 Aug 2022 08:28:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.module.ts | 6 +- .../da-oneself-plan.component.html | 474 +++++++++--------- .../da-oneself-plan.component.ts | 163 +++--- .../plan-adjustment.component.html | 35 ++ .../plan-adjustment.component.scss | 28 ++ .../plan-adjustment.component.ts | 67 +++ 6 files changed, 464 insertions(+), 309 deletions(-) create mode 100644 src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html create mode 100644 src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.scss create mode 100644 src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index bd5b9a9..d38b1ae 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -57,6 +57,8 @@ 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 { NzCardModule } from 'ng-zorro-antd/card'; +import { PlanAdjustmentComponent } from './task/da-oneself-plan/plan-adjustment/plan-adjustment.component'; @NgModule({ declarations: [ NavComponent, @@ -89,7 +91,8 @@ import { NzUploadModule } from 'ng-zorro-antd/upload'; LookTaskComponent, UnitEditComponent, AllotPersonComponent, - ChangePasswordComponent + ChangePasswordComponent, + PlanAdjustmentComponent ], imports: [ CommonModule, @@ -119,6 +122,7 @@ import { NzUploadModule } from 'ng-zorro-antd/upload'; NzRadioModule, NzDatePickerModule, NzSpinModule, + NzCardModule, NzUploadModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent] 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 557857b..fbd0388 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 @@ -1,238 +1,238 @@ - -
-
- - - - -
- {{item.name}} -
-
- -
- -
-
- 本级部署 - - {{isExpand ? '收起' :'展开'}} - - -
-
-
-
-
-
- - {{item.name}} -
-
-

- 任务分配 - -

-

5/9

-
- -
-
- - -
-
-
-

- {{item.name}} - 返回 -

-
-
-

- 济南历下森豪室内娱乐场 - - 派发 - -

-

A消防救援站

-

派发

-
-
-
-
-
-
- - -
-
-
-
- - - {{item.name}} - - 单位总数: 7/8 -
- 完成进度 - -
- - - {{item.isExpand ? '收起' :'展开'}} - - -
-
-
-
-
- - 重大活动 -
-
-
- 已分配 - 1 -
-
-
- 已完成 - 1 -
-
-
-
-
- - 尬粒酒店管理有限公司济南泺文路分公司 - - - 单位名称 - -
-
- - 重点单位 - - - 级别 - -
-
- - 历下区A消防救援站 - - - 责任机构 - -
-
- - 历下区B消防救援站 - - - 协助机构 - -
-
- - - - - 同步工作 - -
-
- - - - - - 进度 - -
-
- - -
-
-
-
- - 尬粒酒店管理有限公司济南泺文路分公司 - - - 单位名称 - -
-
- - 重点单位 - - - 级别 - -
-
- - 历下区A消防救援站 - - - 责任机构 - -
-
- - 历下区B消防救援站 - - - 协助机构 - -
-
- - - - - 同步工作 - -
-
- - - - - - 进度 - -
-
- - -
-
- -
-
-
-
-
-
- -
-
- + +
+
+ + + + +
+ {{item.name}} +
+
+ +
+ +
+
+ 本级部署 + + {{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/da-oneself-plan/da-oneself-plan.component.ts b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts index 4b1700d..8494edf 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 @@ -1,71 +1,92 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-da-oneself-plan', - templateUrl: './da-oneself-plan.component.html', - styleUrls: ['./da-oneself-plan.component.scss'] -}) -export class DaOneselfPlanComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - 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 = false - expand() { - this.isExpand = !this.isExpand - } - - formatOne = (percent: number): string => `${percent}%\n完成率`; - - - cardData = [ - { name: '重大活动', isDetails: false, background: '#FF9203', icon: 'huodong.png' }, - { 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 - } - 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 - } -} +import { Component, OnInit,ViewContainerRef } from '@angular/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import {PlanAdjustmentComponent} from './plan-adjustment/plan-adjustment.component' +@Component({ + selector: 'app-da-oneself-plan', + templateUrl: './da-oneself-plan.component.html', + styleUrls: ['./da-oneself-plan.component.scss'] +}) +export class DaOneselfPlanComponent implements OnInit { + + constructor(private modal: NzModalService,private message: NzMessageService,private viewContainerRef: ViewContainerRef) { } + validateForm!: FormGroup; + ngOnInit(): void { + } + 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 = false + expand() { + this.isExpand = !this.isExpand + } + + formatOne = (percent: number): string => `${percent}%\n完成率`; + + + cardData = [ + { name: '重大活动', isDetails: false, background: '#FF9203', icon: 'huodong.png' }, + { 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 + } + 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 + } + nodes: any = [] + BuildingTypes + adjustment(){ + const modal = this.modal.create({ + nzTitle: "任务调整", + nzContent: PlanAdjustmentComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 900, + nzComponentParams: { + + }, + nzOnOk: async () => { + console.log(123); + } + }); + const instance = modal.getContentComponent(); + + } +} 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 new file mode 100644 index 0000000..8ebc569 --- /dev/null +++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.html @@ -0,0 +1,35 @@ +
+
+
未接任务任务总数：{{taskNumber}}/8
+
+
+    + {{item.tag}} +
+ +
+ +
+
+
+
+
已接任务
+
+
+
+    + {{item2.tag}} +
+
+
+
{{data.name}}
+
+
+
+ +
+
+
+ + +
\ No newline at end of file diff --git a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.scss b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.scss new file mode 100644 index 0000000..53bf912 --- /dev/null +++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.scss @@ -0,0 +1,28 @@ +.box { + display: flex; +} +.title{ + span{ + margin-right: 14px; + } +} +.missed { + .item { + margin: 20px 0; + border-bottom: 1px dotted #C7CAD0; + i { + width: 4px; + height: 12px; + margin-right: 5px; + } + .checked{ + margin: 10px 0; + } + } + .received{ + display: flex; + .name{ + flex: 1; + } + } +} \ 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 new file mode 100644 index 0000000..39cf933 --- /dev/null +++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts @@ -0,0 +1,67 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-plan-adjustment', + templateUrl: './plan-adjustment.component.html', + styleUrls: ['./plan-adjustment.component.scss'] +}) +export class PlanAdjustmentComponent implements OnInit { + + constructor() { } + list = [ + { + tag: "行政许可", + class: "#42B983", + item: [ + { + name: "想啥吃啥餐饮有限公司", + checked: false + }, + { + name: "想啥吃啥餐饮有限公司", + checked: false + } + ] + }, + { + tag: "双随机", + class: "#1D9DFF", + item: [ + { + name: "想啥吃啥餐饮有限公司", + checked: false + } + ] + }, + ] + list2 = [ + + ] + taskNumber=0 + task=false + ngOnInit(): void { + } + aaa(data) { + if(data.checked){ + this.list2.push({meu:this.list2.length,data}) + console.log(this.list2); + this.taskNumber=this.list2.length + if(this.taskNumber==8){ + this.task=true + } + }else{ + this.bbb(data) + } + } + bbb(e) { + console.log(e); + 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 + } + + } + } +} From 0c4b64bf31f92c44296ad50f9a7622ed20314860 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Mon, 22 Aug 2022 11:21:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-adjustment/plan-adjustment.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 39cf933..c7e8546 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 @@ -42,7 +42,7 @@ export class PlanAdjustmentComponent implements OnInit { ngOnInit(): void { } aaa(data) { - if(data.checked){ + if(data.checked && !this.task){ this.list2.push({meu:this.list2.length,data}) console.log(this.list2); this.taskNumber=this.list2.length @@ -60,6 +60,9 @@ export class PlanAdjustmentComponent implements OnInit { 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 + } } }