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 0000000..53293db Binary files /dev/null and b/src/assets/images/expand.png differ diff --git a/src/assets/images/point.png b/src/assets/images/point.png new file mode 100644 index 0000000..3ade358 Binary files /dev/null and b/src/assets/images/point.png differ diff --git a/src/assets/images/unexpand.png b/src/assets/images/unexpand.png new file mode 100644 index 0000000..818516d Binary files /dev/null and b/src/assets/images/unexpand.png differ diff --git a/src/theme.less b/src/theme.less index 4880919..0343397 100644 --- a/src/theme.less +++ b/src/theme.less @@ -5,7 +5,8 @@ //分页器 #recordsboxadmin, #recordsbox, -#equipmentInfo { +#equipmentInfo, +#stationPlanBox { .ant-pagination-total-text, .ant-pagination-options-quick-jumper { @@ -40,6 +41,25 @@ color: #91CCFF; } +//自营和加盟 +.ziying, +.jiameng { + display: inline-block; + width: 36px; + height: 20px; + line-height: 20px; + text-align: center; + background: #2399FF; + opacity: 1; + border-radius: 2px; + color: #fff !important; + font-size: 12px; +} + +.jiameng { + background: #FF9963; +} + //接收报警弹出框 .ant-notification { width: 500px; @@ -246,3 +266,13 @@ border: none; } } + + +#stationPlanBox { + .ant-tree .ant-tree-node-content-wrapper:hover ,.ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected{ + background: linear-gradient(90deg, rgba(0, 13, 33, 0) 0%, #2399FF 50%, rgba(0, 13, 33, 0) 100%); + } + .ant-tree .ant-tree-node-content-wrapper{ + padding: 2px 20px; + } +}