workService

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.html

@@ -19,16 +19,16 @@
         <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
     </div>
 </div>
-<div nz-row [nzGutter]="4" class="search-form">
-    <div nz-col nzSpan="3">
+<div nz-row [nzGutter]="4" class="search-form" >
+    <div nz-col nzSpan="3" >
         <nz-select style="width: 100%;" nzPlaceHolder="所有分组" [(ngModel)]="obj.groupid">
             <ng-container *ngFor="let item of groupList">
                 <nz-option [nzLabel]="item.name" [nzValue]="item.groupid"></nz-option>
             </ng-container>
         </nz-select>
     </div>
-    <div nz-col nzSpan="3">
-        <nz-select style="width: 100%;" nzPlaceHolder="所有告警" [(ngModel)]="obj.priority">
+    <div nz-col nzSpan="3" >
+        <nz-select style="width: 100%;" nzPlaceHolder="所有告警" [(ngModel)]="obj.priorityName">
             <nz-option nzLabel="告警" nzValue="告警"></nz-option>
             <nz-option nzLabel="严重" nzValue="严重"></nz-option>
         </nz-select>
@@ -57,18 +57,18 @@
     </div>
 </div>
 <div nz-row nzGutter="4">
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="12" style="height: 400px">
         <nz-spin [nzSpinning]="isLoading">
             <div echarts [options]="chartTopOption" style="height: 400px;width: 100%"></div>
         </nz-spin>
     </div>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="12" style="height: 400px">
         <nz-spin [nzSpinning]="isLoading">
             <div echarts [options]="charTrendOption" style="height: 400px;width: 100%"></div>
         </nz-spin>
     </div>
 </div>
-<h2>常见问题TOP10</h2>
+<h3 style="margin-top: 20px">常见问题TOP10</h3>
 <nz-table #nzTable [nzData]="commonList">
     <thead>
     <tr>
@@ -91,8 +91,8 @@
     </ng-container>
     </tbody>
 </nz-table>
-<h2>统计报告</h2>
-<nz-table #nzTable1 [nzData]="reportList">
+<h3 style="margin-top: 20px">统计报告</h3>
+<nz-table #nzTable1 [nzData]="reportList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
     <thead>
     <tr>
         <th nzWidth="20%">时间</th>

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.ts

@@ -12,7 +12,7 @@ import {OverAllService} from '../../overAll/overAll.service';
 })
 export class ResourceAlarmComponent implements OnInit {
 
-    timeType;
+    timeType = '1';
     startTime;
     endTime;
     groupList;
@@ -21,7 +21,7 @@ export class ResourceAlarmComponent implements OnInit {
     isLoading = false;
 
     obj = {
-        priority: null,
+        priorityName: null,
         groupid: null,
         startTime: '',
         endTime: '',
@@ -32,8 +32,10 @@ export class ResourceAlarmComponent implements OnInit {
     commonList;
     reportList;
 
+    //统计报告分页
     pageCount = pageSize;
     pageNum = 1;
+    totalNum;
 
     warnList = [];
 
@@ -68,12 +70,11 @@ export class ResourceAlarmComponent implements OnInit {
 
     //告警总数TOP10
     getAlarmTopEchart() {
-        console.log(this.obj);
         const data = {
             groupid: this.obj.groupid,
             startTime: this.obj.startTime,
             endTime: this.obj.endTime,
-            priority: this.obj.priority,
+            priorityName: this.obj.priorityName,
         };
         this.analysisSer.waringCountTop(data).subscribe(
             (res) => {
@@ -110,7 +111,7 @@ export class ResourceAlarmComponent implements OnInit {
             groupid: this.obj.groupid,
             startTime: this.obj.startTime,
             endTime: this.obj.endTime,
-            priority: this.obj.priority,
+            priorityName: this.obj.priorityName,
         };
         this.analysisSer.waringTrend(data).subscribe(
             (res) => {
@@ -179,7 +180,7 @@ export class ResourceAlarmComponent implements OnInit {
             groupid: this.obj.groupid,
             startTime: this.obj.startTime,
             endTime: this.obj.endTime,
-            priorityName: this.obj.priority,
+            priorityName: this.obj.priorityName,
         };
         this.analysisSer.commonProblemTop(data).subscribe(
             (res) => {
@@ -196,12 +197,13 @@ export class ResourceAlarmComponent implements OnInit {
             obj: {
                 startTime: this.obj.startTime,
                 endTime: this.obj.endTime,
-                priorityName: this.obj.priority,
+                priorityName: this.obj.priorityName,
             }
         };
         this.analysisSer.statisticalReport(data).subscribe(
             (res) => {
                     this.reportList = res.data.data;
+                    this.totalNum = res.data.totalNum;
             }
         );
     }

src/main/webapp/app/work/pararms/pararms.component.html

@@ -41,10 +41,10 @@
       <div>
         <button (click)="showAddModal('添加事件分类',0)" nz-button nzType="default">添加</button>
       </div>
-      <div *ngFor="let item of eventList;">
+      <div class="handle" *ngFor="let item of eventList;">
         <span>{{item.name}}</span>
-        <span (click)="showEditModal('编辑事件分类',1,item)">编辑</span>
-        <span (click)="deleteItem(item)">删除</span>
+        <span class="main-font-color" (click)="showEditModal('编辑事件分类',1,item)">编辑</span>
+        <span class="main-font-color" (click)="deleteItem(item)">删除</span>
       </div>
     </div>
   </div>
@@ -58,10 +58,10 @@
       <div>
         <button (click)="showAddModal('添加计划分类',1)" nz-button nzType="default">添加</button>
       </div>
-      <div *ngFor="let item of planList;">
+      <div class="handle" *ngFor="let item of planList;">
         <span>{{item.name}}</span>
-        <span (click)="showEditModal('编辑计划分类',1,item)">编辑</span>
-        <span (click)="deleteItem(item)">删除</span>
+        <span class="main-font-color" (click)="showEditModal('编辑计划分类',1,item)">编辑</span>
+        <span class="main-font-color" (click)="deleteItem(item)">删除</span>
       </div>
     </div>
   </div>

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

@@ -9,7 +9,8 @@ import {CommonService} from '../../shared/common/common.service';
   templateUrl: './pararms.component.html',
   styles: [
       `
-          :host ::ng-deep .content-params .ant-row{
+          :host ::ng-deep .content-params .ant-row,
+          .handle{
               margin: 10px 0;
           }
       `

src/main/webapp/content/css/documentation.css

@@ -100,6 +100,6 @@
     margin-left: 8px;
 }
 
-.text-right{
-
+.main-font-color{
+    color:#1890ff;
 }
\ No newline at end of file

src/main/webapp/content/css/global.css

@@ -3,7 +3,7 @@ Bootstrap tweaks
 ===============================================================*/
 @import "documentation.css";
 body, h1, h2, h3, h4 {
-    font-weight: 300;
+    font-weight: 400;
 }
 
 body {