Commit 375ca02c authored by wangqinghua's avatar wangqinghua

update

parent 06cd4537
...@@ -63,7 +63,7 @@ export class AlarmGroupComponent implements OnInit { ...@@ -63,7 +63,7 @@ export class AlarmGroupComponent implements OnInit {
//确定 //确定
handleOk() { handleOk() {
for(const i in this.validateForm.controls) { for(let i in this.validateForm.controls) {
this.validateForm.controls[ i ].markAsDirty(); this.validateForm.controls[ i ].markAsDirty();
this.validateForm.controls[ i ].updateValueAndValidity(); this.validateForm.controls[ i ].updateValueAndValidity();
} }
......
...@@ -119,7 +119,7 @@ export class MediaTypeComponent implements OnInit { ...@@ -119,7 +119,7 @@ export class MediaTypeComponent implements OnInit {
} }
handleOk() { handleOk() {
for (const i in this.validateForm.controls) { for (let i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
...@@ -66,6 +66,8 @@ import {FindUserComponent} from './alarm/modal/find-user/find-user.component'; ...@@ -66,6 +66,8 @@ import {FindUserComponent} from './alarm/modal/find-user/find-user.component';
import {TopologyComponent} from './netTopology/model/topology/topology.component'; import {TopologyComponent} from './netTopology/model/topology/topology.component';
import {CheckComponent} from './netTopology/model/check/check.component'; import {CheckComponent} from './netTopology/model/check/check.component';
import {TopologyImgComponent} from './netTopology/topology-img/topology-img.component'; import {TopologyImgComponent} from './netTopology/topology-img/topology-img.component';
import {DeviceComponent} from './netTopology/model/device/device.component';
import {IconComponent} from './netTopology/model/icon/icon.component';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -133,6 +135,8 @@ import {TopologyImgComponent} from './netTopology/topology-img/topology-img.comp ...@@ -133,6 +135,8 @@ import {TopologyImgComponent} from './netTopology/topology-img/topology-img.comp
TopologyComponent, TopologyComponent,
CheckComponent, CheckComponent,
TopologyImgComponent, TopologyImgComponent,
DeviceComponent,
IconComponent
], ],
providers:[ providers:[
OverAllService, OverAllService,
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { JhiEventManager } from 'ng-jhipster'; import { JhiEventManager } from 'ng-jhipster';
import { Account, LoginModalService, Principal } from '../shared'; import { Account, Principal } from '../shared';
@Component({ @Component({
selector: 'jhi-home', selector: 'jhi-home',
...@@ -18,7 +18,6 @@ export class HomeComponent implements OnInit { ...@@ -18,7 +18,6 @@ export class HomeComponent implements OnInit {
constructor( constructor(
private principal: Principal, private principal: Principal,
private loginModalService: LoginModalService,
private eventManager: JhiEventManager private eventManager: JhiEventManager
) { ) {
} }
...@@ -55,6 +54,5 @@ export class HomeComponent implements OnInit { ...@@ -55,6 +54,5 @@ export class HomeComponent implements OnInit {
} }
login() { login() {
this.modalRef = this.loginModalService.open();
} }
} }
...@@ -3,7 +3,7 @@ import { Router } from '@angular/router'; ...@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { ProfileService } from '../profiles/profile.service'; import { ProfileService } from '../profiles/profile.service';
import { Principal, LoginModalService, LoginService } from '../../shared'; import { Principal, LoginService } from '../../shared';
import { VERSION } from '../../app.constants'; import { VERSION } from '../../app.constants';
...@@ -29,7 +29,6 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{ ...@@ -29,7 +29,6 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{
constructor( constructor(
private loginService: LoginService, private loginService: LoginService,
private principal: Principal, private principal: Principal,
private loginModalService: LoginModalService,
private profileService: ProfileService, private profileService: ProfileService,
private router: Router, private router: Router,
) { ) {
...@@ -56,10 +55,6 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{ ...@@ -56,10 +55,6 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{
return this.principal.isAuthenticated(); return this.principal.isAuthenticated();
} }
login() {
this.modalRef = this.loginModalService.open();
}
logout() { logout() {
this.collapseNavbar(); this.collapseNavbar();
this.loginService.logout(); this.loginService.logout();
......
...@@ -44,7 +44,7 @@ export class SidebarComponent implements OnInit { ...@@ -44,7 +44,7 @@ export class SidebarComponent implements OnInit {
//简单使用 //简单使用
openHandler(value: string): void { openHandler(value: string): void {
for (const key in this.menuList) { for (let key in this.menuList) {
if (key !== value) { if (key !== value) {
this.menuList[ key ].checked = false; this.menuList[ key ].checked = false;
} }
......
...@@ -47,7 +47,7 @@ export class CreateGroupComponent implements OnInit { ...@@ -47,7 +47,7 @@ export class CreateGroupComponent implements OnInit {
} }
handleOk() { handleOk() {
for (const i in this.validateForm.controls) { for (let i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
...@@ -38,7 +38,7 @@ export class CheckComponent implements OnInit { ...@@ -38,7 +38,7 @@ export class CheckComponent implements OnInit {
} }
handleOk(){ handleOk(){
for(const i in this.validateForm.controls){ for(let i in this.validateForm.controls){
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {UploadFile} from 'ng-zorro-antd'; import {UploadFile} from 'ng-zorro-antd';
import {TopologyService} from '../../topology.service'; import {TopologyService} from '../../topology.service';
import {FormGroup} from '@angular/forms';
@Component({ @Component({
selector: 'smart-icon', selector: 'smart-icon',
...@@ -9,7 +10,9 @@ import {TopologyService} from '../../topology.service'; ...@@ -9,7 +10,9 @@ import {TopologyService} from '../../topology.service';
}) })
export class IconComponent implements OnInit { export class IconComponent implements OnInit {
isVisible = false;
fileList: UploadFile[] = []; fileList: UploadFile[] = [];
validateForm:FormGroup;
title = "添加图标"; title = "添加图标";
data = { data = {
iconType:"", iconType:"",
...@@ -45,4 +48,12 @@ export class IconComponent implements OnInit { ...@@ -45,4 +48,12 @@ export class IconComponent implements OnInit {
// }); // });
} }
handleOk(){
this.isVisible = false;
}
handleCancel(){
this.isVisible = false;
}
} }
...@@ -16,6 +16,9 @@ export class TopologyComponent implements OnInit { ...@@ -16,6 +16,9 @@ export class TopologyComponent implements OnInit {
validateForm:FormGroup; validateForm:FormGroup;
topoId; topoId;
pageNum;
pageCount;
constructor(private fb:FormBuilder,private topologySer:TopologyService, constructor(private fb:FormBuilder,private topologySer:TopologyService,
private message:NzMessageService) { private message:NzMessageService) {
} }
...@@ -57,7 +60,7 @@ export class TopologyComponent implements OnInit { ...@@ -57,7 +60,7 @@ export class TopologyComponent implements OnInit {
} }
handleOk(){ handleOk(){
for(const i in this.validateForm.controls){ for(let i in this.validateForm.controls){
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
</nz-select> </nz-select>
</div> </div>
<div nz-col nzSpan="12" class="text-right"> <div nz-col nzSpan="12" class="text-right">
<button nz-button nzType="default" (click)="showGroupModal()"><i class="anticon anticon-plus"></i>添加图标</button> <button nz-button nzType="default"><i class="anticon anticon-plus"></i>添加图标</button>
</div> </div>
</div> </div>
<nz-table #nzTable [nzData]="iconList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)"> <nz-table #nzTable [nzData]="iconList">
<thead> <thead>
<tr> <tr>
<th>一级类型</th> <th>一级类型</th>
......
...@@ -2,14 +2,12 @@ import { Injectable } from '@angular/core'; ...@@ -2,14 +2,12 @@ import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
import { Principal } from '../'; import { Principal } from '../';
import { LoginModalService } from '../login/login-modal.service';
import { StateStorageService } from './state-storage.service'; import { StateStorageService } from './state-storage.service';
@Injectable() @Injectable()
export class UserRouteAccessService implements CanActivate { export class UserRouteAccessService implements CanActivate {
constructor(private router: Router, constructor(private router: Router,
private loginModalService: LoginModalService,
private principal: Principal, private principal: Principal,
private stateStorageService: StateStorageService) { private stateStorageService: StateStorageService) {
} }
...@@ -44,7 +42,6 @@ export class UserRouteAccessService implements CanActivate { ...@@ -44,7 +42,6 @@ export class UserRouteAccessService implements CanActivate {
this.router.navigate(['accessdenied']).then(() => { this.router.navigate(['accessdenied']).then(() => {
// only show the login dialog, if the user hasn't logged in yet // only show the login dialog, if the user hasn't logged in yet
if (!account) { if (!account) {
this.loginModalService.open();
} }
}); });
return false; return false;
......
...@@ -10,7 +10,6 @@ export * from './auth/principal.service'; ...@@ -10,7 +10,6 @@ export * from './auth/principal.service';
export * from './auth/has-any-authority.directive'; export * from './auth/has-any-authority.directive';
export * from './auth/user-route-access-service'; export * from './auth/user-route-access-service';
export * from './login/login.component'; export * from './login/login.component';
export * from './login/login-modal.service';
export * from './login/login.service'; export * from './login/login.service';
export * from './user/account.model'; export * from './user/account.model';
export * from './user/user.model'; export * from './user/user.model';
......
...@@ -12,7 +12,6 @@ import { ...@@ -12,7 +12,6 @@ import {
UserService, UserService,
StateStorageService, StateStorageService,
LoginService, LoginService,
LoginModalService,
JhiLoginModalComponent, JhiLoginModalComponent,
Principal, Principal,
HasAnyAuthorityDirective, HasAnyAuthorityDirective,
...@@ -33,7 +32,6 @@ import {ReactiveFormsModule} from '@angular/forms'; ...@@ -33,7 +32,6 @@ import {ReactiveFormsModule} from '@angular/forms';
], ],
providers: [ providers: [
LoginService, LoginService,
LoginModalService,
AccountService, AccountService,
StateStorageService, StateStorageService,
Principal, Principal,
......
...@@ -36,7 +36,7 @@ export class GroupModalComponent implements OnInit { ...@@ -36,7 +36,7 @@ export class GroupModalComponent implements OnInit {
handleOk(){ handleOk(){
this.isVisible = true; this.isVisible = true;
for(const i in this.validateForm.controls){ for(let i in this.validateForm.controls){
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
...@@ -42,7 +42,7 @@ export class RoleComponent implements OnInit { ...@@ -42,7 +42,7 @@ export class RoleComponent implements OnInit {
} }
handleOk(): void { handleOk(): void {
for (const i in this.validateForm.controls) { for (let i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
...@@ -48,7 +48,7 @@ export class UserComponent implements OnInit { ...@@ -48,7 +48,7 @@ export class UserComponent implements OnInit {
} }
handleOk(){ handleOk(){
for(const i in this.validateForm.controls){ for(let i in this.validateForm.controls){
this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity(); this.validateForm.controls[i].updateValueAndValidity();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment