Merge branch 'master' of http://180.168.156.212:2903/qinghua/smart

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

@@ -45,6 +45,8 @@
             <span aria-hidden="true" title="全屏查看"
                   onClick="editor.utils.showInFullScreen(editor.stage.canvas,'RequestFullScreen')">全屏查看</span>
             <span aria-hidden="true" title="居中显示" onClick="editor.utils.showInCenter()">居中显示</span>
+            <span aria-hidden="true" title="编辑" onClick="editor.utils.editTopology()">编辑</span>
+            <span aria-hidden="true" title="只读" onClick="editor.utils.normalTopology()">只读</span>
             <span aria-hidden="true" title="保存" (click)="update()">保存</span>
             <span aria-hidden="true" title="清空" onClick="editor.utils.clearTopology()">清空</span>
             <span aria-hidden="true" title="放大" onClick="editor.utils.scalingBig()">放大</span>

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

@@ -308,7 +308,9 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
                                 if(e1.status == 0){
                                 }
                                 if(e1.status == 1){
-                                    e2.alarm = "告警";
+                                    e2.alarm = e1.description;
+                                    e2.fontColor='0,0,0';
+                                    e2.alarmAlpha=0.9;
                                 }
                                 if(e1.status == 2){
                                     // e2.alarm = "严重";