From 2e3b50cf7da4e855b7719fd2eaace00368001de8 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 4 Aug 2022 16:27:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=94=AF=E9=98=9F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8C=87=E6=A0=87=E5=9F=BA=E7=A1=80=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.module.ts | 8 +- src/app/home/task/task.component.scss | 16 +- .../zhi-indicators.component.html | 201 +++++++++++++++++- .../zhi-indicators.component.scss | 170 +++++++++++++++ .../zhi-indicators.component.ts | 92 +++++++- src/assets/images/icon/admin.png | Bin 346 -> 0 bytes src/assets/images/icon/host.png | Bin 359 -> 0 bytes src/assets/images/icon/huodong.png | Bin 0 -> 384 bytes src/assets/images/icon/huozai.png | Bin 0 -> 355 bytes src/assets/images/icon/organization.png | Bin 329 -> 0 bytes src/assets/images/icon/power.png | Bin 484 -> 0 bytes src/assets/images/icon/push.png | Bin 441 -> 0 bytes src/assets/images/icon/role.png | Bin 438 -> 0 bytes src/assets/images/icon/suiji.png | Bin 0 -> 279 bytes src/assets/images/icon/tousu.png | Bin 0 -> 235 bytes src/assets/images/icon/user.png | Bin 404 -> 0 bytes src/assets/images/icon/xuanchuan.png | Bin 0 -> 268 bytes src/assets/images/icon/xuke.png | Bin 0 -> 263 bytes src/assets/images/icon/yanlian.png | Bin 0 -> 308 bytes src/styles.scss | 20 +- 20 files changed, 492 insertions(+), 15 deletions(-) delete mode 100644 src/assets/images/icon/admin.png delete mode 100644 src/assets/images/icon/host.png create mode 100644 src/assets/images/icon/huodong.png create mode 100644 src/assets/images/icon/huozai.png delete mode 100644 src/assets/images/icon/organization.png delete mode 100644 src/assets/images/icon/power.png delete mode 100644 src/assets/images/icon/push.png delete mode 100644 src/assets/images/icon/role.png create mode 100644 src/assets/images/icon/suiji.png create mode 100644 src/assets/images/icon/tousu.png delete mode 100644 src/assets/images/icon/user.png create mode 100644 src/assets/images/icon/xuanchuan.png create mode 100644 src/assets/images/icon/xuke.png create mode 100644 src/assets/images/icon/yanlian.png diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index a4a57d1..d27f592 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -42,6 +42,9 @@ import { NzTreeModule } from 'ng-zorro-antd/tree'; import { AddorComponent } from './system-management/or/addor/addor.component'; import { EditorComponent } from './system-management/or/editor/editor.component'; import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; +import { NzCollapseModule } from 'ng-zorro-antd/collapse'; +import { NzPopoverModule } from 'ng-zorro-antd/popover'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; @NgModule({ declarations: [ NavComponent, @@ -89,7 +92,10 @@ import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; NzMessageModule, NzInputModule, NzPaginationModule, - NzTreeModule + NzTreeModule, + NzCollapseModule, + NzPopoverModule, + NzCheckboxModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent] }) diff --git a/src/app/home/task/task.component.scss b/src/app/home/task/task.component.scss index a5750bc..82a213b 100644 --- a/src/app/home/task/task.component.scss +++ b/src/app/home/task/task.component.scss @@ -34,18 +34,18 @@ .content { - box-sizing: border-box; - padding: 16px; + // box-sizing: border-box; + // padding: 16px; background: #F6F5F8; .routerbox { width: 100%; height: 100%; - 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; - overflow-y: auto; + // 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; + // overflow-y: auto; } } diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.html b/src/app/home/task/zhi-indicators/zhi-indicators.component.html index abf1c31..1c28d08 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.html +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.html @@ -1 +1,200 @@ -

zhi-indicators works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+
+
+
+
+ + 双随机 +
+ + +
+
+ 单位名称 + | + 组织机构 +
+
+
+
+ + + + + + + + +
+
+
+
+
+
+
+
+ + + + + + + +
+
+
+ + + +
+ + + + {{ node.title }} + +
+ + + + + + + + + +
+
+
+ + +
+
+ + + 已分配: 14/15 家单位 + +
+
+ + + {{doubleRandom.isExpand ? '收起' :'展开'}} + + +
+
+
+ + + + 责任机构 + 任务额 + 单位名称 + 监督员 + 说明 + + + + + 访客 + 2021-11-19 + + 22 + + + 22 + + + 22 + + + + +
+
+
+
+
+
+ + 重大活动 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
+
+
+ + 消防宣传 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
+
+
+ + 火灾调查 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss index e69de29..1bbddb2 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss @@ -0,0 +1,170 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + border-bottom: 1px dashed #C7CAD0; + + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + margin-right: 16px; + cursor: pointer; + } + + .selectedMonth { + + background: #2C4DC0; + color: #FFFFFF; + } +} + +.content { + box-sizing: border-box; + padding: 20px; + flex: 1; + overflow-y: auto; + color: #606266; +} + +.panel { + margin-bottom: 16px; + + .panelheader { + justify-content: space-between; + + .panelheaderleft { + display: flex; + align-items: center; + + .panelheadername { + width: 130px; + height: 36px; + box-sizing: border-box; + padding: 8px 28px; + border-radius: 6px 0px 6px 6px; + color: #fff; + margin-right: 36px; + + img { + vertical-align: text-top; + } + } + + button { + margin-right: 36px; + } + } + + .panelheaderright { + display: flex; + align-items: center; + + .expand { + margin-left: 36px; + } + } + } + + .panelcontent { + nz-table { + margin-top: 16px; + } + } +} + +.panelheadernameblue { + background-color: #1D9DFF; +} + +.panelheadernamepurple { + background-color: #9D80FF; +} + +.panelheadernameblue2 { + background-color: #5087FF; +} + +.panelheadernamegreen { + background-color: #42B983; +} + +.panelheadernameor { + background-color: #FF9203; +} + +.panelheadernameor2 { + background-color: #FF5D2A; +} + +.panelheadernamered { + background-color: #FF404D; +} + +.selectUnitPopover { + width: 550px; + height: 492px; + + nz-form-item { + margin: 12px 0; + } + + display: flex; + flex-direction: column; + + .popoverTitle { + display: flex; + align-items: center; + + span { + color: #C7CAD0; + cursor: pointer; + } + + .selectedspan { + color: #2C4DC0; + } + } + + .popoverContent { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; + .popoverContentitem{ + flex: 1; + overflow-y: auto; + } + } + + .popoverBtn { + display: flex; + justify-content: flex-end; + margin-top: 16px; + button{ + margin-left: 18px; + } + } +} 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 ff8729e..96313d7 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts @@ -1,4 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { TreeService } from 'src/app/service/tree.service'; @Component({ selector: 'app-zhi-indicators', @@ -7,9 +10,94 @@ import { Component, OnInit } from '@angular/core'; }) export class ZhiIndicatorsComponent implements OnInit { - constructor() { } + validateForm!: FormGroup; + + constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { } + + 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 + } + + + // 双随机 + doubleRandom = { + isExpand: true,//卡片展开 + isPopover: false,//选择单位气泡卡片 + search1: '',//选择单位气泡卡片---单位选择列表 + search1Value: [], + search2: '',//选择单位气泡卡片---组织选择列表 + search2Value: [], + selectedMenu: 1,//选择单位气泡卡片 + data: [1]//表格数据 + } + isPopover(data) { + data.isPopover = !data.isPopover + } + //搜索框提交 + submitForm(value): void { + // console.log(value) + } + // 弹出 tab + popoverMenuSelect(data, type) { + data.selectedMenu = type + } + expand(data) { + data.isExpand = !data.isExpand + } ngOnInit(): void { + this.getAllOrganization() } + nzExpandAll = false; + totalCount: string + + allOrList: any + nodes + getAllOrganization() { + let params = { + ContainsChildren: true, + pageSize: 9999 + } + this.http.get('/api/Organizations', { + params: params + }).subscribe((data: any) => { + this.totalCount = data.totalCount + data.items.forEach(element => { + element.key = element.id + element.title = element.name + element.selectable = false + }); + this.allOrList = data.items + this.nodes = [...this.toTree.toTree(data.items)] + }) + } + orcheckbox(data, $event, node) { + if ($event) { + data.search2Value.push(node.origin.name) + } else { + for (let index = 0; index < data.search2Value.length; index++) { + const element = data.search2Value[index]; + if (element == node.origin.name) { + data.search2Value.splice(index, 1) + } + } + } + console.log(data.search2Value) + } } diff --git a/src/assets/images/icon/admin.png b/src/assets/images/icon/admin.png deleted file mode 100644 index f7f11ef61f8a29d04589c6bce797df47394575ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmV-g0j2(lP)RG?HKRv>gh2Wkb-@|@`6$kF#^7Tr6jW{ zl?VOjR?_nT{iW$=)I1o#B5zHoru!kO@Ba_tRFY|*Q8mT43mQLd*r3L0#0I#t5x^d} zs;=%b+KD+ykCE@|Ex+yPknZ-5Ho*rs+MkupIcl6qGG*WJ7>IVsz6?f0u^V`lv`VzC z^$D2Q_}Nt(xK>TZPkE5M;G`nL=+3SqSC}}*9&{$17#ng{5#g}=9Jlqigv5iFba;us s3P*8p(6{On(Li>Rx{7LM)?dzZ07fB;r`F!0NdN!<07*qoM6N<$f_-S4JOBUy diff --git a/src/assets/images/icon/host.png b/src/assets/images/icon/host.png deleted file mode 100644 index 20d356c40c2abf2e701c32d67b8925d9d8ad855f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)of1Kio7@1ptP`C^{0AtXB$XFC)T5P=7ert2H_OKz zJ<>!_ZE6dq6mI?iZ2@gZprxQ&lF#@Z1uwzXzIy>VrW#UM9QoPr%<8yct}UoD;saQYeA7=#68Ef002ovPDHLk FV1hVWmQerz diff --git a/src/assets/images/icon/huodong.png b/src/assets/images/icon/huodong.png new file mode 100644 index 0000000000000000000000000000000000000000..4767b076977dc9653601da147092554cddd3a642 GIT binary patch literal 384 zcmV-`0e}99P)JP00001b5ch_0Itp) z=>Px$I!Q!9R47w*(lJYyQ4|L7--QMt#|DFfgqn14X=`vOFj^8E3W5{_C%=Q=!6^_V z3Jer#2?PZj+8S!8$)F%XhsJ`o8;_nB{`{%4+nMLAIggfto_I7 eXRWnA;r#_XS8O5^c0juT0000JP00001b5ch_0Itp) z=>Px$9Z5t%R47x0(ywdRQ544U*HeTU1(`vc#kM#W{1-&jU=qPF%aS&mY0-gf!y*>J zA0QS%FbETy7?ung1O>&UprUZbk?(hWxS*bN@AI5D_qpfZm{e6A!E@ZfR+2AMzt0sK zs_GbCxVu!v@~t=zoB@{jq_cI4}SkSi;Fc|J}eR93G6b zcr?p?ZsNUb-~oE1^LmBlB)_VvbH7FZfUcVjtYBw0|GwN(k~ed@s%~HnUvc8k!&TKa zT*vJs7l-e11?xDU|JOkY_BA}OL~#?77_baX^fM$pCr9X+T__)(lH{)PvS;k8vwvkc#!lVsROl0V4Lv( z(~bWwB2EBp|K3AD(F5Hh;*vl-Ao>ZARL*K0y@a~U$b;vUK^bzsBz;TzEE5h0vgju} z;K42dq}T@F$2^B*Hzojpnfpr0z=K>bxf8}tBouwN=}6&Z3$^6&1Z9y~ZU1 zjKYI+`hjM?!97?a=sQP5uY2wu%o4P2Tk9hIHv-!@zs;Gd<*CMdo#2m6^@O zKJW%yMuft{in4nTX#3sneL*YC%=3z~1uTGxu@qQUR}VgH%GrtNZU$WFG9u2KfU3f} z`wx~PnYmkVM+J7KfG@RVM%|dv=k+SMc9qk>$nK4S8yQGl+B-#Gp|{Mmo1fH1GP03% zC;qO3tj@lWx*6?cEU63kqu?$|@DW%>#7F_NYft-X%<^ssoEZfpI|-mh;d=h5T9o zhbYC!5kFC&pD+(<|Eoq=ae#I1-pEVu4$EUVMM zx6zBEP3;SD447XolVW5m@2SNp62cZIE1?z0)p7{jGV7M7(Nb8U{sUlj1g=S40GN`TBwztplDz5*EXj92_X0~g2XMA8 z0m24DbS_^(z-ngeh} zPb6pA)LxP-C5>Z>-`kAylD^Y;W~@A=gH%OUp{KU+`7lG()e0Z1g~)*IppxWJlE3*m z3Ai9x#EKZSfpZ^^NjCO}Bn#!qJO%L6GP|epCf=|6_IR^wS`}HmM*y!0*i0DhL&b3Qz$m5EY0DBo&|nbU+2;+;9Isn>9J+oSgjKzw>6^ zd$ZqaA|ghT&Ly2n+L81nX({Q>Hveh3-i-(nA0_QedXw~8z*uidIa*o2sApdy~c#Ie}J+> z6-D%!{s%OZbkpk7m;tqsZD?+!#>@Aj1A=1v5E0QAN;PaDL}VLilE^fpl<9pUB;^8m*g_T`&e{ z$`x5>7Z#QkJ&7ng`%&t>$0yk>`__k=9pqT>c#Fd1!&m$ncs;%r2rm$L_vAoj;_M$= ba$DrHt0O){Tv`wV^cjPvtDnm{r-UW|-85{l literal 0 HcmV?d00001 diff --git a/src/assets/images/icon/tousu.png b/src/assets/images/icon/tousu.png new file mode 100644 index 0000000000000000000000000000000000000000..c2031467c98f65dd0092c7273d328c9e6aa67ff4 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa#^NA%Cx&(BWL^R}OFdm2LoEE~ zPEzD^a^!KjufoA%p~BSoL_>n*U=c&#VM7asCT9f!4k4bVmiY-ER7K~voYmKizP<0< z8^6>v?F8IrZ@E_i`6fpj1`paM|=I-mknfC{7oQGuv{4p0H1fYk)d-9l9n&^7Q`lpF(@(YRGO0F+9BWI%gO8$W@z z?QH|3l|&|Du4jvj|@3R zimDZ$`2%Ys*jT8mRTdH|H@PO^kk&}Ul0000Px##z{m$R47x8(V+?gK@i6A{|5%6RWSMp7ZkM_41y1!LGS^*E(XCac7ve7B3Q+! z!EUhl2zG;EWaUoQLp>LkU54Mz?Cc6}m{|a{Bn|zz+baPFz}U?senB(K0B4{W9d1b4 z#)*8`17==@qond1G_wM50&ujP)Px#!AV3xR47xm&^<~+Q4ogV=YXYUnt+X+r5i|XsVM~ucOdRSSC9<^w6n~00jb=8 zrJapnYj0p=?p-cE3 zJJ`nq_Dba!%Px#?ny*JR47x8kugdGKoCXW?<_4mKn`FapoIaOfS^q}L3iA%suB)Dt@fyaK#P>dge_eB*TDf50y{Bwkn=!GP-k0000UdiK literal 0 HcmV?d00001 diff --git a/src/styles.scss b/src/styles.scss index f2ba085..e9bb05d 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -106,7 +106,7 @@ textarea { } ::-webkit-scrollbar-track { - background-color: #999; + // background-color: #999; } app-root { @@ -161,7 +161,21 @@ app-root { max-height: 280px; } -button { +// 可展开面板 +.panel { + width: 100%; + 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; + box-sizing: border-box; + padding: 16px; + + .panelheader { + height: 46px; + display: flex; + align-items: center; + } - background: #2C4DC0; } From 115f1dbff2e7a4d74e9f7b62d5e2e08fb009dac4 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 5 Aug 2022 14:38:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=94=AF=E9=98=9F?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.module.ts | 4 +- .../task/zhi-audit/zhi-audit.component.html | 216 +++++++++++++++++- .../task/zhi-audit/zhi-audit.component.scss | 183 +++++++++++++++ .../task/zhi-audit/zhi-audit.component.ts | 110 ++++++++- .../zhi-indicators.component.html | 142 +++++++++++- .../zhi-indicators.component.ts | 19 +- src/assets/images/icon/agree.png | Bin 0 -> 5212 bytes src/assets/images/icon/reject.png | Bin 0 -> 5107 bytes src/styles.scss | 6 +- 9 files changed, 667 insertions(+), 13 deletions(-) create mode 100644 src/assets/images/icon/agree.png create mode 100644 src/assets/images/icon/reject.png diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index d27f592..cc307d0 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -45,6 +45,7 @@ import { AddUnitComponent } from './basic-info/add-unit/add-unit.component'; import { NzCollapseModule } from 'ng-zorro-antd/collapse'; import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { ScrollingModule } from '@angular/cdk/scrolling'; @NgModule({ declarations: [ NavComponent, @@ -95,7 +96,8 @@ import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; NzTreeModule, NzCollapseModule, NzPopoverModule, - NzCheckboxModule + NzCheckboxModule, + ScrollingModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent] }) diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.html b/src/app/home/task/zhi-audit/zhi-audit.component.html index 8ba83c5..2e70ed2 100644 --- a/src/app/home/task/zhi-audit/zhi-audit.component.html +++ b/src/app/home/task/zhi-audit/zhi-audit.component.html @@ -1 +1,215 @@ -

zhi-audit works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+ +
+
+
+
+ + 双随机 +
+ + 已选择: 15 家单位 + + | + + 已分配: 14 家单位 + + | + + 已通过: 14/15 家单位 + +
+
+ + + + {{doubleRandom.isExpand ? '收起' :'展开'}} + + +
+
+
+ + + + 责任机构 + 任务额 + 单位名称 + 监督员 + 说明 + 操作 + + + + + 访客 + 2021-11-19 + + 22 + + + 22 + + + 一段简短的说明文字... + + + + + 同意 + 驳回 + + + + +
+
+ + + +
+
+
+
+ + 熟悉演练 +
+ + 已选择: 15 家单位 + + | + + 已分配: 14 家单位 + + | + + 已通过: 14/15 家单位 + +
+
+ + + + {{rehearsal.isExpand ? '收起' :'展开'}} + + +
+
+
+ + + + 责任机构 + 任务额 + 单位名称 + 监督员 + 说明 + 操作 + + + + + 访客 + 2021-11-19 + + 22 + + + 22 + + + 一段简短的说明文字... + + + + + 同意 + 驳回 + + + + +
+
+ + + + +
+
+
+
+ + 重大活动 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
+
+
+ + 消防宣传 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
+
+
+ + 火灾调查 +
+ + + 已分配: 0/0 家单位 + +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.scss b/src/app/home/task/zhi-audit/zhi-audit.component.scss index e69de29..feac492 100644 --- a/src/app/home/task/zhi-audit/zhi-audit.component.scss +++ b/src/app/home/task/zhi-audit/zhi-audit.component.scss @@ -0,0 +1,183 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + border-bottom: 1px dashed #C7CAD0; + + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + margin-right: 16px; + cursor: pointer; + } + + .selectedMonth { + + background: #2C4DC0; + color: #FFFFFF; + } +} + +.content { + box-sizing: border-box; + padding: 20px; + flex: 1; + overflow-y: auto; + color: #606266; +} + +.panel { + margin-bottom: 16px; + + .panelheader { + justify-content: space-between; + + .panelheaderleft { + display: flex; + align-items: center; + + .panelheadername { + width: 130px; + height: 36px; + box-sizing: border-box; + padding: 8px 28px; + border-radius: 6px 0px 6px 6px; + color: #fff; + margin-right: 36px; + + img { + vertical-align: text-top; + } + } + + .spanline { + color: rgba(44, 77, 192, 0.4000); + margin: 0 20px; + } + } + + .panelheaderright { + display: flex; + align-items: center; + + .expand { + margin-left: 36px; + } + } + } + + .panelcontent { + nz-table { + margin-top: 16px; + } + .explain{ + position: relative; + img{ + width: 36px; + height: 36px; + position: absolute; + right: 20px; + top: 4px; + } + } + } +} + +.panelheadernameblue { + background-color: #1D9DFF; +} + +.panelheadernamepurple { + background-color: #9D80FF; +} + +.panelheadernameblue2 { + background-color: #5087FF; +} + +.panelheadernamegreen { + background-color: #42B983; +} + +.panelheadernameor { + background-color: #FF9203; +} + +.panelheadernameor2 { + background-color: #FF5D2A; +} + +.panelheadernamered { + background-color: #FF404D; +} + +.selectUnitPopover { + width: 550px; + height: 492px; + + nz-form-item { + margin: 12px 0; + } + + display: flex; + flex-direction: column; + + .popoverTitle { + display: flex; + align-items: center; + + span { + color: #C7CAD0; + cursor: pointer; + } + + .selectedspan { + color: #2C4DC0; + } + } + + .popoverContent { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; + + .popoverContentitem { + flex: 1; + overflow-y: auto; + } + } + + .popoverBtn { + display: flex; + justify-content: flex-end; + margin-top: 16px; + + button { + margin-left: 18px; + } + } +} diff --git a/src/app/home/task/zhi-audit/zhi-audit.component.ts b/src/app/home/task/zhi-audit/zhi-audit.component.ts index e4c6be2..c9d85d8 100644 --- a/src/app/home/task/zhi-audit/zhi-audit.component.ts +++ b/src/app/home/task/zhi-audit/zhi-audit.component.ts @@ -1,5 +1,7 @@ -import { Component, OnInit } from '@angular/core'; - +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { TreeService } from 'src/app/service/tree.service'; @Component({ selector: 'app-zhi-audit', templateUrl: './zhi-audit.component.html', @@ -7,9 +9,111 @@ import { Component, OnInit } from '@angular/core'; }) export class ZhiAuditComponent implements OnInit { - constructor() { } + validateForm!: FormGroup; + + constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { } + + 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 + } + + + // 双随机 + doubleRandom = { + isExpand: true,//卡片展开 + isPopover: false,//选择单位气泡卡片 + search1: '',//选择单位气泡卡片---单位选择列表 + search1Value: [], + search2: '',//选择单位气泡卡片---组织选择列表 + search2Value: [], + selectedMenu: 1,//选择单位气泡卡片 + data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],//表格数据 + nodes: [] + } + + // 熟悉演练 + rehearsal = { + isExpand: false,//卡片展开 + isPopover: false,//选择单位气泡卡片 + search1: '',//选择单位气泡卡片---单位选择列表 + search1Value: [], + search2: '',//选择单位气泡卡片---组织选择列表 + search2Value: [], + selectedMenu: 1,//选择单位气泡卡片 + data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],//表格数据 + nodes: [] + } + isPopover(data) { + data.isPopover = !data.isPopover + } + //搜索框提交 + submitForm(value): void { + // console.log(value) + } + // 弹出 tab + popoverMenuSelect(data, type) { + data.selectedMenu = type + } + expand(data) { + data.isExpand = !data.isExpand + } ngOnInit(): void { + this.getAllOrganization() } + nzExpandAll = false; + totalCount: string + + allOrList: any + nodes + getAllOrganization() { + let params = { + ContainsChildren: true, + pageSize: 9999 + } + this.http.get('/api/Organizations', { + params: params + }).subscribe((data: any) => { + this.totalCount = data.totalCount + data.items.forEach(element => { + element.key = element.id + element.title = element.name + element.selectable = false + }); + this.allOrList = data.items + this.nodes = [...this.toTree.toTree(data.items)] + + this.doubleRandom.nodes = JSON.parse(JSON.stringify(this.nodes)) + this.rehearsal.nodes = JSON.parse(JSON.stringify(this.nodes)) + }) + } + orcheckbox(data, $event, node) { + if ($event) { + data.search2Value.push(node.origin.name) + } else { + for (let index = 0; index < data.search2Value.length; index++) { + const element = data.search2Value[index]; + if (element == node.origin.name) { + data.search2Value.splice(index, 1) + } + } + } + console.log(data.search2Value) + } } diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.html b/src/app/home/task/zhi-indicators/zhi-indicators.component.html index 1c28d08..02eb18f 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.html +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.html @@ -10,7 +10,8 @@ {{item.name}} -
+
+
@@ -62,14 +63,16 @@
- + - + {{ node.title }}
@@ -125,14 +128,145 @@ 22 + + + + + + +
+
+ + + +
+
+
+
+ + 熟悉演练 +
+ + +
+
+ 单位名称 + | + 组织机构 +
+
+
+
+ + + + + + + + +
+
+
+
+
+
+
+
+ + + + + + + +
+
+
+ + + +
+ + + + {{ node.title }} + +
+ + + + + + + + + +
+
+
+ + +
+
+ + + 已分配: 14/15 家单位 + +
+
+ + + {{rehearsal.isExpand ? '收起' :'展开'}} + + +
+
+
+ + + + 责任机构 + 任务额 + 单位名称 + 监督员 + 说明 + + + + + 访客 + 2021-11-19 + + 22 + 22 + + +
+ + + +
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 96313d7..172710a 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts @@ -43,7 +43,21 @@ export class ZhiIndicatorsComponent implements OnInit { search2: '',//选择单位气泡卡片---组织选择列表 search2Value: [], selectedMenu: 1,//选择单位气泡卡片 - data: [1]//表格数据 + data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],//表格数据 + nodes: [] + } + + // 熟悉演练 + rehearsal = { + isExpand: false,//卡片展开 + isPopover: false,//选择单位气泡卡片 + search1: '',//选择单位气泡卡片---单位选择列表 + search1Value: [], + search2: '',//选择单位气泡卡片---组织选择列表 + search2Value: [], + selectedMenu: 1,//选择单位气泡卡片 + data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],//表格数据 + nodes: [] } isPopover(data) { data.isPopover = !data.isPopover @@ -85,6 +99,9 @@ export class ZhiIndicatorsComponent implements OnInit { }); this.allOrList = data.items this.nodes = [...this.toTree.toTree(data.items)] + + this.doubleRandom.nodes = JSON.parse(JSON.stringify(this.nodes)) + this.rehearsal.nodes = JSON.parse(JSON.stringify(this.nodes)) }) } orcheckbox(data, $event, node) { diff --git a/src/assets/images/icon/agree.png b/src/assets/images/icon/agree.png new file mode 100644 index 0000000000000000000000000000000000000000..761de4e9009e67ad9adf601f45d1b3f772e0c293 GIT binary patch literal 5212 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 WHY#ArYj5+-VvlQ& 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 Date: Sat, 6 Aug 2022 14:05:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=A4=A7=E9=98=9F?= =?UTF-8?q?=E6=9C=AC=E7=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.module.ts | 4 +- .../da-oneself-plan.component.html | 67 ++++++- .../da-oneself-plan.component.scss | 186 ++++++++++++++++++ .../da-oneself-plan.component.ts | 40 ++++ .../da-subordinate-audit.component.html | 88 ++++++++- .../da-subordinate-audit.component.scss | 146 ++++++++++++++ .../da-subordinate-audit.component.ts | 23 +++ .../zhi-indicators.component.scss | 26 --- src/assets/images/icon/assist.png | Bin 0 -> 628 bytes src/assets/images/icon/main.png | Bin 0 -> 482 bytes src/assets/images/icon/unit.png | Bin 0 -> 345 bytes src/assets/images/icon/zhidao.png | Bin 0 -> 386 bytes src/styles.scss | 36 +++- src/theme.less | 18 +- 14 files changed, 595 insertions(+), 39 deletions(-) create mode 100644 src/assets/images/icon/assist.png create mode 100644 src/assets/images/icon/main.png create mode 100644 src/assets/images/icon/unit.png create mode 100644 src/assets/images/icon/zhidao.png diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index cc307d0..40a8a30 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -46,6 +46,7 @@ import { NzCollapseModule } from 'ng-zorro-antd/collapse'; import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { ScrollingModule } from '@angular/cdk/scrolling'; +import { NzGridModule } from 'ng-zorro-antd/grid'; @NgModule({ declarations: [ NavComponent, @@ -97,7 +98,8 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; NzCollapseModule, NzPopoverModule, NzCheckboxModule, - ScrollingModule + ScrollingModule, + NzGridModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent] }) 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 484b08a..ccd94f4 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 +1,66 @@ -

da-oneself-plan works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+
+ 本级部署 + + {{isExpand ? '收起' :'展开'}} + + +
+
+
+
+
+
+ + {{item.name}} +
+
+

+ 任务分配 + +

+

5/9

+
+ +
+
+ + +
+
+
+

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

+
+
+

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

+

A消防救援站

+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss index e69de29..535f92c 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss @@ -0,0 +1,186 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + border-bottom: 1px dashed #C7CAD0; + + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + margin-right: 16px; + cursor: pointer; + } + + .selectedMonth { + + background: #2C4DC0; + color: #FFFFFF; + } +} + +.instrumentpanel { + box-sizing: border-box; + padding: 15px 20px; + color: #303133; + + .instrumentpanelheader { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + } + + .instrumentpanelopen { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + } + + .instrumentpanelopenitem { + width: 24.3%; + height: 260px; + 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; + margin-bottom: 18px; + + .itemone { + width: 100%; + height: 100%; + display: flex; + + .instrumentpanelopenitemleft { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; + flex: 1; + box-sizing: border-box; + padding: 26px 0 26px 10%; + + .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; + } + } + + .instrumentpanelopenitemright { + 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; + } + } + } + } + } + +} 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 62983a4..b7fbb90 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 @@ -11,5 +11,45 @@ export class DaOneselfPlanComponent implements OnInit { 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 = true + 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 + } } diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html index f4ff38b..8fa5aeb 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html @@ -1 +1,87 @@ -

da-subordinate-audit works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+
+
+
+ 熟悉演练任务 + + 已审批: 6/8 +
+
+
+
+ 联络指导任务 + + 已审批: 6/8 +
+
+
+
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss index e69de29..fa7430c 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss @@ -0,0 +1,146 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + margin-right: 16px; + cursor: pointer; + } + + .selectedMonth { + + background: #2C4DC0; + color: #FFFFFF; + } +} + +.content { + flex: 1; + overflow: hidden; + margin: 20px; + margin-top: 0px; + background: #fff; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + text-align: left; + display: flex; + flex-direction: column; + + .tabheader { + width: 100%; + height: 52px; + background: #E4E7EC; + display: flex; + + .tabtitle { + width: 205px; + height: 52px; + line-height: 52px; + text-align: center; + display: flex; + justify-content: center; + cursor: pointer; + + div { + border-top: 2px solid #E4E7EC; + } + } + + .selectedTab { + background: #fff; + + div { + border-top: 2px solid #2C4DC0; + } + } + } + + .tabbody { + flex: 1; + overflow-y: auto; + color: #000; + box-sizing: border-box; + padding: 18px; + + .card { + color: #303133; + width: 100%; + height: 70px; + border-radius: 4px 4px 4px 4px; + opacity: 1; + display: flex; + margin-bottom: 18px; + box-sizing: border-box; + padding: 0 20px; + position: relative; + div { + display: flex; + align-items: center; + + img { + margin-top: -3px; + } + } + + .unitname { + flex: 3; + } + + .info { + flex: 6; + + span { + margin-right: 20px; + } + } + + .btn { + flex: 1; + } + + .auditimg { + position: absolute; + right: 18%; + top: 9%; + } + } + + .greencard { + background: rgba(66, 185, 131, 0.0400); + border: 1px solid rgba(66, 185, 131, 0.1600); + } + + .redcard { + background: rgba(255, 0, 0, 0.0200); + border: 1px solid rgba(255, 0, 0, 0.1000); + } + } +} diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts index 7e4f904..aa8aa9e 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts @@ -11,5 +11,28 @@ export class DaSubordinateAuditComponent implements OnInit { 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 + } + + selectedTab = 1 + selectTab(item) { + this.selectedTab = item + } } diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss index 1bbddb2..aca7a11 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss @@ -95,33 +95,7 @@ } } -.panelheadernameblue { - background-color: #1D9DFF; -} - -.panelheadernamepurple { - background-color: #9D80FF; -} - -.panelheadernameblue2 { - background-color: #5087FF; -} - -.panelheadernamegreen { - background-color: #42B983; -} - -.panelheadernameor { - background-color: #FF9203; -} -.panelheadernameor2 { - background-color: #FF5D2A; -} - -.panelheadernamered { - background-color: #FF404D; -} .selectUnitPopover { width: 550px; diff --git a/src/assets/images/icon/assist.png b/src/assets/images/icon/assist.png new file mode 100644 index 0000000000000000000000000000000000000000..6f45dc9f4087c49fb00b69902f40bf56cd68b4b0 GIT binary patch literal 628 zcmV-)0*n2LP)Px%E=fc|R5(wKlU+ztVHn5%&)Lr0q{*ZjXi26QDH*d1*M$|^0vps_cR?RS&?34E zx*KEN2a@KbuDgi3EapNtVnHO4>%+|i$-a)sO4Hd~+s+f`ZD*Y=jn2(`-sj`@KJWAV zUqapIjfPzW1Q_su&@SAJcLXFDh{XNDlre?$jVB&5O9g2JMCa?FHGAfW+Mr%ecta)4 zE&y6G6-;p=9QpW9DETEk`uysz;?z=kKlx(e5ikYn0h8G|^lj@v z-_}kn7k^-OMS*5}zn1+2B94%EESx4#muB_1x^S|iUj#f^oI$p*S_L@dMvO1KuBn8< z8S;%?%LB01R}fdGvD>~Khn(Gb{3VT^<~G=6D~2<%Y6T3=Z3zoRpi0Bnk#5lt%-KC4gJnNxcdAK2Hj_HDmg5g*(BRwkxaNg{ZI#F zHf*8>m|a~!quGLejy92SW$$rJC~w3>l>GAVYY-1@I>y+iml$-PMJRPobpGana~OR) zj?~h8wFhF1LP&;D>N;rO;>3rwEM~qdxYRWOl^KDjw`)cygjAJs(G(~CPbm|UEE}Y( zL!_c~!zii^-vx0*mFpgpF;GZbmM$>E17K&x_mKz*wWy9Jj)kU-@xK6vZSn;v;bZ>* O0000Px$oJmAMR5(wiQ_o8RK@|Sp7Un?`EAfzrj^+lLox&pR5`^{-)G^2o-TNmz6=-w~ zItC>{5V=v(sj`DVPEjC{ScxH+k~=X|yKT1Fp@m`Qz4yIu-rM&Lq3x5yr=tvNR00b! zV2FnaxK%+4K}uwkQ`g26(v4uMTeeZ02utmxMq6c+$ko(UD51AcasVI6DI!dEO4eeG z;VfHYAx}O2J25}jVtL%%*Ud>d3& zlek1I$`Njt6_FX24)%HMXf#{M-_&&9{&5M#(yOp}6*Ll2@&G*CG2pOZ!spPz+W9IKJaBuGwOfX^YTz(k z*2x5cu>~Fp_#No8TLh@Rh39G$>C3Nn02IFc#P&M>Y=O~6$1(mzpz<;DTeVU0{ud&H z9mTkN^Z>qeAqn(SpdBlrfUO Y13-ba=G$mR_y7O^07*qoM6N<$f?crQM*si- literal 0 HcmV?d00001 diff --git a/src/assets/images/icon/unit.png b/src/assets/images/icon/unit.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a124d13d74297d38c2533956758132bede1671 GIT binary patch literal 345 zcmV-f0jBPx$6G=otR5(wyl08ZUQ4oZy-j3M>a{~=b77e_?&Wi+5Fw;O#Z?I+?dH_QYV5WkC zvIBr260Uru9?DTG4638Zrx9{P!* z*(Vg`Z{5=;XJ325<*GeUz=06#0Y%FI8y*DcKPx$JV``BR5(wK(jiNOQ544U{{spJgJHpFFj&N5G%Ofa1qFkkVPah|46I^sLC`SK zpomGtC?acuAHacrfCYn~(J(l2@b%I}-m zAu5*8z{_5##S%(sr2#av(RLJxTjz zfeGLRn2j!Y#Cb^{qmaQKtO7U5;U{2afSB2)_b%xnKKBcRL7f5h1o0#%z)YwWo;U`) zl}BJ{MC>8t4+tqH!@`tChJb*0lH*J}X|TSe@d6Od#0PtjyiSa?B<=nSL@Vr&zksiC gC2Zr7q*Fih0~XVK$C^BtmjD0&07*qoM6N<$f-9q=h5!Hn literal 0 HcmV?d00001 diff --git a/src/styles.scss b/src/styles.scss index 50fa3d0..6275361 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -98,7 +98,7 @@ textarea { /* 滚动条样式 */ // ::-webkit-scrollbar:horizontal { width: 5px; background-color: white; } ::-webkit-scrollbar-thumb { - background-color: #999; + background: #E4E7EC; } ::-webkit-scrollbar { @@ -115,17 +115,17 @@ app-root { .blue { cursor: pointer; - color: #2C4DC0!important; + color: #2C4DC0 !important; } .green { cursor: pointer; - color: #42B983!important; + color: #42B983 !important; } .red { cursor: pointer; - color: #FF0000!important; + color: #FF0000 !important; } @@ -179,3 +179,31 @@ app-root { } } + +.panelheadernameblue { + background-color: #1D9DFF; +} + +.panelheadernamepurple { + background-color: #9D80FF; +} + +.panelheadernameblue2 { + background-color: #5087FF; +} + +.panelheadernamegreen { + background-color: #42B983; +} + +.panelheadernameor { + background-color: #FF9203; +} + +.panelheadernameor2 { + background-color: #FF5D2A; +} + +.panelheadernamered { + background-color: #FF404D; +} diff --git a/src/theme.less b/src/theme.less index 401ee93..e9ad8a7 100644 --- a/src/theme.less +++ b/src/theme.less @@ -6,12 +6,18 @@ .ant-table-thead { .ant-table-cell { - background-color: #EEF1F6!important; + background-color: #EEF1F6 !important; } } -.ant-table-cell{ - height: 44px; - box-sizing: border-box; - padding: 0 20px!important; - color: #606266; + +.ant-table-cell { + height: 44px; + box-sizing: border-box; + padding: 0 20px !important; + color: #606266; +} + +.ant-progress-circle .ant-progress-text { + white-space: pre; + font-size: 18px; } From a09e6262830423cf88978a39f3a3d3f7492bc1c7 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 7 Aug 2022 15:10:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=A4=A7=E9=98=9F?= =?UTF-8?q?=E6=9C=AC=E7=BA=A7=E8=AE=A1=E5=88=92=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 +- .../da-oneself-plan.component.html | 256 +++++++++++++++--- .../da-oneself-plan.component.scss | 221 ++++++++++++++- .../da-oneself-plan.component.ts | 18 +- src/assets/images/icon/station.png | Bin 0 -> 340 bytes src/theme.less | 5 + 6 files changed, 448 insertions(+), 56 deletions(-) create mode 100644 src/assets/images/icon/station.png diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 40a8a30..722150f 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -47,6 +47,7 @@ import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { ScrollingModule } from '@angular/cdk/scrolling'; import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; @NgModule({ declarations: [ NavComponent, @@ -99,7 +100,8 @@ import { NzGridModule } from 'ng-zorro-antd/grid'; NzPopoverModule, NzCheckboxModule, ScrollingModule, - NzGridModule + NzGridModule, + NzRadioModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent] }) 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 ccd94f4..f0fb9cc 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 @@ -10,57 +10,229 @@ {{item.name}}
-
-
- 本级部署 - - {{isExpand ? '收起' :'展开'}} - - -
-
-
-
-
-
- - {{item.name}} + +
+ +
+
+ 本级部署 + + {{isExpand ? '收起' :'展开'}} + + +
+
+
+
+
+
+ + {{item.name}} +
+
+

+ 任务分配 + +

+

5/9

+
+
-
-

- 任务分配 - -

-

5/9

+
+ +
-
-
- - +
+

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

+
+
+

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

+

A消防救援站

+

派发

+
+
-
-

- {{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.scss b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss index 535f92c..96272e7 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss @@ -41,9 +41,9 @@ } } -.instrumentpanel { +.instrumentpanelbox { box-sizing: border-box; - padding: 15px 20px; + padding: 18px; color: #303133; .instrumentpanelheader { @@ -53,36 +53,34 @@ margin-bottom: 15px; } - .instrumentpanelopen { + .instrumentpanel { display: flex; flex-wrap: wrap; justify-content: space-between; } - .instrumentpanelopenitem { - width: 24.3%; - height: 260px; + .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; - margin-bottom: 18px; + .itemone { width: 100%; height: 100%; display: flex; - .instrumentpanelopenitemleft { + .instrumentpanelitemleft { display: flex; flex-direction: column; justify-content: space-around; align-items: flex-start; flex: 1; box-sizing: border-box; - padding: 26px 0 26px 10%; + .panelheadername { width: 80%; @@ -118,7 +116,7 @@ } } - .instrumentpanelopenitemright { + .instrumentpanelitemright { flex: 1; display: flex; align-items: center; @@ -168,19 +166,218 @@ align-items: flex-start; box-sizing: border-box; padding: 8px 0; - p{ + + p { margin-bottom: 0; } - .itemtwocontentitemp1{ + + .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; + + .itemone { + .instrumentpanelitemleft { + padding: 26px 0 26px 10%; + } + } + } + + .instrumentpanelitemclose { + width: 11.7%; + height: 200px; + margin-bottom: 0px; + + .itemone { + .instrumentpanelitemleft { + padding: 15px 0 15px 10%; + } + } + } +} + +.stationcardlistbox { + .stationcardlistitembox { + width: 100%; + border-top: 1px dashed #C7CAD0; + box-sizing: border-box; + padding: 18px; + + .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; + } + } + + div:last-child { + border-bottom: 0px; + } + } + } + } + } + +} + +.cutoffrule { + width: 100%; + border-top: 1px dashed #C7CAD0; } 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 b7fbb90..4b1700d 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 @@ -30,7 +30,7 @@ export class DaOneselfPlanComponent implements OnInit { this.selectedMonth = item.name } - isExpand = true + isExpand = false expand() { this.isExpand = !this.isExpand } @@ -52,4 +52,20 @@ export class DaOneselfPlanComponent implements OnInit { 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 + } } diff --git a/src/assets/images/icon/station.png b/src/assets/images/icon/station.png new file mode 100644 index 0000000000000000000000000000000000000000..20e9dd8f47f1ef62b7c4f21b96139271920c0a9a GIT binary patch literal 340 zcmV-a0jvIrP)Px$4oO5oR5(wqlc7!nK@><^vCm5byydAuR%rpy*u#9tDmBnxHCZKY>8t2e3E_ zL2iRVA}E4X)qpDL2QZhkVM&^_TasnW>nQs)BGl2-G7VVmbpYipyNq>qBl@a2`)`|3v}Nk4(b zUy(_bZF*Rz$aRTT%#p2uB3}XXx$vLQKd~}&Wgmdf5$lAoi`2JtD_F?ahHgZ(Z- Date: Sun, 7 Aug 2022 16:40:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=80=BB=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da-monthly-task-overview.component.html | 399 ++++++++++++- .../da-monthly-task-overview.component.scss | 557 ++++++++++++++++++ .../da-monthly-task-overview.component.ts | 74 +++ .../da-oneself-plan.component.scss | 1 + src/assets/images/icon/task.png | Bin 0 -> 391 bytes src/assets/images/icon/task0.png | Bin 0 -> 446 bytes 6 files changed, 1030 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/icon/task.png create mode 100644 src/assets/images/icon/task0.png 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 35e3dab..e65da0c 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 @@ -1 +1,398 @@ -

da-monthly-task-overview works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+ +
+ +
+
+ 上级任务指标 +
+
+
+
+
+
+ + {{item.name}} +
+
+

+ 任务分配 + +

+

5/9

+
+
+

+ 完成率 + 60% +

+ +
+
+
+
+

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

+
+
+

+ 济南历下森豪室内娱乐场 +

+

+ 已分配 + 已检查 +

+
+
+
+
+
+
+ + + +
+
+ 下级任务申请 + + {{istaskauditExpanded ? '收起' :'展开'}} + + +
+ +
+
+ 熟悉演练任务 + + {{shuxiTaskData.isExpand ? '收起' :'展开'}} + + +
+
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+ +
+
+ 联络指导任务 + + {{zhidaoTaskData.isExpand ? '收起' :'展开'}} + + +
+
+ +
+
+
+ + +
+
+ 本级部署 + + {{isdeployboxExpanded ? '收起' :'展开'}} + + +
+
+
+
+ 月计划统计 +
+
+
+ 月计划总数 + 15 +
+ 已完成 15 + + 完成率 + + + 75% + +
+
+
+
+ 周计划统计 +
+
+
+ 周计划总数 + 15 +
+ 已完成 15 + + 完成率 + + + 75% + +
+
+
+
+ + + +
+
+
+
+ + + {{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-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 e69de29..c8ce4da 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 @@ -0,0 +1,557 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + border-bottom: 1px dashed #C7CAD0; + + nz-select { + margin-right: 16px; + border-radius: 4px 4px 4px 4px; + } + + .monthbtn { + width: 80px; + height: 32px; + line-height: 32px; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + margin-right: 16px; + cursor: pointer; + } + + .selectedMonth { + + background: #2C4DC0; + color: #FFFFFF; + } +} + +.instrumentpanelbox { + box-sizing: border-box; + padding: 18px; + color: #303133; + + .instrumentpanelheader { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + } + + .instrumentpanel { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + } + + .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; + } + } + + .jindu { + width: 80%; + margin-left: 8px; + + p { + margin: 0; + display: flex; + justify-content: space-between; + } + } + } + + .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; + + .itemone { + .instrumentpanelitemleft { + padding: 26px 0 26px 10%; + } + } + } + + .instrumentpanelitemclose { + width: 11.7%; + height: 250px; + margin-bottom: 0px; + + .itemone { + .instrumentpanelitemleft { + padding: 15px 0 15px 10%; + } + } + } +} + +.taskaudit { + box-sizing: border-box; + padding: 18px; + color: #303133; + border-top: 1px dashed #C7CAD0; + + .taskauditheader { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + } + + .shuxibox, + .zhidaobox { + + width: 100%; + 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; + box-sizing: border-box; + padding: 18px; + margin-bottom: 18px; + + .header { + display: flex; + justify-content: space-between; + align-items: center; + } + + .content { + .card:first-child { + margin-top: 18px; + } + + .card:last-child { + margin-bottom: 0px; + } + + .card { + color: #303133; + width: 100%; + height: 70px; + border-radius: 4px 4px 4px 4px; + opacity: 1; + display: flex; + box-sizing: border-box; + padding: 0 20px; + position: relative; + margin-bottom: 18px; + + div { + display: flex; + align-items: center; + + img { + margin-top: -3px; + } + } + + .unitname { + flex: 3; + } + + .info { + flex: 6; + + span { + margin-right: 20px; + } + } + + .btn { + flex: 1; + } + + .auditimg { + position: absolute; + right: 18%; + top: 9%; + } + } + + .greencard { + background: rgba(66, 185, 131, 0.0400); + border: 1px solid rgba(66, 185, 131, 0.1600); + } + + .redcard { + background: rgba(255, 0, 0, 0.0200); + border: 1px solid rgba(255, 0, 0, 0.1000); + } + } + } + + .zhidaobox { + margin-bottom: 0px; + + } +} + +.deploybox { + box-sizing: border-box; + padding: 18px; + color: #303133; + border-top: 1px dashed #C7CAD0; + + .deployboxheader { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + } + + .deploycontent { + width: 100%; + display: flex; + justify-content: space-between; + + .deploycontentitem { + width: 49.5%; + height: 110px; + background: linear-gradient(180deg, #7AA3FC 0%, #2C4DC0 100%); + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + box-sizing: border-box; + padding: 18px 18px; + display: flex; + flex-direction: column; + justify-content: space-around; + color: #fff; + .title{ + text-align: left; + } + .details{ + display: flex; + justify-content: space-between; + align-items: center; + .detailsname{ + display: flex; + align-items: center; + } + .progresssquare{ + width: 60%; + display: flex; + color: #fff; + align-items: center; + span:nth-child(1){ + margin-right: 16px; + } + span:last-child{ + margin-left: 16px; + } + } + } + } + + .deploycontentitem:nth-child(1) { + background: linear-gradient(180deg, #7AA3FC 0%, #2C4DC0 100%); + } + + .deploycontentitem:nth-child(2) { + + background: linear-gradient(180deg, #56C5FF 0%, #005DFF 100%); + } + } +} + + + +.stationcardlistbox { + .stationcardlistitembox { + width: 100%; + border-top: 1px dashed #C7CAD0; + box-sizing: border-box; + padding: 18px; + + .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/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 8dee578..6dee90a 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 @@ -11,5 +11,79 @@ export class DaMonthlyTaskOverviewComponent implements OnInit { 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 + } + + + istaskauditExpanded = true + istaskauditexpand() { + this.istaskauditExpanded = !this.istaskauditExpanded + } + + isdeployboxExpanded = true + isdeployboxexpand() { + this.isdeployboxExpanded = !this.isdeployboxExpanded + } + + + shuxiTaskData = { + isExpand: true + } + zhidaoTaskData = { + isExpand: true + } + expand(data) { + data.isExpand = !data.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 + } } diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss index 96272e7..d59d3b0 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss @@ -364,6 +364,7 @@ .btnbox { display: flex; justify-content: flex-end; + align-self: flex-start; } } diff --git a/src/assets/images/icon/task.png b/src/assets/images/icon/task.png new file mode 100644 index 0000000000000000000000000000000000000000..491589eac28928394bef8079e9cfa12a222ca73a GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGR5(x7)4xgsK@bM;@0(mUy8m?LolOH=KQtf;bSk$+FuEX- zi4*1mTtDn6kRi}gB1a%M9}t8JMflJtcz-Iv{Wn0~Z|)Ir9~+y8!>_|xN?0zL?1IIP zD!M|c#=vJ!x-$WG#keWq{g}RJ%>?AjW>tizqksY*31Fpcd`npG_jTj>+H1uL`LbCg zr8urL6Tqa_jqhOW37jB&qaq97ZW0hhx=Y~+2Px$cu7P-R5(walg~;5Q543{xigA^zClqzU^*__S?H{?a$2>lXUO&~iV9k^FnWO6 z9C+^MjdRCXx%DP{=Lp){s7)G^b=xU zttrW?9Y9VwdS*PRoX55Yvfvblmh_0TS1;7ZZb5eaNWEUbIsXADN#hO>4Qk5ieuUpO oLb6k>VRBlQ1Rf7F&KB|77w>QHoWnoZWB>pF07*qoM6N<$g0kJfEC2ui literal 0 HcmV?d00001