update

src/main/webapp/app/alarm/alarm-log/alarm-log.component.ts

@@ -43,7 +43,7 @@ export class AlarmLogComponent implements OnInit {
     sendList;
 
     //条件
-    timeType;
+    timeType = '1';
     obj = {
         time_from:<any>'',
         time_till:<any>'',
@@ -61,6 +61,9 @@ export class AlarmLogComponent implements OnInit {
     content;
     constructor(public alarmSer: AlarmService,public overAllSer:OverAllService,public message:NzMessageService,
                 public datePipe:DatePipe,public modalSer:NzModalService) {
+        const today = new Date();
+        this.obj.time_from = this.datePipe.transform(today,"yyyy-MM-dd") +" 00:00:00";
+        this.obj.time_till = this.datePipe.transform(today,"yyyy-MM-dd") +" 23:59:59";
     }
 
     ngOnInit() {

src/main/webapp/app/modal/website/website.component.html

@@ -11,16 +11,16 @@
                                     <nz-form-item nzFlex>
                                         <nz-form-label [nzSpan]="6" nzRequired nzFor="name">网站名称</nz-form-label>
                                         <nz-form-control [nzSpan]="14">
-                                            <input id="name" name="name" nz-input placeholder="默认" [(ngModel)]="validateForm.name">
+                                            <input id="name" name="name" nz-input placeholder="网站名称" [(ngModel)]="validateForm.name">
                                         </nz-form-control>
                                     </nz-form-item>
                                 </div>
 
                                 <div nz-col [nzSpan]="12">
                                     <nz-form-item nzFlex>
-                                        <nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="delay">更新间隔</nz-form-label>
+                                        <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="delay">更新间隔</nz-form-label>
                                         <nz-form-control [nzSpan]="14">
-                                            <input id="delay" name="delay" nz-input placeholder="默认" [(ngModel)]="validateForm.delay">
+                                            <input id="delay" name="delay" nz-input placeholder="更新间隔" [(ngModel)]="validateForm.delay">
                                         </nz-form-control>
                                     </nz-form-item>
                                 </div>
@@ -31,7 +31,7 @@
                                     <nz-form-item nzFlex>
                                         <nz-form-label [nzSpan]="6" nzFor="retries">尝试次数</nz-form-label>
                                         <nz-form-control [nzSpan]="14">
-                                            <input id="retries" name="retries" nz-input placeholder="默认" [(ngModel)]="validateForm.retries">
+                                            <input id="retries" name="retries" nz-input placeholder="尝试次数" [(ngModel)]="validateForm.retries">
                                         </nz-form-control>
                                     </nz-form-item>
                                 </div>

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

@@ -70,6 +70,14 @@ export class WebsiteComponent implements OnInit {
     }
 
     handleOk() {
+        if(!this.validateForm.name){
+            this.message.error("请输入网站名称")
+            return false;
+        }
+        if(!this.validateForm.delay){
+            this.message.error("请输入更新间隔")
+            return false;
+        }
         if(this.title == '添加网站监测'){
             this.create();
         }else{

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

@@ -3,7 +3,7 @@ import {ActivatedRoute} from '@angular/router';
 import {WorkService} from '../../work.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {LinkInventoryComponent} from '../../modal/link-inventory/link-inventory.component';
-import {DatePipe} from '@angular/common';
+import {DatePipe, Location} from '@angular/common';
 import {TransforComponent} from '../../modal/transfor/transfor.component';
 
 @Component({
@@ -30,7 +30,7 @@ export class HandleEventComponent implements OnInit {
     eventId;
     event;
     transforsList;
-    linkList;
+    linkList = [];
     format;
 
     obj = {
@@ -40,7 +40,7 @@ export class HandleEventComponent implements OnInit {
     date;
     time;
 
-    constructor(private routrInfo: ActivatedRoute, private workSer: WorkService,
+    constructor(private routrInfo: ActivatedRoute, private workSer: WorkService,private location:Location,
                 private message: NzMessageService,private datePipe:DatePipe) {
         this.routrInfo.queryParams.subscribe(
             (res) => {
@@ -86,7 +86,6 @@ export class HandleEventComponent implements OnInit {
 
     //选择管理返回值
     setLink(e){
-        console.log(e);
         this.linkList = e;
     }
 
@@ -117,6 +116,7 @@ export class HandleEventComponent implements OnInit {
         this.workSer.deal(data).subscribe(
             (res)=>{
                 if(res.errCode == 10000){
+                    this.location.back();
                     this.message.success("事件处理成功");
                 }else{
                     this.message.error(res.errMsg);

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

@@ -158,6 +158,6 @@
 .color-red{
     color: red;
 }
-.color-red{
+.color-green{
     color: green;
 }
\ No newline at end of file