bug 修正

src/main/webapp/app/overAll/modal/server/server.component.html

@@ -48,11 +48,11 @@
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="12">已用大小：</nz-col>
-                                <nz-col nzSpan="12">{{hostObj.disk[diskType].use || '-'}}</nz-col>
+                                <nz-col nzSpan="12">{{hostObj.disk[diskType].used | unitConversion}}</nz-col>
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="12">剩余容量：</nz-col>
-                                <nz-col nzSpan="12">{{(hostObj.disk[diskType].total - hostObj.disk[diskType].use) || '-'}}</nz-col>
+                                <nz-col nzSpan="12">{{(hostObj.disk[diskType].total - hostObj.disk[diskType].used) | unitConversion }}</nz-col>
                             </nz-row>
                         </nz-spin>
                     </ng-container>
@@ -81,7 +81,7 @@
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="8">资产编号：</nz-col>
-                                <nz-col nzSpan="16">{{server?.inventory?.no || '-'}}</nz-col>
+                                <nz-col nzSpan="16">{{server?.inventory?.inventoryNo || '-'}}</nz-col>
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="8">负责人：</nz-col>

src/main/webapp/app/overAll/modal/switch/switch.component.html

@@ -32,7 +32,7 @@
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">IP地址：</nz-col>
-                    <nz-col nzSpan="16">{{switch?.ip || '-'}}</nz-col>
+                    <nz-col nzSpan="16">{{switch?.host || '-'}}</nz-col>
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">设备类型：</nz-col>
@@ -40,7 +40,7 @@
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">资产编号：</nz-col>
-                    <nz-col nzSpan="16">{{switch?.inventory?.no || '-'}}</nz-col>
+                    <nz-col nzSpan="16">{{switch?.inventory?.inventoryNo || '-'}}</nz-col>
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">负责人：</nz-col>
@@ -53,19 +53,19 @@
             <div class="host-item-content" style="height: 100%;">
                 <nz-row>
                     <nz-col nzSpan="8">CPU利用率(%)：</nz-col>
-                    <nz-col nzSpan="16">{{hostObj.cpu}}</nz-col>
+                    <nz-col nzSpan="16">{{hostObj.cpu || '-'}}</nz-col>
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">Ping延时(ms)：</nz-col>
-                    <nz-col nzSpan="16">{{hostObj.response}}</nz-col>
+                    <nz-col nzSpan="16">{{hostObj.response || '-'}}</nz-col>
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">丢包数：</nz-col>
-                    <nz-col nzSpan="16">{{hostObj.losed}}</nz-col>
+                    <nz-col nzSpan="16">{{hostObj.losed || '-'}}</nz-col>
                 </nz-row>
                 <nz-row>
                     <nz-col nzSpan="8">内存利用率(%)：</nz-col>
-                    <nz-col nzSpan="16">{{hostObj.used}}</nz-col>
+                    <nz-col nzSpan="16">{{hostObj.used || '-'}}</nz-col>
                 </nz-row>
             </div>
         </div>

src/main/webapp/app/overAll/modal/switch/switch.component.ts

@@ -131,7 +131,7 @@ export class SwitchComponent implements OnInit {
         this.overAllSer.responseTime(this.hostId).subscribe(
             (res)=>{
                 if (res.data) {
-                    this.hostObj.response = res.data.response;
+                    this.hostObj.response = res.data.responseTime;
                 } else {
                     this.hostObj.response = 0;
                 }