Commit 054c6105 authored by wangqinghua's avatar wangqinghua

电压温度功率

parent 1fd7ce11
...@@ -355,7 +355,7 @@ export class ServerComponent implements OnInit { ...@@ -355,7 +355,7 @@ export class ServerComponent implements OnInit {
}; };
this.overAllSer.getfan(data).subscribe( this.overAllSer.getfan(data).subscribe(
(res) => { (res) => {
if (res.result.length > 0) { if (res.result && res.result.length > 0) {
this.fanObj.noData = false; this.fanObj.noData = false;
this.setFanOption(res.result); this.setFanOption(res.result);
} else { } else {
...@@ -437,13 +437,17 @@ export class ServerComponent implements OnInit { ...@@ -437,13 +437,17 @@ export class ServerComponent implements OnInit {
data.type = '3'; data.type = '3';
this.overAllSer.getTemperature(data).subscribe( this.overAllSer.getTemperature(data).subscribe(
(res2) => { (res2) => {
if (res1.result.length == 0 && res2.result.length) { this.powerObj.isPowerLoading = false;
if(!res1.result && !res1.result){
this.powerObj.noData = true; this.powerObj.noData = true;
} else { }else{
this.setPowerOption(res1.result, res2.result); if ( res1.result.length == 0 && res2.result.length) {
this.powerObj.noData = false; this.powerObj.noData = true;
} else {
this.setPowerOption(res1.result, res2.result);
this.powerObj.noData = false;
}
} }
this.powerObj.isPowerLoading = false;
} }
); );
} }
...@@ -527,7 +531,7 @@ export class ServerComponent implements OnInit { ...@@ -527,7 +531,7 @@ export class ServerComponent implements OnInit {
}; };
this.overAllSer.getTemperature(data).subscribe( this.overAllSer.getTemperature(data).subscribe(
(res) => { (res) => {
if (res.result.length > 0) { if (res.result && res.result.length > 0) {
this.temObj.noData = false; this.temObj.noData = false;
this.setTemOption(res.result); this.setTemOption(res.result);
} else { } else {
......
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