update

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

@@ -148,17 +148,13 @@ export class AlarmLogComponent implements OnInit {
                 break;
             }
             case'3':{
-                day1 = nowDate - 3*24*60*60*1000;
-                day2 = nowDate - 1*24*60*60*1000;
-                this.obj.time_from = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.time_till = this.datePipe.transform(day2,'yyyy-MM-dd') + ' 23:59:59';
+                this.obj.time_from = nowDate - 3*24*60*60*1000;
+                this.obj.time_till = nowDate;
                 break;
             }
             case'4':{
-                day1 = nowDate - 7*24*60*60*1000;
-                day2 = nowDate - 1*24*60*60*1000;
-                this.obj.time_from = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.time_till = this.datePipe.transform(day2,'yyyy-MM-dd') + ' 23:59:59';
+                this.obj.time_from = nowDate - 7*24*60*60*1000;
+                this.obj.time_till = nowDate;
                 break;
             }
             case'5':{

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

@@ -66,7 +66,9 @@
         {{item.receiver}}
       </p>
     </td>
-    <td>{{data.event.title}}</td>
+    <td><ng-container *ngIf="data.event">
+        {{data.event.title}}
+      </ng-container></td>
     <td class="handle text-center main-color">
       <span (click)="showEditModal(data)">编辑</span>
       <span (click)="deleteAlarm(data)">删除</span>

src/main/webapp/app/home/home.component.ts

@@ -108,7 +108,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
     }
 
     //查看详情
-    goDetail(item) {
+    goToDetail(item) {
         this.router.navigate(['app/main/basic-detail'], {
             queryParams: {
                 hostId: item.hostid,

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

@@ -343,12 +343,15 @@ export class AlarmModalComponent implements OnInit {
             r_longdata: this.validateForm.r_longdata,
             r_shortdata: this.validateForm.r_shortdata,
             hostIds: this.selectTreeList,
-            event: {
-                eventTypeId: this.validateForm.event.eventTypeId,   //事件分类id
-                operators: this.operatorList,   //事件负责人
-                title: this.validateForm.event.title,  //事件标题
-            }
+            event: null
         };
+        if(this.isEvent == "1"){
+            data.event = {
+                    eventTypeId: this.validateForm.event.eventTypeId,   //事件分类id
+                    operators: this.operatorList,   //事件负责人
+                    title: this.validateForm.event.title,  //事件标题
+            }
+        }
 
         if (this.title == '添加告警') {
             this.create(data);

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts

@@ -369,20 +369,20 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
                                     e2.alarm = "主机被删除，请及时清理";
                                     e2.fontColor='0,0,0';
                                     e2.alarmAlpha=0.9;
-                                    dlist.push(e2)
+                                    // dlist.push(e2)
                                 }
                                 if(e1.status == 1){
                                     e2.alarm = "危险";
                                     e2.fontColor='0,0,0';
                                     e2.alarmColor='255,153,18';
                                     e2.alarmAlpha=0.9;
-                                    wlist.push(e2);
+                                    // wlist.push(e2);
                                 }
                                 if(e1.status == 2){
                                     e2.alarm = "故障";
                                     e2.fontColor='255,97,0';
                                     e2.alarmAlpha=0.9;
-                                    glist.push(e2);
+                                    // glist.push(e2);
                                 }
                             }
                         })
@@ -390,9 +390,9 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
                     editor.loadTopologyByJson(topologyJson, 'img/backimg.png');
                 }
             )
-            this.interval(wlist,"危险");
-            this.interval(glist,"故障");
-            this.interval(dlist,"已删除");
+            // this.interval(wlist,"危险");
+            // this.interval(glist,"故障");
+            // this.interval(dlist,"已删除");
         }
 
         //流量数据

src/main/webapp/app/overAll/template/template.component.html

@@ -144,8 +144,8 @@
 <!--临时暂停-->
 <smart-pause #smartPause (done)="handleOk($event)"></smart-pause>
 <!--添加告警-->
-<smart-alarm-modal #smartAlarmModal></smart-alarm-modal>
+<smart-alarm-modal #smartAlarmModal (done)="handleOk($event)"></smart-alarm-modal>
 <!--自动发现-->
-<smart-discovery #smartDiscovery></smart-discovery>
+<smart-discovery #smartDiscovery (done)="handleOk($event)"></smart-discovery>
 <!--监控策略-->
-<smart-strategy #smartStrategy></smart-strategy>
\ No newline at end of file
+<smart-strategy #smartStrategy (done)="handleOk($event)"></smart-strategy>
\ No newline at end of file

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

@@ -330,4 +330,8 @@ ui bootstrap tweaks
 .ant-tooltip-placement-bottom .ant-tooltip-arrow{
     border-bottom-color:#dddddd;
 }
-
+.table-dropdown a,
+.ant-dropdown-menu-item > a{
+    font-weight: 400 !important;
+    color:#6097b7;
+}