Merge remote-tracking branch 'origin/master'

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

@@ -379,20 +379,20 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
                             if(e1.elementId == e2.hostId){
                                 if(e1.status == -2){
                                     e2.alarm = "主机被删除，请及时清理";
-                                    e2.fontColor='0,0,0';
+                                    e2.fontColor='255,255,255';
                                     e2.alarmAlpha=0.9;
                                     // dlist.push(e2)
                                 }
                                 if(e1.status == 1){
                                     e2.alarm = "危险";
-                                    e2.fontColor='0,0,0';
+                                    e2.fontColor='255,255,255';
                                     e2.alarmColor='255,153,18';
                                     e2.alarmAlpha=0.9;
                                     // wlist.push(e2);
                                 }
                                 if(e1.status == 2){
                                     e2.alarm = "故障";
-                                    e2.fontColor='255,97,0';
+                                    e2.fontColor='255,255,255';
                                     e2.alarmAlpha=0.9;
                                     // glist.push(e2);
                                 }