Merge branch 'mater-ztq' into 'master'

Mater ztq



See merge request !1220

@@ -49,7 +49,7 @@
     border-right: 2px solid #d5e5fc;
     border-right: 2px solid #d5e5fc;
 }
 }
 .overview-item-host .host-img img,.overview-item-virtualMachine .virtualMachine-img img{
 .overview-item-host .host-img img,.overview-item-virtualMachine .virtualMachine-img img{
-    height: 100px;
+    height: 60px;
     margin-bottom: 30px;
     margin-bottom: 30px;
 }
 }
 .overview-item-host .host-num,
 .overview-item-host .host-num,
@@ -69,8 +69,8 @@
     flex: 1;
     flex: 1;
 }
 }
 .host-num-item-value,.virtualMachine-num-item-value{
 .host-num-item-value,.virtualMachine-num-item-value{
-    height: 130px;
-    line-height: 130px;
+    height: 90px;
+    line-height: 90px;
     font-size: 28px;
     font-size: 28px;
     font-weight: bold;
     font-weight: bold;
 }
 }
@@ -108,7 +108,7 @@
     padding: 20px 10px;
     padding: 20px 10px;
 }
 }
 .res-ratio .progress{
 .res-ratio .progress{
-    width: 65%;
+    width: 50%;
     margin: 0 10px;
     margin: 0 10px;
     background-color: #eef7fe;
     background-color: #eef7fe;
     overflow: hidden;
     overflow: hidden;
@@ -230,7 +230,7 @@
     width: calc(100% / 3);
     width: calc(100% / 3);
 }
 }
 .td-sql-ratio-box .res-ratio .progress{
 .td-sql-ratio-box .res-ratio .progress{
-    width: 45%;
+    width: 40%;
 }
 }
 
 
 
 

@@ -37,7 +37,7 @@
                             <span>{{cloudList[4].map[cloudList[4].kpiIds].kpiValue==0?'':((cloudList[3].map[cloudList[3].kpiIds].kpiValue/cloudList[4].map[cloudList[4].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                             <span>{{cloudList[4].map[cloudList[4].kpiIds].kpiValue==0?'':((cloudList[3].map[cloudList[3].kpiIds].kpiValue/cloudList[4].map[cloudList[4].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div>已使用：{{cloudList[3].map[cloudList[3].kpiIds].kpiValue}}/总量：{{cloudList[4].map[cloudList[4].kpiIds].kpiValue}}(核)</div>
+                    <div>已使用：{{cloudList[3].map[cloudList[3].kpiIds].kpiValue}}/总量：{{cloudList[4].map[cloudList[4].kpiIds].kpiValue}}({{cloudList[4].map[cloudList[4].kpiIds].kpiUnit}})</div>
                 </div>
                 </div>
                 <div class="res-ratio">
                 <div class="res-ratio">
                     <div>内存</div>
                     <div>内存</div>
@@ -46,7 +46,7 @@
                             <span>{{cloudList[6].map[cloudList[6].kpiIds].kpiValue==0?'':((cloudList[5].map[cloudList[5].kpiIds].kpiValue/cloudList[6].map[cloudList[6].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                             <span>{{cloudList[6].map[cloudList[6].kpiIds].kpiValue==0?'':((cloudList[5].map[cloudList[5].kpiIds].kpiValue/cloudList[6].map[cloudList[6].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div>已使用：{{cloudList[5].map[cloudList[5].kpiIds].kpiValue}}/总量：{{cloudList[6].map[cloudList[6].kpiIds].kpiValue}}(T)</div>
+                    <div>已使用：{{cloudList[5].map[cloudList[5].kpiIds].kpiValue}}/总量：{{cloudList[6].map[cloudList[6].kpiIds].kpiValue}}({{cloudList[6].map[cloudList[6].kpiIds].kpiUnit}})</div>
                 </div>
                 </div>
                 <div class="res-ratio">
                 <div class="res-ratio">
                     <div>磁盘</div>
                     <div>磁盘</div>
@@ -55,7 +55,7 @@
                             <span>{{cloudList[8].map[cloudList[8].kpiIds].kpiValue==0?'':((cloudList[7].map[cloudList[7].kpiIds].kpiValue/cloudList[8].map[cloudList[8].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                             <span>{{cloudList[8].map[cloudList[8].kpiIds].kpiValue==0?'':((cloudList[7].map[cloudList[7].kpiIds].kpiValue/cloudList[8].map[cloudList[8].kpiIds].kpiValue)*100).toFixed(2)+'%'}}</span>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div>已使用：{{cloudList[7].map[cloudList[7].kpiIds].kpiValue}}/总量：{{cloudList[8].map[cloudList[8].kpiIds].kpiValue}}(T)</div>
+                    <div>已使用：{{cloudList[7].map[cloudList[7].kpiIds].kpiValue}}/总量：{{cloudList[8].map[cloudList[8].kpiIds].kpiValue}}({{cloudList[8].map[cloudList[8].kpiIds].kpiUnit}})</div>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>