diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index cf769ea..aa55342 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -57,8 +57,29 @@
-
+
+
+ + + 违规事件统计 + +
+
违规事件总数
+
206
+
+
+ +
+
+
+ + + 违规趋势 + +
+
+
@@ -102,7 +123,7 @@ 加油区2号摄像头
- 2021-10-12 09:28:13 + 2021-10-12 09:28:13
查看 @@ -117,4 +138,4 @@
- + \ No newline at end of file diff --git a/src/app/pages/criminal-records/criminal-records.component.scss b/src/app/pages/criminal-records/criminal-records.component.scss index 99713ae..ec459a9 100644 --- a/src/app/pages/criminal-records/criminal-records.component.scss +++ b/src/app/pages/criminal-records/criminal-records.component.scss @@ -10,7 +10,7 @@ padding: 0 36px; width: 100%; height: 32px; - margin: 20px 0px; + margin-top: 14px; form { width: 100%; @@ -47,7 +47,7 @@ overflow: hidden; .title { - margin-bottom: 15px; + margin: 13px 0; width: 100%; height: 64px; box-sizing: border-box; @@ -59,10 +59,99 @@ display: flex; justify-content: center; - .charts { - width: 98%; - height: 300px; - border: 1px solid white; + .chart { + width: 97%; + height: 360px; + border: 0px; + box-shadow: 0 0 26px 0px #1a7fd7 inset; + box-sizing: border-box; + padding: 18px 26px; + display: flex; + + div { + display: flex; + flex-direction: column; + + span { + font-family: titlefont; + display: flex; + align-items: center; + height: 28px; + color: #bee1ff; + font-size: 16px; + } + + div { + flex: 1; + } + + .piechart {} + + .barchart { + // border: 1px solid rgba(145, 204, 255, 0.95); + } + } + + .leftbox { + width: 360px; + position: relative; + + .centerContent { + position: absolute; + top: 42%; + left: 11%; + width: 170px; + + div { + text-align: center; + } + + .numname { + font-family: titlefont; + color: #bee1ff; + } + + .num { + color: #FFFFFF; + font-size: 42px; + text-shadow: 0px 0px 16px #3A9AFF; + font-weight: bold; + height: 49px; + line-height: 50px; + } + } + } + + .rightbox { + flex: 1; + position: relative; + + .btnbox { + position: absolute; + right: 5px; + top: 5px; + display: flex; + flex-direction: row; + z-index: 999; + + button { + border: 1px solid #91CCFF; + color: #91CCFF; + border-radius: 0px; + box-shadow: 0 0 5px 0 #2399FF inset; + background: none; + } + + .rankingBtn { + margin-right: 16px; + } + + .selectedbtn { + background: linear-gradient(180deg, #000D21 0%, #001331 27%, #2399FF 100%); + color: white; + } + } + } } } diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts index e396d37..727604e 100644 --- a/src/app/pages/criminal-records/criminal-records.component.ts +++ b/src/app/pages/criminal-records/criminal-records.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import * as echarts from 'echarts'; @Component({ selector: 'app-criminal-records', templateUrl: './criminal-records.component.html', @@ -8,7 +9,120 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; export class CriminalRecordsComponent implements OnInit { validateForm!: FormGroup; constructor(private fb: FormBuilder) { } + mybarChart: any //柱状图 + baroption = { + xAxis: { + type: 'category', + data: this.getThirtyDays(), + axisLine: { + show: false, + lineStyle: { + color: '#91CCFF' + } + }, + axisTick: {//刻度线 + show: false + } + }, + yAxis: { + type: 'value', + nameTextStyle: { + color: '#C4E2FC' + }, + splitLine: {//分割线 + lineStyle: { + color: ['#0f4374'], + width: 2 + } + }, + axisTick: {//刻度线 + show: false + }, + axisLine: {//轴线 + show: false, + lineStyle: { + color: '#C4E2FC' + } + } + }, + series: [ + { + data: [120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 100, 101], + type: 'bar', + itemStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: '#23F0FF' // 0% 处的颜色 + }, { + offset: 1, color: 'rgba(35, 153, 255, 0.1)' // 100% 处的颜色 + }], + global: false // 缺省为 false + } + }, + barWidth: '25%' + }, + { + data: [120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 120, 200, 150, 80, 70, 110, 130, 100, 101], + type: 'line', + symbol: 'circle', + symbolSize: 8, + itemStyle: { + color: '#fff', + shadowColor: '#fff', + shadowBlur: 10 + }, + lineStyle: { + color: '#FFCC8A', + width: 1 + } + } + ], + grid: { + left: '36px', + right: '30px', + bottom: '50px', + top: '45px' + } + }; + getThirtyDays() { + //获取当前日期 + let myDate = new Date(); + var nowY = myDate.getFullYear(); + var nowM = myDate.getMonth() + 1; + var nowD = myDate.getDate(); + var enddateStr = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期 + var enddate = new Date(enddateStr); + + //获取三十天前日期 + var lw = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思 + var lastY = lw.getFullYear(); + var lastM = lw.getMonth() + 1; + var lastD = lw.getDate(); + var startdateStr = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期 + var startDate = new Date(startdateStr); + + const dateList = [] + while (true) { + startDate.setDate(startDate.getDate() + 1) + if (startDate.getTime() <= enddate.getTime()) { + if (startDate.getDate() < 10) { + // startDate.getFullYear() 获取年，此处没加上年份 + dateList.push((startDate.getMonth() + 1) + '.0' + startDate.getDate()) + } else { + dateList.push((startDate.getMonth() + 1) + '.' + startDate.getDate()) + } + } else { + break + } + } + return dateList; + } ngOnInit(): void { this.validateForm = this.fb.group({ level: [null], @@ -16,6 +130,75 @@ export class CriminalRecordsComponent implements OnInit { site: [null], datePicker: [null] }); + // 基于准备好的dom，初始化echarts实例 + let myChart = echarts.init(document.getElementById('piechart')); + let option = { + color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'], + tooltip: { + trigger: 'item'//触发类型 + }, + series: [ + { + // name: 'Access From', + type: 'pie', + radius: [85, 112],//内半径外，外半径 + left: '-30%', + avoidLabelOverlap: false,//防止标签重叠策略 + label: {//每一个标签外网延伸的引导说明 + show: false, + position: 'outside' + }, + labelLine: {//引导线 + show: true, + showAbove: true + }, + emphasis: {//中间高亮区域 + label: { + show: false, + fontSize: '40', + fontWeight: 'bold' + } + }, + data: [ + { value: 26, name: '工作人员倚靠加油机或者立柱1' }, + { value: 86, name: '工作人员倚靠加油机或者立柱2' }, + { value: 34, name: '工作人员倚靠加油机或者立柱3' }, + { value: 55, name: '工作人员倚靠加油机或者立柱4' }, + { value: 60, name: '工作人员倚靠加油机或者立柱5' }, + { value: 26, name: '工作人员倚靠加油机或者立柱6' }, + { value: 86, name: '工作人员倚靠加油机或者立柱7' }, + { value: 34, name: '工作人员倚靠加油机或者立柱8' }, + { value: 55, name: '工作人员倚靠加油机或者立柱9' }, + { value: 60, name: '工作人员倚靠加油机或者立柱10' }, + { value: 26, name: '工作人员倚靠加油机或者立柱11' }, + { value: 86, name: '工作人员倚靠加油机或者立柱12' }, + { value: 34, name: '工作人员倚靠加油机或者立柱13' }, + { value: 55, name: '工作人员倚靠加油机或者立柱14' }, + { value: 60, name: '工作人员倚靠加油机或者立柱15' }, + { value: 26, name: '工作人员倚靠加油机或者立柱16' }, + { value: 86, name: '工作人员倚靠加油机或者立柱17' }, + { value: 34, name: '工作人员倚靠加油机或者立柱18' }, + { value: 55, name: '工作人员倚靠加油机或者立柱19' }, + { value: 60, name: '工作人员倚靠加油机或者立柱20' } + ], + tooltip: {//鼠标移入提示 + position: 'right', + padding: [14, 19], + backgroundColor: 'rgba(28, 129, 218, 0.4)', + textStyle: { + color: '#fff', + fontSize: 12 + } + } + } + ] + }; + // 绘制图表 + myChart.setOption(option); + + this.mybarChart = echarts.init(document.getElementById('barchart')); + + this.mybarChart.setOption(this.baroption); } submitForm(): void { for (const i in this.validateForm.controls) { diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 78973af..49d7d83 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -3,21 +3,25 @@
-
  • +
  • 站点预案
    • -
  • +
  • 今日预警
    • -
  • +
  • 违规记录
    • -
    diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index f8a37a6..d120480 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -10,10 +10,17 @@ import { filter } from 'rxjs/operators'; export class HomeComponent implements OnInit { constructor(private router: Router) { } - + isGasStationNav: boolean isGasStation: boolean isWarning: boolean = false//是否是今日预警页面 ngOnInit(): void { + + if(sessionStorage.getItem('isGasStation') == 'true'){ + this.isGasStationNav = true + }else{ + this.isGasStationNav = false + } + this.router.events.pipe( filter(event => event instanceof NavigationEnd) ).subscribe((event: any) => { diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 9b63de3..6d85972 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -60,14 +60,14 @@ export class LoginComponent implements OnInit { this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => { sessionStorage.setItem('userdata', JSON.stringify(data.result.user)) this.isLoading = false; - this.message.create('success', `登陆成功`); - if(data.result.user.organization.isGasStation){ + if (data.result.user.organization.isGasStation) { sessionStorage.setItem("isGasStation", 'true'); this.router.navigate(['/plan/petrolStation']) - }else{ + } else { sessionStorage.setItem("isGasStation", 'false'); this.router.navigate(['/plan']) } + this.message.create('success', `登陆成功`); }) //调用服务中的function刷新token diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html index 948db0c..ab4456a 100644 --- a/src/app/pages/plan-admin/plan-admin.component.html +++ b/src/app/pages/plan-admin/plan-admin.component.html @@ -7,7 +7,7 @@
    + [nzTreeTemplate]="nzTreeTemplate"[nzMultiple]="false"> diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 56f8ed3..73538f4 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -43,7 +43,7 @@ export class PlanAdminComponent implements OnInit { getAllOrganization() { this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => { data.result.items.forEach(element => { - element.key = element.code + element.key = element.id element.title = element.displayName }); this.nodes = [...this.toTree.toTree(data.result.items)] diff --git a/src/app/system-management/analysis-of-the-host/addhost/addhost.component.html b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.html new file mode 100644 index 0000000..06d354d --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.html @@ -0,0 +1,11 @@ +
    +
    + + + + + + + +
    +
    \ No newline at end of file diff --git a/src/app/system-management/analysis-of-the-host/addhost/addhost.component.scss b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.scss new file mode 100644 index 0000000..6f8c35d --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.scss @@ -0,0 +1,3 @@ +.ant-form-item{ + margin-bottom: 0; +} \ No newline at end of file diff --git a/src/app/system-management/analysis-of-the-host/addhost/addhost.component.ts b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.ts new file mode 100644 index 0000000..73d5163 --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/addhost/addhost.component.ts @@ -0,0 +1,21 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; + +@Component({ + selector: 'app-addhost', + templateUrl: './addhost.component.html', + styleUrls: ['./addhost.component.scss'] +}) +export class AddhostComponent implements OnInit { + + validateForm!: FormGroup; + constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { } + + ngOnInit(): void { + this.validateForm = this.fb.group({ + ip: [null, [Validators.required]] + }); + } +} diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html index a121a4c..776d383 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html @@ -1 +1,70 @@ -

    analysis-of-the-host works!

    +
    +
    +
    +
    + 组织机构列表 +
    +
    + + + +
    +
    +
    + 组织机构 +
    +
    + + + +
    + {{ node.title }} +
    +     + + + + + + + + +
    + +
    +
    +
    +
    + 加油站分析主机列表 + （请从左侧选择加油站） + +
    +
    + +
    +
    +
    + + + + ip + 操作 + + + + + {{data.ip}} + + 编辑 + 删除 + + + + +
    +
    +
    \ No newline at end of file diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.scss b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.scss index e69de29..bc0564a 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.scss +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.scss @@ -0,0 +1,92 @@ +.bigbox { + width: 100%; + height: 100%; + display: flex; + background: #fff; + box-sizing: border-box; + padding: 20px; + font-size: 15px; +} + + +.orbox { + width: 375px; + height: 100%; + overflow-y: auto; + + display: flex; + flex-direction: column; +} + +.topbox { + width: 100%; + height: 36px; + display: flex; + align-items: center; + justify-content: space-between; + + .lefttop { + span { + color: #000D21; + margin-right: 16px; + } + + .yellowspan { + color: rgb(240, 176, 37); + } + } + + .righttop { + height: 36px; + display: flex; + + button { + margin-left: 16px; + } + + nz-input-group { + height: 32px; + } + } +} + +.treeTitle { + width: 100%; + height: 36px; + line-height: 36px; + display: flex; + justify-content: space-between; + color: #000D21; + box-sizing: border-box; + padding-left: 30px; + padding-right: 180px; + background: rgba(145, 204, 255, 0.2); + border: 1px solid rgba(145, 204, 255, 0.2); +} + +.treebox { + flex: 1; + overflow-y: auto; + border: 1px solid rgba(145, 204, 255, 0.2); + border-top: 0px; + box-sizing: border-box; + padding: 10px 6px; + tr{ + th,td{ + text-align: center!important; + } + } +} + +.nodebox { + font-size: 15px; +} + +.hostListbox { + flex: 1; + margin-left: 26px; +} + +.tablebox { + margin-top: 16px; +} diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.spec.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.spec.ts deleted file mode 100644 index 9b06ebc..0000000 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AnalysisOfTheHostComponent } from './analysis-of-the-host.component'; - -describe('AnalysisOfTheHostComponent', () => { - let component: AnalysisOfTheHostComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AnalysisOfTheHostComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AnalysisOfTheHostComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts index d0d5474..a10f11b 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts @@ -1,5 +1,11 @@ -import { Component, OnInit } from '@angular/core'; - +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit, AfterViewInit, ViewChild, ViewContainerRef } from '@angular/core'; +import { TreeService } from 'src/app/service/tree.service'; +import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { AddhostComponent } from './addhost/addhost.component'; @Component({ selector: 'app-analysis-of-the-host', templateUrl: './analysis-of-the-host.component.html', @@ -7,9 +13,96 @@ import { Component, OnInit } from '@angular/core'; }) export class AnalysisOfTheHostComponent implements OnInit { - constructor() { } - + constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private message: NzMessageService, private viewContainerRef: ViewContainerRef) { } ngOnInit(): void { + this.getAllOrganization() + } + + + //获取所有组织机构 + searchValue = ''; + nzExpandAll = false; + totalCount: string + getAllOrganization() { + this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => { + this.totalCount = data.result.totalCount + data.result.items.forEach(element => { + element.key = element.id + element.title = element.displayName + element.selectable = false + }); + this.nodes = [...this.toTree.toTree(data.result.items)] + this.defaultExpandedKeys = [...this.defaultExpandedKeys] + }) } + + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + + defaultExpandedKeys = []; + + nodes: any[] = [] + nzSelectedKeys: any[] = [] + selectedOilStation:any + nzClick(event: NzFormatEmitEvent): void { + console.log(event.node.origin); + if(event.node.origin.isGasStation){//如果点击的是加油站才生效 + this.nzSelectedKeys[0] = event.node.origin.id + this.nzSelectedKeys = [...this.nzSelectedKeys] + this.selectedOilStation = event.node.origin + this.getHost() + }else{ + this.message.info('只有加油站才可以增加主机'); + } + } + + //获得加油站的主机 + getHost(){ + + } + + ngAfterViewInit(): void { + + } + + //新增分析主机 + addHost() { + const modal = this.modal.create({ + nzTitle: '新增加油站主机', + nzContent: AddhostComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 288, + nzComponentParams: {}, + nzOnOk: async () => { + if (instance.validateForm.valid) { + await new Promise(resolve => { + console.log('表单信息', instance.validateForm) + + let body = { + // name: instance.validateForm.value.name, + // DisplayName: instance.validateForm.value.name, + // grantedPermissions: arr + } + this.http.post('/api/services/app/Role/Create', body).subscribe(data => { + resolve(data) + this.message.create('success', '创建成功！'); + // this.getAllRoles() + return true + }) + }) + } else { + this.message.create('warning', '请填写完整！'); + return false + } + } + }); + const instance = modal.getContentComponent(); + } + edit(data) { + + } + delete(data) { + + } + listOfData: any[] = []; } diff --git a/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html new file mode 100644 index 0000000..25287ae --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.html @@ -0,0 +1 @@ +

    edithost works!

    diff --git a/src/app/system-management/analysis-of-the-host/edithost/edithost.component.scss b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/system-management/analysis-of-the-host/edithost/edithost.component.ts b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.ts new file mode 100644 index 0000000..83c9af2 --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/edithost/edithost.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-edithost', + templateUrl: './edithost.component.html', + styleUrls: ['./edithost.component.scss'] +}) +export class EdithostComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/system-management/navigation/navigation.component.html b/src/app/system-management/navigation/navigation.component.html index 429fa75..c32cf4d 100644 --- a/src/app/system-management/navigation/navigation.component.html +++ b/src/app/system-management/navigation/navigation.component.html @@ -16,7 +16,7 @@
  • 组织机构管理
  • 用户管理
  • 角色管理
    • -
  • 分析主机管理
    • +
  • 分析主机管理
    • diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts index e49b004..d0fc6ae 100644 --- a/src/app/system-management/system-management.module.ts +++ b/src/app/system-management/system-management.module.ts @@ -28,8 +28,10 @@ import { AddorComponent } from './organization/addor/addor.component'; import { EditorComponent } from './organization/editor/editor.component'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { AnalysisOfTheHostComponent } from './analysis-of-the-host/analysis-of-the-host.component'; +import { AddhostComponent } from './analysis-of-the-host/addhost/addhost.component'; +import { EdithostComponent } from './analysis-of-the-host/edithost/edithost.component'; @NgModule({ - declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent], + declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent], imports: [ CommonModule, SystemRoutingModule, @@ -51,7 +53,7 @@ import { AnalysisOfTheHostComponent } from './analysis-of-the-host/analysis-of-t NzTreeSelectModule, NzCheckboxModule ], - entryComponents :[AdduserComponent,EdituserComponent,AddroleComponent,EditroleComponent,AddorComponent,EditorComponent] + entryComponents :[AdduserComponent,EdituserComponent,AddroleComponent,EditroleComponent,AddorComponent,EditorComponent,AddhostComponent,EdithostComponent] }) export class SystemManagementModule { } diff --git a/src/assets/images/icon/host.png b/src/assets/images/icon/host.png new file mode 100644 index 0000000..20d356c Binary files /dev/null and b/src/assets/images/icon/host.png differ diff --git a/src/theme.less b/src/theme.less index 871eb3a..ed42a31 100644 --- a/src/theme.less +++ b/src/theme.less @@ -153,12 +153,17 @@ //表格 #userBox, -#roleBox { +#roleBox, +#hostbox { .ant-table-thead>tr>th { background: rgba(145, 204, 255, 0.15); } } - +#hostbox{ + .ant-table-thead > tr > th,.ant-table-tbody > tr > td{ + text-align: center; + } +} @select-background: transparent; @border-color-base: #91CCFF;