From 96dc902d553e1824160a82f995b164326812ca1b Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 15 Nov 2021 15:51:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E9=A2=84=E6=A1=88=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 2 +- .../criminal-records-admin.component.ts | 2 +- src/app/pages/home/home.component.html | 12 +- src/app/pages/login/login.component.html | 2 +- src/app/pages/login/login.component.ts | 6 +- src/app/pages/pages-routing.module.ts | 9 +- src/app/pages/pages.module.ts | 3 +- .../plan-admin/plan-admin.component.html | 128 +++++++++++++++++ .../plan-admin/plan-admin.component.scss | 133 ++++++++++++++++++ .../pages/plan-admin/plan-admin.component.ts | 70 +++++++++ .../today-warning-admin.component.ts | 2 +- src/app/ui/tabbar/tabbar.component.ts | 7 +- src/assets/images/expand.png | Bin 0 -> 1009 bytes src/assets/images/point.png | Bin 0 -> 524 bytes src/assets/images/unexpand.png | Bin 0 -> 1021 bytes src/theme.less | 32 ++++- 16 files changed, 387 insertions(+), 21 deletions(-) create mode 100644 src/app/pages/plan-admin/plan-admin.component.html create mode 100644 src/app/pages/plan-admin/plan-admin.component.scss create mode 100644 src/app/pages/plan-admin/plan-admin.component.ts create mode 100644 src/assets/images/expand.png create mode 100644 src/assets/images/point.png create mode 100644 src/assets/images/unexpand.png diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 12ff333..62ab6f4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -16,7 +16,7 @@ const routes: Routes = [ { path: 'register', component: RegisterComponent }, //注册页 { path: '', component: HomeComponent, children: [ - { path: 'home', loadChildren: () => import('./pages/pages.module').then(m => m.PagesModule) } + { path: '', loadChildren: () => import('./pages/pages.module').then(m => m.PagesModule) } ] }, //首页 { diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index 335a642..bb4723c 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -304,7 +304,7 @@ export class CriminalRecordsAdminComponent implements OnInit { list: any = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] look() { - this.router.navigate(['home/records/petrolStation']) + this.router.navigate(['/records/petrolStation']) } diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index ed6f6c5..9fdcc3c 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -3,19 +3,19 @@
-
  • - 三维预案 +
  • + 站点预案
    • -
  • +
  • 今日预警
    • -
  • +
  • 违规记录
    • -
    diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index 7157455..2af16d5 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -20,7 +20,7 @@
    忘记密码?
    - + +
    +
    +
    + +
    +
    + + + + + + + + + {{ node.title }} + + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    +
    + 加油站名称 +
    +
    + 区域 +
    +
    + 所属公司 +
    +
    + 联系人 +
    +
    + 联系电话 +
    +
    + 操作 +
    +
    +
    +
    +
    + 自营 +
    +
    + 中化山东省淄博市第6加油站 +
    +
    + 山东-淄博 +
    +
    + 中化某某公司 +
    +
    + 张三三 +
    +
    + 0566-5897888 +
    +
    + 查看 +
    +
    +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/app/pages/plan-admin/plan-admin.component.scss b/src/app/pages/plan-admin/plan-admin.component.scss new file mode 100644 index 0000000..faf9468 --- /dev/null +++ b/src/app/pages/plan-admin/plan-admin.component.scss @@ -0,0 +1,133 @@ +.stationPlanBox { + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 20px 24px; + display: flex; +} + +.title { + width: 100%; + height: 48px; +} + +.orbox { + height: 100%; + width: 360px; + margin-right: 40px; + display: flex; + flex-direction: column; + + .or { + flex: 1; + overflow-y: auto; + border: 1px solid rgba(54, 162, 255, 0.3); + background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); + margin-top: 12px; + box-sizing: border-box; + padding: 18px 12px; + nz-tree{ + background: none; + color: #C4E2FC; + } + } +} + +.stationList { + flex: 1; + + display: flex; + flex-direction: column; + + .search { + box-sizing: border-box; + padding-left: 22px; + padding-right: 33px; + width: 100%; + height: 32px; + margin-top: 14px; + margin-bottom: 22px; + + form { + width: 100%; + height: 32px; + display: flex; + justify-content: space-around; + + input { + background: none; + border: 1px solid #91CCFF; + color: #fff; + } + + .searchParams { + width: 28%; + } + + .btn { + width: 5%; + } + } + + + } + + .tablebox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; + + .table { + color: white; + flex: 1; + width: 96%; + display: flex; + flex-direction: column; + overflow: hidden; + + .th { + height: 40px; + line-height: 40px; + background: rgba(35, 153, 255, 0.2); + border: 1px solid rgba(35, 217, 255, 0.4); + box-shadow: 0 0 3px 0 rgba(35, 217, 255, 0.4) inset; + color: #23D9FF; + } + + .tbody { + flex: 1; + overflow-y: auto; + + .tr { + height: 40px; + line-height: 40px; + border-bottom: 1px solid #0d3761; + + div { + color: #91CCFF; + + .look { + color: #36A2FF; + cursor: pointer; + } + } + + } + } + } + + .pagination { + margin-top: 26px; + display: flex; + align-items: center; + justify-content: center; + } + + ::-webkit-scrollbar { + width: 0px; + } + + } +} diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts new file mode 100644 index 0000000..56f8ed3 --- /dev/null +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -0,0 +1,70 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { TreeService } from 'src/app/service/tree.service'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown'; +import { NzFormatEmitEvent, NzTreeComponent, NzTreeNode } from 'ng-zorro-antd/tree'; +import { Router } from '@angular/router'; +@Component({ + selector: 'app-plan-admin', + templateUrl: './plan-admin.component.html', + styleUrls: ['./plan-admin.component.scss'] +}) +export class PlanAdminComponent implements OnInit { + validateForm!: FormGroup; + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + constructor(private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } + list: any = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + ngOnInit(): void { + this.validateForm = this.fb.group({ + name: [null], + linkman: [null], + phone: [null] + }); + this.getAllOrganization() + } + submitForm(): void { + for (const i in this.validateForm.controls) { + this.validateForm.controls[i].markAsDirty(); + this.validateForm.controls[i].updateValueAndValidity(); + } + } + resetForm(e: MouseEvent): void { + e.preventDefault(); + this.validateForm.reset(); + for (const key in this.validateForm.controls) { + this.validateForm.controls[key].markAsPristine(); + this.validateForm.controls[key].updateValueAndValidity(); + } + } + //获取所有组织机构 + nodes: any = [] + nzExpandAll = false + getAllOrganization() { + this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => { + data.result.items.forEach(element => { + element.key = element.code + element.title = element.displayName + }); + this.nodes = [...this.toTree.toTree(data.result.items)] + this.nzExpandAll = true + }) + } + + look() { + this.router.navigate(['/plan/petrolStation']) + } + nzExpandedKeys: any = [] + activatedNode?: NzTreeNode; + //点击tree节点 + activeNode(data: NzFormatEmitEvent): void { + this.activatedNode = data.node!; + // console.log(data) + } + + expand(e, node) { + e.stopPropagation() + node.isExpanded = !node.isExpanded + } + +} diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts index 6b9169b..1a2c595 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts @@ -68,6 +68,6 @@ export class TodayWarningAdminComponent implements OnInit { } look() { - this.router.navigate(['home/warning/petrolStation']) + this.router.navigate(['warning/petrolStation']) } } diff --git a/src/app/ui/tabbar/tabbar.component.ts b/src/app/ui/tabbar/tabbar.component.ts index e8ca9a4..87f7986 100644 --- a/src/app/ui/tabbar/tabbar.component.ts +++ b/src/app/ui/tabbar/tabbar.component.ts @@ -21,9 +21,10 @@ export class TabbarComponent implements OnInit { setInterval(() => { this.getTime() }, 1000); - this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => { - this.surname = data.result.user.surname - }) + this.surname = JSON.parse(sessionStorage.getItem('userdata')).surname + // this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => { + // this.surname = data.result.user.surname + // }) } //获得时间 diff --git a/src/assets/images/expand.png b/src/assets/images/expand.png new file mode 100644 index 0000000000000000000000000000000000000000..53293dbbc3540ac20422d624971703e18733aead GIT binary patch literal 1009 zcmV71Q{000BHNkl0oUTnO~FvqZ;&pE zAc$@nv*3$(;7-Adl`aMz!!|%ZUq>$Oqml&G*Ql(8 zwD|<6GJHP3wGFl`u}7=e8+*82a1*uj&;>v**q)^DNr>4)>n7S;BJYT_L><-K55T2} z2gYHAq!x2|2?G;|*5z1ZAAhBU?DCv7Gy$^4Gix%$2Sk}k_6zr z?Osp5~O1q~=e|IJGk>r-7k%Al~~51w@%8875?DOk-%cDd559AMnP# zwYqQw!gMX?fFYfscA*I~LrP6UD_Wz9Z||QKppis6&@7n#K9C=pr`mAop`r z;~%uNL=8o3C2`m^LZPigj#rz+d5Z~~MmegHrE-dT^crS0!|pzsUvcw;@8LvcJ4PKU zRFtDtiq-;Er^vWJ0ak5XRN#!q+5%H&m}QIYSJ+c^)0VYxwVic|qY`<21vxB`?HXBx zHt8G>NDoqt>qod|ihFT@TS{;jxyIt<9SpaN*xrKOF0y|U5$vftK&-Z>O?bbLk5}-) zp4!jw8(X;TE}Z9$7Z~uV`35}!{$yvdABe#%v6NS-#1qT fzRWY};XUAjQX-btUt-*c2#T^~s`UCtNLM_X_>fgaKT%fNv zWZkFa5-{46+dyul0oy<@Lg_VS5bX9F<#B;q4DnR(KZ57zK_6`_c@R2L(E&P^I)Sdh zUgHf|V5cHG3GA$)T(0np@Q=Y4QJ5g7S7e#PL`64P3WTmG-nac8BCiQ-#jsJ4t;?`i zr#PkrE>tB+OXCWBj_yCNbv0p2(a{v%Q^bsS%U2D0@Bx(Ljn-^-o{e71Q{000BTNkl1v^oLgTQIyx~zKyWbw84yHqqcB;zRL3mcx^d$lkR&_N_XLtH`8{dq&7=FP5Gf;r+?;-~;Bk~@iIzp^> z&q5Ce_;?MU_3_=m@SEGX3H%c9d7$?qsM^{<{Lx1~Es;0ZkfQ?Gt&xR6(wnO3L#lCu z2-i+=PmXXm65Ojj+};7cfu2>m0BqE4?I8oK8>3DXD$3C+MQeeoQ)E0q24vO6MFq}y ztSvBghFP)LL4}<_w{VO0o&`?TZQey5=BU;`XlaRBir7kG?}&s#Th{=U#CeMml3F>c zv88f~di)}0J;Uxlz%8mg2Ru~=MD&P~g5ci$nJ2XFsK{oP|8wNgHihOvcWIHasB_3LYx#?~dk z&0W;t3hJdcu@s~>p;gy(46HfJ*Pp%3+P&LNWbQx0fBq9kQt^?7qbOpiO2*Dp{5_&t zKf&&AW3L9jg?izHL^)CeZQ7nsIz_|2^UWy!SnomVDZY`Q2LvUNF!wvXbK8 z70UIWuK^4(43-9kJ|de3T2FUa^QLfY2Z>Iy+llx^2?p~(QIiLS*RnJKAA$nn%#c#k z(u$67bgiT#ELm=NHz>?BKX^s1978V|7|W1|ajq#s*4zPmWeh`2dgH4JFv={+C?QK@ zTE@^p(-NLkNOS;thw*{}!&qyEMa8&XlIMyt?9yL9#)e^+#}F^rL2QEL6?E;0ii|`S zWI~Z4$-E#Ib_!G&;i+)s-jchNJk2R1NzI>_eQ@lAQgYcYo&2^Jr@0vS&{dzf6%ki4 zi7_O2A{{k}Z|X@UskNqzE6Q!WoW?JZHLG+Lre z+yHfjGY%UnjZoBPgvooDN$f%`T~K!kuu&Nbc(C?(19{^Rl_aQvMr9qO&6^)p89pE4 zx&~X8*r)5*)dSqb$_onj<-n=6^Iapfr_~X%Y$K|E1B`q4WQ0F%<3f8{)+J7zyrSdJ zdSkHo$pM19FnHVmySMN>fSVimSv$JC`7T%ZEVxr>c%F9ub8!#$JzH)0G2@zNnt8