update

src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.html

@@ -126,9 +126,9 @@
                 <div nz-col [nzSpan]="6" >
                       <div #chartSpeedLeft class="chart-left" *ngFor="let item of speed,let i  = index;">
                         <p class="tag-form"> <nz-tag [nzColor]="colorArr[i]"></nz-tag> <span>{{item.name}}</span> </p>
-                        <p>平均值</p>
-                        <p>最大值</p>
-                        <p>最小值</p>
+                        <p>平均值   {{item.average}}</p>
+                        <p>最大值   {{item.max}}</p>
+                        <p>最小值   {{item.min}}</p>
                       </div>
                 </div>
                 <div nz-col [nzSpan]="18">
@@ -139,9 +139,9 @@
                 <div nz-col [nzSpan]="6" >
                     <div #chartTimeLeft class="chart-left" *ngFor="let item of time,let i  = index;">
                       <p class="tag-form"> <nz-tag [nzColor]="colorArr[i]"></nz-tag> <span>{{item.name}}</span> </p>
-                      <p>平均值</p>
-                      <p>最大值</p>
-                      <p>最小值</p>
+                      <p>平均值   {{item.average}}</p>
+                      <p>最大值   {{item.max}}</p>
+                      <p>最小值   {{item.min}}</p>
                     </div>
                 </div>
                 <div nz-col [nzSpan]="18">

src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.ts

