update

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

@@ -49,13 +49,13 @@
     <div nz-col nzSpan="8" *ngIf="timeType == '5'">
         <nz-date-picker
                 nzShowTime
-                [(ngModel)]="obj.time_from"
+                [(ngModel)]="startTime"
                 nzPlaceHolder="开始时间"
         ></nz-date-picker>
         <nz-date-picker
                 nzShowTime
                 nzFormat="yyyy-MM-dd HH:mm:ss"
-                [(ngModel)]="obj.time_till"
+                [(ngModel)]="endTime"
                 nzPlaceHolder="结束时间"
         ></nz-date-picker>
     </div>

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

@@ -52,6 +52,9 @@ export class AlarmLogComponent implements OnInit {
         hostids:null,
     };
 
+    startTime;
+    endTime;
+
     //modal
     isVisible = false;
     title;
@@ -72,8 +75,8 @@ export class AlarmLogComponent implements OnInit {
             "eventPage":this.pageNum,
             "pageRecords":this.pageCount,
             "alertGroupId":this.obj.alertGroupId,
-            "time_from":this.obj.time_from,
-            "time_till":this.obj.time_till,
+            "time_from":new Date( this.obj.time_from ).getTime(),
+            "time_till":new Date( this.obj.time_till).getTime(),
             "mediatypeids":[this.obj.mediatypeids],
             "hostids":[this.obj.hostids]
         };
@@ -160,8 +163,10 @@ export class AlarmLogComponent implements OnInit {
 
     //查询
     search(){
-        this.obj.time_from = new Date(this.obj.time_from).getTime();
-        this.obj.time_till = new Date(this.obj.time_till).getTime();
+        if(this.timeType == "5"){
+            this.obj.time_from = new Date(this.startTime).getTime();
+            this.obj.time_till = new Date(this.endTime).getTime();
+        }
         this.getList();
     }
 

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

@@ -9,6 +9,7 @@
                         <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">事件标题</nz-form-label>
                         <nz-form-control [nzSpan]="14">
                             <input id="title" nz-input placeholder="事件标题" name="title" formControlName="title">
+                            <nz-form-explain *ngIf="validateForm.get('title').dirty && validateForm.get('title').errors">请输入事件标题</nz-form-explain>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -22,6 +23,8 @@
                                     <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
                                 </ng-container>
                             </nz-select>
+                            <nz-form-explain *ngIf="validateForm.get('type').dirty && validateForm.get('type').errors">请选择事件分类</nz-form-explain>
+
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -33,8 +36,9 @@
                 <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>
                 </nz-form-item>
             </div>
@@ -44,8 +48,9 @@
                     <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>
                 </nz-form-item>
             </div>

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

@@ -34,11 +34,11 @@ export class EventComponent implements OnInit {
         this.validateForm = this.fb.group(
             {
                 title: [null, [Validators.required]],
-                description: [null],
-                type: [null],
-                requester: [null],
-                requesterPhone: [null],
-                operators: [null],
+                description: [null,],
+                type: [null,[Validators.required]],
+                requester: [null,[Validators.required]],
+                requesterPhone: [null,[Validators.required]],
+                operators: [null,[Validators.required]],
             }
         );
     }
@@ -100,6 +100,13 @@ export class EventComponent implements OnInit {
             formData.append('file', file);
         });
         this.validateForm.value.operators = this.operatorsList;
+        for (let i in this.validateForm.controls) {
+            this.validateForm.controls[i].markAsDirty();
+            this.validateForm.controls[i].updateValueAndValidity();
+        }
+        if(this.validateForm.invalid){
+            return false;
+        }
         formData.append('json', JSON.stringify(this.validateForm.value));
         this.workSer.create(formData).subscribe(
             (res) => {
@@ -122,6 +129,15 @@ export class EventComponent implements OnInit {
             formData.append('file', file);
         });
         this.validateForm.value.operators = this.operatorsList;
+
+        for (let i in this.validateForm.controls) {
+            this.validateForm.controls[i].markAsDirty();
+            this.validateForm.controls[i].updateValueAndValidity();
+        }
+        if(this.validateForm.invalid){
+            return false;
+        }
+
         formData.append('json', JSON.stringify(this.validateForm.value));
         formData.append('id', this.eventId);
         this.workSer.update(formData).subscribe(

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html

@@ -22,3 +22,80 @@
     <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
   </div>
 </div>
+<div nz-row>
+  <div nz-col nzSpan="12">
+    <h2>事件信息</h2>
+    <div nz-row>
+      <div nz-col nzSpan="4">事件编号</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="7"></div>
+      <div nz-col nzSpan="4">提交时间</div>
+      <div nz-col nzSpan="7">{{event?.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="4">请求人</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="4">{{event?.requester}}</div>
+      <div nz-col nzSpan="7">{{event?.requesterPhone}}</div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="4">事件标题</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="7">{{event?.title}}</div>
+      <div nz-col nzSpan="4">事件分类</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="7">{{event?.typeName}}</div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="4">详细描述</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="7">{{event?.description}}</div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="4">附件</div>
+      <div nz-col nzSpan="1"></div>
+      <div nz-col nzSpan="7">{{event?.file}}</div>
+    </div>
+
+    <h2>处理结果</h2>
+    <div nz-row>
+      <div nz-col nzSpan="5">处理结果</div>
+      <div nz-col nzSpan="19">
+
+      </div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="5">完成时间</div>
+      <div nz-col nzSpan="19">
+
+      </div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="5">关联资产</div>
+      <div nz-col nzSpan="19">
+        <p *ngFor="let item of linkList;">
+          <span>资产编号</span>
+          <span>{{item.name}}</span>
+          <span>{{item.typeName}}</span>
+        </p>
+      </div>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="5">处理情况</div>
+      <div nz-col nzSpan="19">
+
+      </div>
+    </div>
+
+
+  </div>
+  <div nz-col nzSpan="12">
+    <h2>流转记录</h2>
+    <ng-container *ngFor="let item of transforsList;">
+      <div nz-row>
+        <div nz-col nzSpan="4">{{item.requesterName}}</div>
+        <div nz-col nzSpan="7">转派给{{item.operatorInfo[1]}}</div>
+      </div>
+    </ng-container>
+  </div>
+</div>
\ No newline at end of file

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

@@ -6,7 +6,19 @@ import {ActivatedRoute} from '@angular/router';
 @Component({
   selector: 'smart-handle-detail',
   templateUrl: './handle-detail.component.html',
-  styles: []
+  styles: [
+      `
+          :host ::ng-deep .ant-row{
+              margin: 20px 0;
+          }
+          :host ::ng-deep .ant-col-4{
+              text-align: right;
+          }
+          h2{
+              font-weight: 400;
+          }
+      `
+  ]
 })
 export class HandleDetailComponent implements OnInit {
 

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

@@ -149,3 +149,6 @@
 .breadcrumbs .ant-btn .anticon{
     color: #ffffff;
 }
+.ant-timeline-item-content{
+    left: -25px;
+}
\ No newline at end of file