From 396eaa828b75cc346722dc5c06d7dcf13317472c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 20 Jun 2022 16:55:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=8F=9C=E5=8D=95=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/home/home.component.html | 44 +++++---------- src/app/pages/home/home.component.ts | 56 ++++++++++++++----- src/app/pages/login/login.component.ts | 9 ++- .../records-nav/records-nav.component.html | 6 -- .../records-nav/records-nav.component.spec.ts | 25 +++++++++ .../records-nav/records-nav.component.ts | 7 --- src/app/service/selectedMenu.service.ts | 22 ++++++++ .../navigation/navigation.component.ts | 1 + 8 files changed, 108 insertions(+), 62 deletions(-) create mode 100644 src/app/pages/records/records-nav/records-nav.component.spec.ts create mode 100644 src/app/service/selectedMenu.service.ts diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index b100b77..1837eea 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -7,39 +7,25 @@
-
  • - 首页 -
    • -
  • - 数字油站 -
    • -
  • - 今日预警 -
    • -
  • - 预警记录 -
    • -
  • - 证照管理 +
  • + {{item.name}}
    • -
  • - 数字油站 -
    • -
  • - 今日预警 -
    • -
  • - 预警记录 -
    • -
  • - 证照管理 -
    • -
    - + +
  • + 数字油站 +
    • +     + +
  • + {{item.name}} +
    • +     +
    diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index d2698e8..9a639bd 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -16,6 +16,7 @@ declare var abp: any import * as moment from 'moment'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DisposeequipmentComponent } from '../records/warning-statistics-list/disposeequipment/disposeequipment.component'; +import { SelectedMenu } from 'src/app/service/selectedMenu.service'; @Component({ selector: 'app-home', templateUrl: './home.component.html', @@ -25,7 +26,7 @@ export class HomeComponent implements OnInit { @ViewChild('warning', { static: false }) template?: TemplateRef<{}>; passwordValidateForm!: FormGroup; constructor(private listRefreshService: listRefreshService, private http: HttpClient, private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService, - private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private fb: FormBuilder) { + private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private fb: FormBuilder, private selectedMenu: SelectedMenu) { const { password } = MyValidators; this.passwordValidateForm = this.fb.group({ oldpassword: [null, [Validators.required]], @@ -41,7 +42,41 @@ export class HomeComponent implements OnInit { surname: string userName: string + + + //菜单 + menu1 = [ + { name: '首页', url: '/homepage' }, + { name: '数字油站', url: '/plan' }, + { name: '今日预警', url: '/todaywarning' }, + { name: '预警记录', url: '/records_nav' }, + { name: '证照管理', url: '/audit' }, + ] + menu2 = [ + { name: '数字油站', url: '/plan/petrolStation' }, + { name: '今日预警', url: '/todaywarning/petrolStation' }, + { name: '预警记录', url: '/records_nav/petrolStation' }, + { name: '证照管理', url: '/license/petrolStation' }, + ] + + selectedItem + routerChange(item) { + if (item.name == this.selectedItem) { + return + } + sessionStorage.setItem('selectedMenu', item.name) + this.selectedItem = item.name + this.router.navigate([item.url]) + } + + + selectedMenuObj ngOnInit(): void { + + if (sessionStorage.getItem('selectedMenu')) { + this.selectedItem = sessionStorage.getItem('selectedMenu') + } + this.isGasStation = JSON.parse(sessionStorage.getItem('isGasStation')) //初始化登陆 如果是油站用户 if (this.isGasStation) { @@ -95,7 +130,11 @@ export class HomeComponent implements OnInit { } - + ngAfterViewInit() { + SignalRAspNetCoreHelper.initSignalR(); + abp.event.on('abp.notifications.received', this.reloadPage); + this.selectedMenuObj.unsubscribe() + } //初次登陆修改密码弹窗 isVisible = false isConfirmLoading = false @@ -146,10 +185,6 @@ export class HomeComponent implements OnInit { this.receiptOfNotification(userNotification) }; - ngAfterViewInit() { - SignalRAspNetCoreHelper.initSignalR(); - abp.event.on('abp.notifications.received', this.reloadPage); - } //右下角消息弹窗 messageId = [] @@ -469,13 +504,4 @@ export class HomeComponent implements OnInit { modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result)); } - - selectedMenu - routerChange(url, name) { - if (this.selectedMenu == name) { - return - } - this.selectedMenu = name - this.router.navigate([url]) - } } diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index a8685d7..ec9282d 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -7,6 +7,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'; import { Base64 } from 'js-base64'; import { NzNotificationService } from 'ng-zorro-antd/notification'; import { NzSafeAny } from 'ng-zorro-antd/core/types'; +import { SelectedMenu } from 'src/app/service/selectedMenu.service'; declare var abp: any @Component({ @@ -19,7 +20,7 @@ export class LoginComponent implements OnInit { validateForm!: FormGroup; passwordValidateForm!: FormGroup; - constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService) { + constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService, private selectedMenu: SelectedMenu) { const { password } = MyValidators; this.validateForm = this.fb.group({ userName: [null, [Validators.required]], @@ -129,12 +130,12 @@ export class LoginComponent implements OnInit { sessionStorage.setItem("isGasStation", 'true'); this.router.navigate(['/todaywarning/petrolStation']) this.message.create('success', `登录成功`); - + sessionStorage.setItem('selectedMenu', '今日预警') } else { sessionStorage.setItem("isGasStation", 'false'); this.router.navigate(['/homepage']) this.message.create('success', `登录成功`); - + sessionStorage.setItem('selectedMenu', '首页') } } }, err => { @@ -155,8 +156,6 @@ export class LoginComponent implements OnInit { this.message.create('warning', `请联系管理员`); } - - } export type MyErrorsOptions = { 'zh-cn': string; en: string } & Record; export type MyValidationErrors = Record; diff --git a/src/app/pages/records/records-nav/records-nav.component.html b/src/app/pages/records/records-nav/records-nav.component.html index 46bec9f..3c4e44d 100644 --- a/src/app/pages/records/records-nav/records-nav.component.html +++ b/src/app/pages/records/records-nav/records-nav.component.html @@ -6,12 +6,6 @@
    {{item}} -
    diff --git a/src/app/pages/records/records-nav/records-nav.component.spec.ts b/src/app/pages/records/records-nav/records-nav.component.spec.ts new file mode 100644 index 0000000..52b6697 --- /dev/null +++ b/src/app/pages/records/records-nav/records-nav.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RecordsNavComponent } from './records-nav.component'; + +describe('RecordsNavComponent', () => { + let component: RecordsNavComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RecordsNavComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RecordsNavComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/records/records-nav/records-nav.component.ts b/src/app/pages/records/records-nav/records-nav.component.ts index 5b59506..e36d826 100644 --- a/src/app/pages/records/records-nav/records-nav.component.ts +++ b/src/app/pages/records/records-nav/records-nav.component.ts @@ -51,11 +51,4 @@ export class RecordsNavComponent implements OnInit { } } - isEchartsShow() { - console.log('发了吗') - this.isEcharts = !this.isEcharts - setTimeout(() => { - this.isShowEcharts.sendMessage(this.selectedMenu) - }, 0); - } } diff --git a/src/app/service/selectedMenu.service.ts b/src/app/service/selectedMenu.service.ts new file mode 100644 index 0000000..b4360f5 --- /dev/null +++ b/src/app/service/selectedMenu.service.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { Observable, ReplaySubject } from 'rxjs'; + +@Injectable({ + providedIn: 'root' +}) +export class SelectedMenu { + + constructor() { } + private _sendMessage: ReplaySubject = new ReplaySubject(1); + /** * 向其他组件发送信息 ** + * @param message 需要发送的信息 * + * @returns {Observavle} */ + + public sendMessage(message: any) { + this._sendMessage.next(message); + } + + public getMessage(): Observable { + return this._sendMessage.asObservable(); + } +} diff --git a/src/app/system-management/navigation/navigation.component.ts b/src/app/system-management/navigation/navigation.component.ts index 378932c..35651c4 100644 --- a/src/app/system-management/navigation/navigation.component.ts +++ b/src/app/system-management/navigation/navigation.component.ts @@ -16,6 +16,7 @@ export class NavigationComponent implements OnInit { this.router.navigate(['/login']) } pages() { + sessionStorage.setItem('selectedMenu', '数字油站') this.router.navigate(['/plan']) } }