@@ -200,7 +200,7 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
                 type: 'category',
                 boundaryGap: false,
                 data: speed[0].data.map(res => {
-                    return res.clockDate;
+                    return res.date;
                 })
             },
             yAxis: {
@@ -208,7 +208,7 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
             },
             series: speed.map((res1,index) => {
                 const number = res1.data.map(res2 => {
-                    return res2.num;
+                    return res2.val;
                 });
                 const obj = {
                     name: res1.name,
@@ -252,7 +252,7 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
                 type: 'category',
                 boundaryGap: false,
                 data: time[0].data.map(res => {
-                    return res.clockDate;
+                    return res.date;
                 })
             },
             yAxis: {
@@ -260,7 +260,7 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
             },
             series: time.map((res1,index) => {
                 const number = res1.data.map(res2 => {
-                    return res2.num;
+                    return res2.val;
                 });
                 const obj = {
                     name: res1.name,

src/main/webapp/app/work/work-handle/Event/event.component.html

@@ -36,7 +36,7 @@
                 <nz-form-item nzFlex>
                     <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="requester">请求人</nz-form-label>
                     <nz-form-control [nzSpan]="14">
-                        <input id="requester" nz-input placeholder="显示名" name="requester" formControlName="requester">
+                        <input id="requester" nz-input placeholder="请求人" name="requester" formControlName="requester">
                         <nz-form-explain *ngIf="validateForm.get('requester').dirty && validateForm.get('requester').errors">请输入请求人</nz-form-explain>
 
                     </nz-form-control>
@@ -48,7 +48,7 @@
                     <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="requesterPhone">联系电话
                     </nz-form-label>
                     <nz-form-control [nzSpan]="14">
-                        <input id="requesterPhone" nz-input placeholder="显示名" name="requesterPhone" formControlName="requesterPhone">
+                        <input id="requesterPhone" nz-input placeholder="联系电话" name="requesterPhone" formControlName="requesterPhone">
                         <nz-form-explain *ngIf="validateForm.get('requesterPhone').dirty && validateForm.get('requesterPhone').errors">请输入联系电话</nz-form-explain>
 
                     </nz-form-control>
@@ -73,7 +73,7 @@
             <nz-form-label [nzSpan]="4" nzFor="description">详细描述</nz-form-label>
             <nz-form-control [nzSpan]="14">
                     <textarea nz-input id="description" name="description" formControlName="description"
-                              placeholder="发送信息" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
+                              placeholder="详细描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
             </nz-form-control>
         </nz-form-item>
 

src/main/webapp/app/work/work-handle/work-handle.component.ts

@@ -16,11 +16,11 @@ import {DatePipe} from '@angular/common';
 })
 export class WorkHandleComponent implements OnInit {
     @ViewChild('smartEvent') smartEvent: EventComponent;
-    @ViewChild('smartTransfor') smartTransfor:TransforComponent;
-    @ViewChild('smartSelectPerson') smartSelectPerson:SelectPersonComponent;
+    @ViewChild('smartTransfor') smartTransfor: TransforComponent;
+    @ViewChild('smartSelectPerson') smartSelectPerson: SelectPersonComponent;
 
     timeFormat = 'yyyy-MM-dd';
-    timeType = "1";
+    timeType = '1';
     eventList;
     eventTypeList;
     startTime;
@@ -41,7 +41,7 @@ export class WorkHandleComponent implements OnInit {
     };
 
     constructor(private workSer: WorkService, private message: NzMessageService,
-                private router: Router, private commonSer: CommonService,private datePipe:DatePipe) {
+                private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
     }
 
     ngOnInit() {
@@ -50,12 +50,12 @@ export class WorkHandleComponent implements OnInit {
     }
 
     //获取事件分类
-    getEventType(){
+    getEventType() {
         const data = {
-            type:0
+            type: 0
         };
         this.workSer.findParamsByType(data).subscribe(
-            (res)=>{
+            (res) => {
                 this.eventTypeList = res.data;
             }
         );
@@ -99,7 +99,7 @@ export class WorkHandleComponent implements OnInit {
     }
 
     //处理事件
-    goToHandle(item){
+    goToHandle(item) {
         this.router.navigate(['app/main/handleEvent'], {
             queryParams: {
                 eventId: item.id
@@ -113,8 +113,8 @@ export class WorkHandleComponent implements OnInit {
     }
 
     //编辑事件
-    showEditModal(item){
-        this.smartEvent.showEditModal("编辑事件",item.id);
+    showEditModal(item) {
+        this.smartEvent.showEditModal('编辑事件', item.id);
     }
 
     //删除事件
@@ -123,7 +123,7 @@ export class WorkHandleComponent implements OnInit {
             ids: []
         };
         arr.ids.push(data.id);
-        this.commonSer.confirmThing("删除",'确定删除该事件', () => {
+        this.commonSer.confirmThing('删除', '确定删除该事件', () => {
             this.workSer.deleteEvent(arr).subscribe(
                 (res) => {
                     if (res.errCode == 10000) {
@@ -138,52 +138,15 @@ export class WorkHandleComponent implements OnInit {
     }
 
     //转派
-    showTransforModal(item){
-        this.smartTransfor.showTransforModal("事件转派",item.id);
-    }
-
-    //时间改变
-    changeType() {
-        const nowDate = new Date().getTime();
-        let day1, day2;
-        switch (this.timeType) {
-            case'1': {
-                this.obj.startTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'2': {
-                day1 = nowDate - 1 * 24 * 60 * 60 * 1000;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'3': {
-                day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
-                day2 = nowDate - 1 * 24 * 60 * 60 * 1000;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'4': {
-                day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
-                day2 = nowDate - 1 * 24 * 60 * 60 * 1000;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'5': {
-                break;
-            }
-        }
+    showTransforModal(item) {
+        this.smartTransfor.showTransforModal('事件转派', item.id);
     }
 
     //搜索
     search() {
-        if (this.timeType == '5') {
-            this.obj.startTime = this.datePipe.transform(this.startTime, 'yyyy-MM-dd HH:mm:ss');
-            this.obj.endTime = this.datePipe.transform(this.endTime, 'yyyy-MM-dd HH:mm:ss');
-        }
+        this.obj.startTime = this.datePipe.transform(this.startTime, 'yyyy-MM-dd HH:mm:ss');
+        this.obj.endTime = this.datePipe.transform(this.endTime, 'yyyy-MM-dd HH:mm:ss');
+
         this.getList();
     }
 }