update

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -6,7 +6,7 @@
             <span #parent  class="span-hov">
               <span #children class="addBtn">
                 <span (click)="showGroupModal()">添加设备分组</span>
-                <span (click)="showBasicEditModal(item)">添加资源</span>
+                <span (click)="showBasicEditModal()">添加资源</span>
                 <!--<span>添加业务</span>-->
             </span>
             </span>
@@ -28,6 +28,6 @@
 <!--三员分立-->
 <smart-separation #smartSeparation></smart-separation>
 <!-- 添加资源-->
-<smart-basic-edit #basicEdit (done)="handleOk($event)"></smart-basic-edit>
+<smart-basic-edit #basicEdit></smart-basic-edit>
 <!--添加分组-->
-<smart-create-group #smartCreateGroup (add)="handleOk($event)"></smart-create-group>
\ No newline at end of file
+<smart-create-group #smartCreateGroup></smart-create-group>
\ No newline at end of file

src/main/webapp/app/netTopology/topology-img/topology-img.component.html

@@ -21,9 +21,9 @@
 <div nz-row class="search-form">
   <div nz-col nzSpan="12">
     <nz-select style="width: 200px;"  nzPlaceHolder="选择类型" (ngModelChange)="getList()">
-      <ng-container *ngFor="let item of groupList;let i = index;">
-        <nz-option nzLabel="选择类型"></nz-option>
-      </ng-container>
+      <!--<ng-container *ngFor="let item of groupList;let i = index;">-->
+        <!--<nz-option nzLabel="选择类型"></nz-option>-->
+      <!--</ng-container>-->
     </nz-select>
   </div>
   <div nz-col nzSpan="12" class="text-right">

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

@@ -194,4 +194,4 @@
   </div>
 </div>
 <!--添加网站-->
-<smart-website #smartWebsite (done)="getwebList()"></smart-website>
\ No newline at end of file
+<smart-website #smartWebsite></smart-website>
\ No newline at end of file

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

-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {WorkService} from '../../work.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {ActivatedRoute} from '@angular/router';
 
 @Component({
-  selector: 'smart-handle-detail',
-  templateUrl: './handle-detail.component.html',
-  styles: [
-      `
-          :host ::ng-deep .ant-row{
-              margin: 20px 0;
-          }
-          :host ::ng-deep .ant-col-4{
-              text-align: right;
-          }
-          h2{
-              font-weight: 400;
-          }
-      `
-  ]
+    selector: 'smart-handle-detail',
+    templateUrl: './handle-detail.component.html',
+    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 {
 
-  eventId;
-  event;
-  constructor(private workSer:WorkService,private message:NzMessageService,
-              private routrInfo:ActivatedRoute) {
-    this.routrInfo.queryParams.subscribe(
-        (res)=>{
-          this.eventId = res.eventId;
-        }
-    )
-  }
+    eventId;
+    event;
+    linkList;
+    transforsList;
+
+    constructor(private workSer: WorkService, private message: NzMessageService,
+                private routrInfo: ActivatedRoute) {
+        this.routrInfo.queryParams.subscribe(
+            (res) => {
+                this.eventId = res.eventId;
+            }
+        );
+    }
 
-  ngOnInit() {
-    this.getDetail();
-  }
+    ngOnInit() {
+        this.getDetail();
+    }
 
-  getDetail(){
-    this.workSer.findByNo(this.eventId).subscribe(
-        (res)=>{
-          this.event = res.data;
-        }
-    )
-  }
+    getDetail() {
+        this.workSer.findByNo(this.eventId).subscribe(
+            (res) => {
+                this.event = res.data;
+            }
+        );
+    }
 }

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

@@ -72,7 +72,7 @@
   <div nz-col nzSpan="12">
     <h2>已解决，填写处理结果</h2>
     <div nz-row>
-      <div nz-col nzSpan="5">处理结果</div>
+      <div nz-col nzSpan="5"> <span class="color-red">*</span>处理结果</div>
       <div nz-col nzSpan="19">
         <nz-radio-group [(ngModel)]="obj.operateStatus">
           <label nz-radio nzValue="0">未解决</label>
@@ -82,7 +82,7 @@
       </div>
     </div>
     <div nz-row>
-      <div nz-col nzSpan="5">完成时间</div>
+      <div nz-col nzSpan="5"> <span class="color-red">*</span> 完成时间</div>
       <div nz-col nzSpan="19">
         <nz-date-picker [(ngModel)]="date" nzFormat="yyyy-MM-dd"></nz-date-picker>
         <nz-time-picker [(ngModel)]="time"></nz-time-picker>
@@ -100,7 +100,7 @@
       </div>
     </div>
     <div nz-row>
-      <div nz-col nzSpan="5">处理情况</div>
+      <div nz-col nzSpan="5"><span class="color-red">*</span>处理情况</div>
       <div nz-col nzSpan="19">
         <textarea [(ngModel)]="obj.operateResult" id="tyoeDescribe" row="4" nz-input></textarea>
       </div>

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

@@ -92,6 +92,19 @@ export class HandleEventComponent implements OnInit {
 
     //保存处理
     save(){
+        if(!this.obj.operateStatus){
+            this.message.error("请选择处理结果");
+            return false;
+        }
+        if(!this.date || !this.time){
+            this.message.error("请选择完成时间");
+            return false;
+        }
+        if(!this.obj.operateResult){
+            this.message.error("请填写处理情况");
+            return false;
+        }
+
         const data = {
             id:this.eventId,
             operateStatus:Number(this.obj.operateStatus),
@@ -100,7 +113,7 @@ export class HandleEventComponent implements OnInit {
             }),
             operateResult:this.obj.operateResult,
             completeTimeStr:this.datePipe.transform(this.date,"yyyy-MM-dd") + " " + this.datePipe.transform(this.time,"HH:mm:ss")
-        }
+        };
         this.workSer.deal(data).subscribe(
             (res)=>{
                 if(res.errCode == 10000){

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

@@ -151,4 +151,7 @@
 }
 .ant-timeline-item-content{
     left: -25px;
+}
+.color-red{
+    color: red;
 }
\ No newline at end of file