Commit ba36f86c authored by wangqinghua's avatar wangqinghua

update

parent fa58abb2
...@@ -163,7 +163,7 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe ...@@ -163,7 +163,7 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
myCanvas.width = myCanvas.width * ratio; myCanvas.width = myCanvas.width * ratio;
myCanvas.height = myCanvas.height * ratio; myCanvas.height = myCanvas.height * ratio;
// context.scale(ratio, ratio); context.scale(ratio, ratio);
editor.loadTopology('', '', 'img/backimg.png', canvasWidth, canvasHeight); editor.loadTopology('', '', 'img/backimg.png', canvasWidth, canvasHeight);
} }
...@@ -415,12 +415,14 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe ...@@ -415,12 +415,14 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
// } // }
if (e1.status == 1) { if (e1.status == 1) {
e2.alarm = '危险'; e2.alarm = '危险';
e2.description = e1.description;
// e2.fontColor='0,0,0'; // e2.fontColor='0,0,0';
e2.alarmColor = '255,153,18'; e2.alarmColor = '255,153,18';
e2.alarmAlpha = 0.9; e2.alarmAlpha = 0.9;
} }
if (e1.status == 2) { if (e1.status == 2) {
e2.alarm = '故障'; e2.alarm = '故障';
e2.description = e1.description;
// e2.fontColor='0,0,0'; // e2.fontColor='0,0,0';
e2.alarmAlpha = 0.9; e2.alarmAlpha = 0.9;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment