Skip to content

S
smart
Commit bf05fdca authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent ebb020ed
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 56 deletions
src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.html
View file @ bf05fdca
......@@ -2,7 +2,8 @@
<div class="releative">
<div class="time-div">
<div nz-col nzSpan="6">
<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="2">周报</label>
<label nz-radio-button nzValue="3">月报</label>
......@@ -24,13 +25,24 @@
</div>
<div nz-col nzSpan="2" class="text-right">
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"
style="color: #6097b7"></i>搜索</button>
style="color: #6097b7"></i>搜索
</button>
</div>
</div>
</div>
<nz-spin [nzSpinning]="isLoading">
<div style="height: 500px">
<ng-container *ngIf="noData">
<div class="img-noData">
<div class="noData" title="暂无数据"></div>
</div>
</ng-container>
<ng-container *ngIf="!noData">
<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
</ng-container>
</div>
</nz-spin>
<nz-table #nzTable [nzData]="dealList">
......
src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.ts
View file @ bf05fdca
......@@ -23,6 +23,8 @@ export class AnalysisDealComponent implements OnInit {
endTime: ''
};
noData = false;
constructor(private analysisSer: AnalysisService, private message: NzMessageService, private datePipe: DatePipe,
private overAllSer: OverAllService,) {
}
......@@ -36,12 +38,21 @@ export class AnalysisDealComponent implements OnInit {
//获取图表
getEcharts() {
this.isLoading = true;
this.analysisSer.operateUser(this.obj).subscribe(
(res) => {
if(res.errCode == 10000){
if(res.data.length > 0 ){
this.dealList = res.data;
this.setEcharts();
this.noData = false;
}else{
this.noData = true;
}
}else{
this.message.error(res.errMsg);
}
this.isLoading = false;
}
);
}
......
src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.html
View file @ bf05fdca
......@@ -30,8 +30,18 @@
</div>
<nz-spin [nzSpinning]="isLoading">
<div style="height: 500px">
<ng-container *ngIf="noData">
<div class="img-noData">
<div class="noData" title="暂无数据"></div>
</div>
</ng-container>
<ng-container *ngIf="!noData">
<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
</ng-container>
</div>
</nz-spin>
<nz-table #nzTable [nzData]="eventList">
<thead>
<tr>
......
src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.ts
View file @ bf05fdca
import { Component, OnInit } from '@angular/core';
import {Component, OnInit} from '@angular/core';
import {DatePipe} from '@angular/common';
import {AnalysisService} from '../../analysis.service';
import {OverAllService} from '../../../overAll/overAll.service';
......@@ -14,7 +14,7 @@ export class AnalysisEventComponent implements OnInit {
isLoading = false;
startTime;
endTime;
timeType = "1";
timeType = '1';
chartOption;
eventList;
......@@ -23,6 +23,8 @@ export class AnalysisEventComponent implements OnInit {
endTime: ''
};
noData = false;
constructor(private analysisSer: AnalysisService, private message: NzMessageService, private datePipe: DatePipe,
private overAllSer: OverAllService,) {
}
......@@ -36,17 +38,26 @@ export class AnalysisEventComponent implements OnInit {
//获取图表
getEcharts() {
this.isLoading = true;
this.analysisSer.eventByType(this.obj).subscribe(
(res) => {
if(res.errCode == 10000){
if (res.errCode == 10000) {
if (res.data.length > 0) {
this.eventList = res.data;
this.setEcharts();
this.noData = false;
} else {
this.noData = true;
}
} else {
this.message.error(res.errMsg);
}
this.isLoading = false;
}
);
}
setEcharts(){
setEcharts() {
this.chartOption = {
tooltip: {
trigger: 'axis',
......@@ -56,22 +67,22 @@ export class AnalysisEventComponent implements OnInit {
},
xAxis: {
type: 'category',
data: this.eventList.map(e=>{
data: this.eventList.map(e => {
return e.typeName;
})
},
yAxis: {
type: 'value',
minInterval : 1,
minInterval: 1,
axisLabel: {
show: true,
interval: 'auto',
formatter: '{value} 个'
},
boundaryGap : [ 0, 0.1 ],
boundaryGap: [0, 0.1],
},
series: [{
data: this.eventList.map(e=>{
data: this.eventList.map(e => {
return e.num;
}),
type: 'bar'
......@@ -90,13 +101,13 @@ export class AnalysisEventComponent implements OnInit {
break;
}
case'2': { //周报
day1 = new Date(nowDate.getTime() - (nowDate.getDay()-1)*86400000);
day1 = new Date(nowDate.getTime() - (nowDate.getDay() - 1) * 86400000);
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
break;
}
case'3': { //月报
day1 = new Date(nowDate.getFullYear(),nowDate.getMonth(),1);
day1 = new Date(nowDate.getFullYear(), nowDate.getMonth(), 1);
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
break;
......
src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.html
View file @ bf05fdca
......@@ -31,7 +31,16 @@
<nz-spin [nzSpinning]="isLoading">
<div style="height: 500px">
<ng-container *ngIf="noData">
<div class="img-noData">
<div class="noData" title="暂无数据"></div>
</div>
</ng-container>
<ng-container *ngIf="!noData">
<div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>
</ng-container>
</div>
</nz-spin>
<nz-table #nzTable [nzData]="statusList">
......
src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.ts
View file @ bf05fdca
import { Component, OnInit } from '@angular/core';
import {Component, OnInit} from '@angular/core';
import {DatePipe} from '@angular/common';
import {AnalysisService} from '../../analysis.service';
import {OverAllService} from '../../../overAll/overAll.service';
......@@ -14,7 +14,7 @@ export class AnalysisStatusComponent implements OnInit {
isLoading = false;
startTime;
endTime;
timeType = "1";
timeType = '1';
chartOption;
statusList;
......@@ -23,6 +23,8 @@ export class AnalysisStatusComponent implements OnInit {
endTime: ''
};
noData = false;
constructor(private analysisSer: AnalysisService, private message: NzMessageService, private datePipe: DatePipe,
private overAllSer: OverAllService,) {
}
......@@ -38,15 +40,23 @@ export class AnalysisStatusComponent implements OnInit {
getEcharts() {
this.analysisSer.operateStatus(this.obj).subscribe(
(res) => {
if(res.errCode == 10000){
if (res.errCode == 10000) {
if (res.data.length > 0) {
this.statusList = res.data;
this.setEcharts();
this.noData = false;
} else {
this.noData = true;
}
} else {
this.message.error(res.errMsg);
}
this.isLoading = false;
}
);
}
setEcharts(){
setEcharts() {
this.chartOption = {
tooltip: {
trigger: 'axis',
......@@ -56,22 +66,22 @@ export class AnalysisStatusComponent implements OnInit {
},
xAxis: {
type: 'category',
data: this.statusList.map(e=>{
data: this.statusList.map(e => {
return e.operateStatusName;
})
},
yAxis: {
type: 'value',
minInterval : 1,
minInterval: 1,
axisLabel: {
show: true,
interval: 'auto',
formatter: '{value} 个'
},
boundaryGap : [ 0, 0.1 ],
boundaryGap: [0, 0.1],
},
series: [{
data: this.statusList.map(e=>{
data: this.statusList.map(e => {
return e.num;
}),
type: 'bar'
......@@ -90,13 +100,13 @@ export class AnalysisStatusComponent implements OnInit {
break;
}
case'2': { //周报
day1 = new Date(nowDate.getTime() - (nowDate.getDay()-1)*86400000);
day1 = new Date(nowDate.getTime() - (nowDate.getDay() - 1) * 86400000);
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
break;
}
case'3': { //月报
day1 = new Date(nowDate.getFullYear(),nowDate.getMonth(),1);
day1 = new Date(nowDate.getFullYear(), nowDate.getMonth(), 1);
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
break;
......
src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.html
View file @ bf05fdca
......@@ -57,7 +57,7 @@
</div>
<nz-spin [nzSpinning]="isLoading">
<div style="margin-top: 30px" nz-row nzGutter="4">
<div nz-col nzSpan="12">
<div nz-col nzSpan="12" style="height: 500px">
<ng-container *ngIf="data.left">
<div class="img-noData">
<div class="noData" title="暂无数据"></div>
......@@ -67,7 +67,7 @@
<div echarts [options]="chartTopOption" style="height: 400px;width: 100%"></div>
</ng-container>
</div>
<div nz-col nzSpan="12">
<div nz-col nzSpan="12" style="height: 500px">
<ng-container *ngIf="data.right">
<div class="img-noData">
<div class="noData" title="暂无数据"></div>
......
src/main/webapp/app/work/asset-part/asset-part.component.html
View file @ bf05fdca
......@@ -42,7 +42,7 @@
</div>
</div>
<nz-table #nzTable [nzData]="childrenList" [nzShowPagination]="true">
<nz-table #nzTable [nzData]="childrenList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="isLoading">
<thead>
<tr>
<th>子分类</th>
......
src/main/webapp/app/work/asset-part/asset-part.component.ts
View file @ bf05fdca
......@@ -22,6 +22,8 @@ export class AssetPartComponent implements OnInit {
childrenList;
timeBegin;
timeEnd;
isLoading = true;
pageCount = pageSize;
pageNum = 1;
totalNum;
......@@ -64,9 +66,11 @@ export class AssetPartComponent implements OnInit {
//子级分类
changeType(){
this.isLoading = true;
this.workSer.findByParentidCount(this.obj.type).subscribe(
(res)=>{
this.childrenList = res.data;
this.isLoading = false;
}
)
}
......
src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html
View file @ bf05fdca
<div nz-row class="breadcrumbs" >
<div nz-row class="breadcrumbs">
<div nz-col nzSpan="16">
<nz-breadcrumb class="padding-8-0">
<nz-breadcrumb-item>
......@@ -30,7 +30,7 @@
<button (click)="deleteModal()" nz-button nzType="default">删除</button>
</div>
<nz-tabset class="tabs-smart ">
<nz-tab #thirdTabs nzTitle="资产信息" >
<nz-tab #thirdTabs nzTitle="资产信息">
<div nz-form class="ant-advanced-search-form form-select">
<div nz-row [nzGutter]="24">
......@@ -40,10 +40,13 @@
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.inventoryNo}}
<ng-container *ngIf="!inventoryExtend?.hostid">
<button style="margin-left: 10px;" nzSize="small" (click)="linkThen()" nz-button nzType="primary">关联</button>
<button style="margin-left: 10px;" nzSize="small" (click)="linkThen()" nz-button
nzType="primary">关联
</button>
</ng-container>
<ng-container *ngIf="inventoryExtend?.hostid">
<span style="margin-left: 10px;" (click)="goToHost(inventoryExtend?.hostid)" class="main-color cursor">已关联监控资源</span>
<span style="margin-left: 10px;" (click)="goToHost(inventoryExtend?.hostid)"
class="main-color cursor">已关联监控资源</span>
</ng-container>
</nz-form-control>
</nz-form-item>
......@@ -71,25 +74,25 @@
</div>
</div>
<!--<div nz-row [nzGutter]="24">-->
<!--<div nz-col [nzSpan]="12">-->
<!--<nz-form-item nzFlex>-->
<!--<nz-form-label [nzOffset]="4" nzRequired [nzSpan]="6" >父分类-->
<!--</nz-form-label>-->
<!--<nz-form-control [nzSpan]="14">-->
<!--</nz-form-control>-->
<!--</nz-form-item>-->
<!--</div>-->
<!--<div nz-col [nzSpan]="12">-->
<!--<nz-form-item nzFlex>-->
<!--<nz-form-label [nzSpan]="6" nzRequired >子分类-->
<!--</nz-form-label>-->
<!--<nz-form-control [nzSpan]="14">-->
<!--</nz-form-control>-->
<!--</nz-form-item>-->
<!--</div>-->
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" nzRequired [nzSpan]="6">父分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzRequired>子分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
<!--</div>-->
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
......@@ -115,7 +118,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >库存</nz-form-label>
<nz-form-label [nzOffset]="4" [nzSpan]="6">库存</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.stock}}
</nz-form-control>
......@@ -124,7 +127,7 @@
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >型号</nz-form-label>
<nz-form-label [nzSpan]="6">型号</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.serialnoA}}
</nz-form-control>
......@@ -144,7 +147,7 @@
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >MAC地址</nz-form-label>
<nz-form-label [nzSpan]="6">MAC地址</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.mac}}
</nz-form-control>
......@@ -154,7 +157,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >借出</nz-form-label>
<nz-form-label [nzOffset]="4" [nzSpan]="6">借出</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.lendcount}}
</nz-form-control>
......@@ -174,7 +177,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >维修</nz-form-label>
<nz-form-label [nzOffset]="4" [nzSpan]="6">维修</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.repaircount}}
</nz-form-control>
......@@ -194,7 +197,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >报废</nz-form-label>
<nz-form-label [nzOffset]="4" [nzSpan]="6">报废</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.scrapcount}}
<!--<input nz-input placeholder="报废" name="scrapcount" [(ngModel)]="inventoryExtend?.scrapcount">-->
......@@ -204,8 +207,10 @@
</div>
</div>
</nz-tab>
<nz-tab #thirdTabs nzTitle="关联事件" >
<nz-table #nzTable [nzData]="thingList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<nz-tab #thirdTabs nzTitle="关联事件">
<nz-table #nzTable [nzData]="thingList" [nzFrontPagination]="false" [nzTotal]="totalNum"
[nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)"
[nzLoading]="loading">
<thead>
<tr>
<th nzShowSort>时间</th>
......@@ -251,7 +256,6 @@
</div>
<!--选择资源-->
<smart-select-group #smartSelectGroup (done)="setLink($event)"></smart-select-group>
<!--资产-->
......
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