+
北京安信科创软件有限公司提供技术支持和维护
diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss index f476283..ceaf0a0 100644 --- a/src/app/pages/login/login.component.scss +++ b/src/app/pages/login/login.component.scss @@ -27,7 +27,7 @@ .hint { text-align: right; - margin-bottom: 40px; + margin-bottom: 50px; .forget{ cursor: pointer; color: #2399FF; diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index d379c6a..8d2dc37 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -43,23 +43,25 @@ export class LoginComponent implements OnInit { this.message.create('error', `请输入账号密码`); return } - if (!this.selectedRole) { - this.message.create('error', `请选择登录角色`); - return - } + // if (!this.selectedRole) { + // this.message.create('error', `请选择登录角色`); + // return + // } this.http.post('/api/TokenAuth/Authenticate', { userNameOrEmailAddress: this.validateForm.value.userName, password: this.validateForm.value.password }).subscribe( (data: any) => { - this.message.create('success', `登陆成功`); + sessionStorage.setItem("token", data.result.accessToken); this.cookieService.set("token", data.result.accessToken, null, '/'); this.cookieService.set("refreshToken", data.result.encryptedAccessToken, null, '/'); - this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data:any) => { - sessionStorage.setItem('userdata',JSON.stringify(data.result.user)) + this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => { + sessionStorage.setItem('userdata', JSON.stringify(data.result.user)) + this.message.create('success', `登陆成功`); + this.router.navigate(['/home/plan']) }) - this.router.navigate(['/home/plan']) + //调用服务中的function刷新token // this.token.startUp() }, From 32251d20f463dd223fde7008ad4dfaf2acf8d381 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 15 Nov 2021 14:27:31 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A4=84=E7=BD=AE=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/pages.module.ts | 4 ++- src/app/pages/plan/plan.component.html | 22 ++++++++++++---- src/app/pages/plan/plan.component.scss | 20 +++++++++------ src/app/pages/plan/plan.component.ts | 35 ++++++++++++++++++++------ src/styles.scss | 22 +++++++++++++--- 5 files changed, 77 insertions(+), 26 deletions(-) diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 73c0fc2..60266a9 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -30,6 +30,7 @@ import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { NzMessageModule } from 'ng-zorro-antd/message'; import { NzSpinModule } from 'ng-zorro-antd/spin'; import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { NzCollapseModule } from 'ng-zorro-antd/collapse'; import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component'; import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component'; import { EquipmentInfoComponent } from './equipment-info/equipment-info.component'; @@ -67,7 +68,8 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip NzDropDownModule, NzMessageModule, NzSpinModule, - NzTreeModule + NzTreeModule, + NzCollapseModule ], entryComponents: [AddequipmentComponent, EditequipmentComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 9fd0863..ce7e17f 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -48,12 +48,24 @@ -{{item.getIconName()}}
-{{item.getIconName()}}
+{{item.name}}
+
+ 
+ 
+ 
+ 
+ 39
+ 今日违规
+ 
+
+
analysis-of-the-host works!
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 new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..9b06ebc --- /dev/null +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AnalysisOfTheHostComponent } from './analysis-of-the-host.component'; + +describe('AnalysisOfTheHostComponent', () => { + let component: AnalysisOfTheHostComponent; + let fixture: ComponentFixture
组织机构管理
用户管理
角色管理分析主机管理灾情描述
+ +
+ 违规事件统计
+
+
+ 违规趋势
+
+
+
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 @@
+analysis-of-the-host works!
+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 @@组织机构管理用户管理角色管理分析主机管理
分析主机管理