更新拓扑图字体

src/main/webapp/app/app.component.ts

@@ -12,8 +12,7 @@ export class AppComponent {
         document.body.ondrop =  (event)=> {
             event.preventDefault();
             event.stopPropagation();
-        }
-        console.log("智能运行监管平台：v2.0.1 update By 2019-04-01")
-
+        };
+        console.log("智能运行监管平台：v2.0.7 update By 2019-06-10")
     }
 }

src/main/webapp/app/home/home.component.ts

 import {AfterViewInit, Component, ElementRef, OnInit, Renderer2, ViewChild} from '@angular/core';
 import {JhiEventManager} from 'ng-jhipster';
-import {Account, Principal} from '../shared';
+import { Principal} from '../shared';
 import {OverAllService} from '../overAll/overAll.service';
 import {color, pageSize} from '../app.constants';
 import {AlarmService} from '../alarm/alarm.service';

src/main/webapp/app/modal/warn-list/warn-list.component.html

@@ -5,10 +5,8 @@
     <th>级别</th>
     <th>名称</th>
     <th nzWidth="15%">告警信息</th>
-    <th>类别</th>
     <th>资源分组</th>
     <th>持续时间</th>
-    <!--<th>产生事件</th>-->
     <th>状态</th>
     <th style="text-align: center">发送记录</th>
   </tr>
@@ -24,10 +22,8 @@
     </td>
     <td>{{data.hostname}}</td>
     <td>{{data.description}}</td>
-    <td>{{data.equipmentType}}</td>
     <td>{{data.groupname}}</td>
     <td>{{data.continuedTime}}</td>
-    <!--<td>{{data.eventid}}</td>-->
     <td>
       <ng-container *ngIf="data.r_clock"><span class="color-green"><i class="anticon anticon-check-square-o"></i></span> </ng-container>
       <ng-container *ngIf="!data.r_clock"><span class="color-red">  <i class="anticon anticon-warning"></i></span></ng-container>

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts

@@ -398,13 +398,13 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
                                 // }
                                 if(e1.status == 1){
                                     e2.alarm = "危险";
-                                    e2.fontColor='0,0,0';
+                                    // e2.fontColor='0,0,0';
                                     e2.alarmColor='255,153,18';
                                     e2.alarmAlpha=0.9;
                                 }
                                 if(e1.status == 2){
                                     e2.alarm = "故障";
-                                    e2.fontColor='0,0,0';
+                                    // e2.fontColor='0,0,0';
                                     e2.alarmAlpha=0.9;
                                 }
                             }

src/main/webapp/app/shared/index.ts

@@ -11,9 +11,6 @@ export * from './auth/has-any-authority.directive';
 export * from './auth/user-route-access-service';
 export * from './login/login.component';
 export * from './login/login.service';
-export * from './user/account.model';
-export * from './user/user.model';
-export * from './user/user.service';
 export * from './model/request-util';
 export * from './model/base-entity';
 export * from './shared-libs.module';

src/main/webapp/app/shared/shared.module.ts

@@ -9,7 +9,6 @@ import {
     CSRFService,
     AuthServerProvider,
     AccountService,
-    UserService,
     StateStorageService,
     LoginService,
     JhiLoginModalComponent,
@@ -39,7 +38,6 @@ import {DisableControlDirective} from './common/disable-control.directive';
         Principal,
         CSRFService,
         AuthServerProvider,
-        UserService,
         DatePipe,
         EmitService,
         NgbActiveModal,

src/main/webapp/app/shared/user/account.model.ts

-export class Account {
-    constructor(
-        public activated: boolean,
-        public authorities: string[],
-        public email: string,
-        public firstName: string,
-        public langKey: string,
-        public lastName: string,
-        public login: string,
-        public imageUrl: string
-    ) { }
-}

src/main/webapp/app/shared/user/user.model.ts

-export class User {
-    public id?: any;
-    public login?: string;
-    public firstName?: string;
-    public lastName?: string;
-    public email?: string;
-    public activated?: Boolean;
-    public langKey?: string;
-    public authorities?: any[];
-    public createdBy?: string;
-    public createdDate?: Date;
-    public lastModifiedBy?: string;
-    public lastModifiedDate?: Date;
-    public password?: string;
-
-    constructor(
-        id?: any,
-        login?: string,
-        firstName?: string,
-        lastName?: string,
-        email?: string,
-        activated?: Boolean,
-        langKey?: string,
-        authorities?: any[],
-        createdBy?: string,
-        createdDate?: Date,
-        lastModifiedBy?: string,
-        lastModifiedDate?: Date,
-        password?: string
-    ) {
-        this.id = id ? id : null;
-        this.login = login ? login : null;
-        this.firstName = firstName ? firstName : null;
-        this.lastName = lastName ? lastName : null;
-        this.email = email ? email : null;
-        this.activated = activated ? activated : false;
-        this.langKey = langKey ? langKey : null;
-        this.authorities = authorities ? authorities : null;
-        this.createdBy = createdBy ? createdBy : null;
-        this.createdDate = createdDate ? createdDate : null;
-        this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null;
-        this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null;
-        this.password = password ? password : null;
-    }
-}

src/main/webapp/app/shared/user/user.service.ts

-import { Injectable } from '@angular/core';
-import { HttpClient, HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
-
-import { SERVER_API_URL } from '../../app.constants';
-import { User } from './user.model';
-import { createRequestOption } from '../model/request-util';
-
-@Injectable()
-export class UserService {
-    private resourceUrl = SERVER_API_URL + 'api/users';
-
-    constructor(private http: HttpClient) { }
-
-    create(user: User): Observable<HttpResponse<User>> {
-        return this.http.post<User>(this.resourceUrl, user, { observe: 'response' });
-    }
-
-    update(user: User): Observable<HttpResponse<User>> {
-        return this.http.put<User>(this.resourceUrl, user, { observe: 'response' });
-    }
-
-    find(login: string): Observable<HttpResponse<User>> {
-        return this.http.get<User>(`${this.resourceUrl}/${login}`, { observe: 'response' });
-    }
-
-    query(req?: any): Observable<HttpResponse<User[]>> {
-        const options = createRequestOption(req);
-        return this.http.get<User[]>(this.resourceUrl, { params: options, observe: 'response' });
-    }
-
-    delete(login: string): Observable<HttpResponse<any>> {
-        return this.http.delete(`${this.resourceUrl}/${login}`, { observe: 'response' });
-    }
-
-    authorities(): Observable<string[]> {
-        return this.http.get<string[]>(SERVER_API_URL + 'api/users/authorities');
-    }
-
-}

src/main/webapp/index.html

@@ -4,7 +4,7 @@
     <base href="./"/>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>雁南监狱智能运维管理系统</title>
+    <title>高淳监狱智能运维管理系统</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#000000">

tsconfig.json

@@ -10,7 +10,7 @@
         "noImplicitAny": false,
         "skipLibCheck": true,
         "suppressImplicitAnyIndexErrors": true,
-        "outDir": "build/www/app",
+        "outDir": "build/wx/app",
         "lib": ["es7", "dom"],
         "typeRoots": [
             "node_modules/@types"