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

src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.html

@@ -47,8 +47,8 @@
                   <tr *ngFor="let data of nowStatus">
                     <td>{{data.no}}</td>
                     <td>{{data.name}}</td>
-                    <td>{{data.download}}{{data.download_units}}</td>
-                    <td>{{data.response}}{{data.response_units}}</td>
+                    <td>{{data.download}}</td>
+                    <td>{{data.response}}</td>
                     <td>{{data.response_code}}</td>
                     <td></td>
                   </tr>
@@ -56,7 +56,7 @@
                     <td></td>
                     <td>总计</td>
                     <td></td>
-                    <td>{{totalNum.toFixed(4)}}s</td>
+                    <td>{{totalNum}}</td>
                     <td></td>
                     <td></td>
                   </tr>
@@ -125,9 +125,9 @@
                 <div nz-col [nzSpan]="6" >
                       <div #chartSpeedLeft class="chart-left" *ngFor="let item of speed,let i  = index;">
                         <p class="tag-form"> <nz-tag [nzColor]="colorArr[i]"></nz-tag> <span>{{item.name}}</span> </p>
-                        <p>平均值   {{item.average.toFixed(4)}}</p>
-                        <p>最大值   {{item.max.toFixed(4)}}</p>
-                        <p>最小值   {{item.min.toFixed(4)}}</p>
+                        <p>平均值   {{item.average}}</p>
+                        <p>最大值   {{item.max}}</p>
+                        <p>最小值   {{item.min}}</p>
                       </div>
                 </div>
                 <div nz-col [nzSpan]="18">
@@ -138,9 +138,9 @@
                 <div nz-col [nzSpan]="6" >
                     <div #chartTimeLeft class="chart-left" *ngFor="let item of time,let i  = index;">
                       <p class="tag-form"> <nz-tag [nzColor]="colorArr[i]"></nz-tag> <span>{{item.name}}</span> </p>
-                      <p>平均值   {{(item.average).toFixed(4)}}</p>
-                      <p>最大值   {{(item.max).toFixed(4)}}</p>
-                      <p>最小值   {{(item.min).toFixed(4)}}</p>
+                      <p>平均值   {{(item.average)}}</p>
+                      <p>最大值   {{(item.max)}}</p>
+                      <p>最小值   {{(item.min)}}</p>
                     </div>
                 </div>
                 <div nz-col [nzSpan]="18">

src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.ts

@@ -95,10 +95,8 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
         this.overAllSer.findCurrentState(this.httptestid).subscribe(
             (res) => {
                 if (res.errCode == 10000) {
-                    this.nowStatus = res.data;
-                    this.nowStatus.forEach(e => {
-                        this.totalNum += e.response;
-                    });
+                    this.nowStatus = res.data.data;
+                    this.totalNum = res.data.total;
                 }
             }
         );