Commit 32ca1371 authored by wangqinghua's avatar wangqinghua

workService

parent af6dfca7
<!--&lt;!&ndash;处理人统计&ndash;&gt;--> <!--处理人统计-->
<!--<nz-spin [nzSpinning]="isLoading">--> <nz-spin [nzSpinning]="isLoading">
<!--<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>--> <div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
<!--</nz-spin>--> </nz-spin>
<!--<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">--> <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<!--<nz-tab nzTitle="接收流量排行">--> <nz-tab nzTitle="接收流量排行">
<!--<nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">--> <nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>-->s <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let item of inList">--> <ng-container *ngFor="let item of inList">
<!--<tr (click)="getEcharts(item.itemid)">--> <tr (click)="getEcharts(item.itemid)">
<!--<td>{{item.itemName}}</td>--> <td>{{item.itemName}}</td>
<!--<td>{{item.max | toUtil}}</td>--> <td>{{item.max | toUtil}}</td>
<!--<td>{{item.min | toUtil}}</td>--> <td>{{item.min | toUtil}}</td>
<!--<td>{{item.avg | toUtil}}</td>--> <td>{{item.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--<nz-tab nzTitle="发送流量排行">--> <nz-tab nzTitle="发送流量排行">
<!--<nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">--> <nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>--> <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let data of outList">--> <ng-container *ngFor="let data of outList">
<!--<tr class="cursor" (click)="getEcharts(data.itemid)">--> <tr class="cursor" (click)="getEcharts(data.itemid)">
<!--<td>{{data.itemName}}</td>--> <td>{{data.itemName}}</td>
<!--<td>{{data.max | toUtil}}</td>--> <td>{{data.max | toUtil}}</td>
<!--<td>{{data.min | toUtil}}</td>--> <td>{{data.min | toUtil}}</td>
<!--<td>{{data.avg | toUtil}}</td>--> <td>{{data.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--</nz-tabset>--> </nz-tabset>
<!--&lt;!&ndash;事件分类统计&ndash;&gt;--> <!--事件分类统计-->
<!--<nz-spin [nzSpinning]="isLoading">--> <nz-spin [nzSpinning]="isLoading">
<!--<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>--> <div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
<!--</nz-spin>--> </nz-spin>
<!--<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">--> <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<!--<nz-tab nzTitle="接收流量排行">--> <nz-tab nzTitle="接收流量排行">
<!--<nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">--> <nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>--> <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let item of inList">--> <ng-container *ngFor="let item of inList">
<!--<tr (click)="getEcharts(item.itemid)">--> <tr (click)="getEcharts(item.itemid)">
<!--<td>{{item.itemName}}</td>--> <td>{{item.itemName}}</td>
<!--<td>{{item.max | toUtil}}</td>--> <td>{{item.max | toUtil}}</td>
<!--<td>{{item.min | toUtil}}</td>--> <td>{{item.min | toUtil}}</td>
<!--<td>{{item.avg | toUtil}}</td>--> <td>{{item.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--<nz-tab nzTitle="发送流量排行">--> <nz-tab nzTitle="发送流量排行">
<!--<nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">--> <nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>--> <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let data of outList">--> <ng-container *ngFor="let data of outList">
<!--<tr class="cursor" (click)="getEcharts(data.itemid)">--> <tr class="cursor" (click)="getEcharts(data.itemid)">
<!--<td>{{data.itemName}}</td>--> <td>{{data.itemName}}</td>
<!--<td>{{data.max | toUtil}}</td>--> <td>{{data.max | toUtil}}</td>
<!--<td>{{data.min | toUtil}}</td>--> <td>{{data.min | toUtil}}</td>
<!--<td>{{data.avg | toUtil}}</td>--> <td>{{data.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--</nz-tabset>--> </nz-tabset>
\ No newline at end of file \ No newline at end of file
<!--&lt;!&ndash;解决状态统计&ndash;&gt;--> <!--解决状态统计-->
<!--<nz-spin [nzSpinning]="isLoading">--> <nz-spin [nzSpinning]="isLoading">
<!--<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>--> <div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
<!--</nz-spin>--> </nz-spin>
<!--<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">--> <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<!--<nz-tab nzTitle="接收流量排行">--> <nz-tab nzTitle="接收流量排行">
<!--<nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">--> <nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>--> <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let item of inList">--> <ng-container *ngFor="let item of inList">
<!--<tr (click)="getEcharts(item.itemid)">--> <tr (click)="getEcharts(item.itemid)">
<!--<td>{{item.itemName}}</td>--> <td>{{item.itemName}}</td>
<!--<td>{{item.max | toUtil}}</td>--> <td>{{item.max | toUtil}}</td>
<!--<td>{{item.min | toUtil}}</td>--> <td>{{item.min | toUtil}}</td>
<!--<td>{{item.avg | toUtil}}</td>--> <td>{{item.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--<nz-tab nzTitle="发送流量排行">--> <nz-tab nzTitle="发送流量排行">
<!--<nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">--> <nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum" [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">监测点名称</th>--> <th nzWidth="20%">监测点名称</th>
<!--<th>最大值</th>--> <th>最大值</th>
<!--<th>最小值</th>--> <th>最小值</th>
<!--<th>平均值</th>--> <th>平均值</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let data of outList">--> <ng-container *ngFor="let data of outList">
<!--<tr class="cursor" (click)="getEcharts(data.itemid)">--> <tr class="cursor" (click)="getEcharts(data.itemid)">
<!--<td>{{data.itemName}}</td>--> <td>{{data.itemName}}</td>
<!--<td>{{data.max | toUtil}}</td>--> <td>{{data.max | toUtil}}</td>
<!--<td>{{data.min | toUtil}}</td>--> <td>{{data.min | toUtil}}</td>
<!--<td>{{data.avg | toUtil}}</td>--> <td>{{data.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--</nz-tab>--> </nz-tab>
<!--</nz-tabset>--> </nz-tabset>
\ No newline at end of file \ No newline at end of file
...@@ -84,26 +84,26 @@ ...@@ -84,26 +84,26 @@
<!--</tbody>--> <!--</tbody>-->
<!--</nz-table>--> <!--</nz-table>-->
<h2>统计报告</h2> <h2>统计报告</h2>
<!--<nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum"--> <nz-table #nzTable [nzData]="outList" [nzLoading]="outLoading" [nzFrontPagination]="false" [nzTotal]="outTotalNum"
<!--[nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">--> [nzPageIndex]="outPageNum" [nzPageSize]="outPageCount" (nzPageIndexChange)="outChnagePage($event)">
<!--<thead>--> <thead>
<!--<tr>--> <tr>
<!--<th nzWidth="20%">时间</th>--> <th nzWidth="20%">时间</th>
<!--<th>异常总数</th>--> <th>异常总数</th>
<!--<th>告警次数</th>--> <th>告警次数</th>
<!--<th>严重告警次数</th>--> <th>严重告警次数</th>
<!--</tr>--> </tr>
<!--</thead>--> </thead>
<!--<tbody>--> <tbody>
<!--<ng-container *ngFor="let data of outList">--> <ng-container *ngFor="let data of outList">
<!--<tr class="cursor" (click)="getEcharts(data.itemid)">--> <tr class="cursor" (click)="getEcharts(data.itemid)">
<!--<td>{{data.itemName}}</td>--> <td>{{data.itemName}}</td>
<!--<td>{{data.max | toUtil}}</td>--> <td>{{data.max | toUtil}}</td>
<!--<td>{{data.min | toUtil}}</td>--> <td>{{data.min | toUtil}}</td>
<!--<td>{{data.avg | toUtil}}</td>--> <td>{{data.avg | toUtil}}</td>
<!--</tr>--> </tr>
<!--</ng-container>--> </ng-container>
<!--</tbody>--> </tbody>
<!--</nz-table>--> </nz-table>
<!--&lt;!&ndash;资源可用性统计&ndash;&gt;--> <!--资源可用性统计-->
<!--<div nz-row class="breadcrumbs">--> <div nz-row class="breadcrumbs">
<!--<div nz-col nzSpan="16">--> <div nz-col nzSpan="16">
<!--<nz-breadcrumb class="padding-8-0">--> <nz-breadcrumb class="padding-8-0">
<!--<nz-breadcrumb-item>--> <nz-breadcrumb-item>
<!--首页--> 首页
<!--</nz-breadcrumb-item>--> </nz-breadcrumb-item>
<!--<nz-breadcrumb-item>--> <nz-breadcrumb-item>
<!--<a>统计分析</a>--> <a>统计分析</a>
<!--</nz-breadcrumb-item>--> </nz-breadcrumb-item>
<!--<nz-breadcrumb-item>--> <nz-breadcrumb-item>
<!--资源可用性统计--> 资源可用性统计
<!--</nz-breadcrumb-item>--> </nz-breadcrumb-item>
<!--</nz-breadcrumb>--> </nz-breadcrumb>
<!--</div>--> </div>
<!--<div nz-col nzSpan="8" class="text-right">--> <div nz-col nzSpan="8" class="text-right">
<!--<button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>--> <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
<!--<button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>--> <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
<!--<button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>--> <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
<!--</div>--> </div>
<!--</div>--> </div>
<!--<div nz-row [nzGutter]="4" class="search-form">--> <div nz-row [nzGutter]="4" class="search-form">
<!--<div nz-col nzSpan="3">--> <div nz-col nzSpan="3">
<!--<nz-select style="width: 100%;" nzPlaceHolder="选择分组" [(ngModel)]="obj.groupid" (ngModelChange)="getList()">--> <nz-select style="width: 100%;" nzPlaceHolder="选择分组" [(ngModel)]="obj.groupid" (ngModelChange)="getList()">
<!--<ng-container *ngFor="let item of groupList">--> <ng-container *ngFor="let item of groupList">
<!--<nz-option nzLabel="{{item.name}}" nzValue="{{item.groupid}}"></nz-option>--> <nz-option nzLabel="{{item.name}}" nzValue="{{item.groupid}}"></nz-option>
<!--</ng-container>--> </ng-container>
<!--</nz-select>--> </nz-select>
<!--</div>--> </div>
<!--<div nz-col nzSpan="3">--> <div nz-col nzSpan="3">
<!--<nz-select style="width: 100%;" nzPlaceHolder="选择主机资源" [(ngModel)]="obj.hostid" (ngModelChange)="getListIO()">--> <nz-select style="width: 100%;" nzPlaceHolder="选择主机资源" [(ngModel)]="obj.hostid" (ngModelChange)="getListIO()">
<!--<ng-container *ngFor="let item of hostList;">--> <ng-container *ngFor="let item of hostList;">
<!--<nz-option nzLabel="{{item.name}}" nzValue="{{item.hostid}}"></nz-option>--> <nz-option nzLabel="{{item.name}}" nzValue="{{item.hostid}}"></nz-option>
<!--</ng-container>--> </ng-container>
<!--</nz-select>--> </nz-select>
<!--</div>--> </div>
<!--<div nz-col nzSpan="7">--> <div nz-col nzSpan="7">
<!--<nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()" [nzButtonStyle]="'solid'">--> <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()" [nzButtonStyle]="'solid'">
<!--<label nz-radio-button nzValue="1">今天</label>--> <label nz-radio-button nzValue="1">今天</label>
<!--<label nz-radio-button nzValue="2">昨天</label>--> <label nz-radio-button nzValue="2">昨天</label>
<!--<label nz-radio-button nzValue="3">三天</label>--> <label nz-radio-button nzValue="3">三天</label>
<!--<label nz-radio-button nzValue="4">一周</label>--> <label nz-radio-button nzValue="4">一周</label>
<!--<label nz-radio-button nzValue="5">自定义</label>--> <label nz-radio-button nzValue="5">自定义</label>
<!--</nz-radio-group>--> </nz-radio-group>
<!--</div>--> </div>
<!--<div nz-col nzSpan="8" *ngIf="timeType == '5'">--> <div nz-col nzSpan="8" *ngIf="timeType == '5'">
<!--<nz-date-picker--> <nz-date-picker
<!--nzShowTime--> nzShowTime
<!--[(ngModel)]="startTime"--> [(ngModel)]="startTime"
<!--nzPlaceHolder="开始时间"--> nzPlaceHolder="开始时间"
<!--&gt;</nz-date-picker>--> ></nz-date-picker>
<!--<nz-date-picker--> <nz-date-picker
<!--nzShowTime--> nzShowTime
<!--nzFormat="yyyy-MM-dd HH:mm:ss"--> nzFormat="yyyy-MM-dd HH:mm:ss"
<!--[(ngModel)]="endTime"--> [(ngModel)]="endTime"
<!--nzPlaceHolder="结束时间"--> nzPlaceHolder="结束时间"
<!--&gt;</nz-date-picker>--> ></nz-date-picker>
<!--</div>--> </div>
<!--</div>--> </div>
<!--<nz-spin [nzSpinning]="isLoading">--> <nz-spin [nzSpinning]="isLoading">
<!--<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>--> <div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
<!--</nz-spin>--> </nz-spin>
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpClient, HttpResponse } from '@angular/common/http'; import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { SERVER_API_URL } from '../../app.constants'; import {SERVER_API_URL, SERVER_API_URL_coms} from '../../app.constants';
@Injectable() @Injectable()
export class AccountService { export class AccountService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
get(): Observable<any>{ get(): Observable<any>{
return this.http.post(SERVER_API_URL + '/login', {observe : 'response'}); return this.http.post(SERVER_API_URL_coms+ '/login', {observe : 'response'});
} }
save(account: any): Observable<HttpResponse<any>> { save(account: any): Observable<HttpResponse<any>> {
return this.http.post(SERVER_API_URL + '', account, {observe: 'response'}); return this.http.post(SERVER_API_URL_coms + '', account, {observe: 'response'});
} }
} }
...@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http'; ...@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
import { SERVER_API_URL } from '../../app.constants'; import {SERVER_API_URL, SERVER_API_URL_coms} from '../../app.constants';
import { EmitService } from "../../shared/event/eventEmitter"; import { EmitService } from "../../shared/event/eventEmitter";
@Injectable() @Injectable()
export class AuthServerProvider { export class AuthServerProvider {
...@@ -27,7 +27,7 @@ export class AuthServerProvider { ...@@ -27,7 +27,7 @@ export class AuthServerProvider {
password: credentials.password, password: credentials.password,
rememberMe: credentials.rememberMe rememberMe: credentials.rememberMe
}; };
return this.http.post(SERVER_API_URL + '/login', data, {observe : 'response'}).map(authenticateSuccess.bind(this)); return this.http.post(SERVER_API_URL_coms + '/login', data, {observe : 'response'}).map(authenticateSuccess.bind(this));
function authenticateSuccess(resp) { function authenticateSuccess(resp) {
const bearerToken = resp.body.data; const bearerToken = resp.body.data;
if (bearerToken ) { if (bearerToken ) {
......
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