Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/workbench/fwgl/fwglList.vue

@@ -40,7 +40,7 @@
               </p>
               <p class="dashboard_info">
                 <span>剩余量</span>
-                <span v-text="item.value + item.unit"></span>
+                <span v-text="item.total - item.value + item.unit"></span>
               </p>
             </div>
           </div>
@@ -67,7 +67,7 @@
                 </p>
                 <p class="dashboard_info">
                   <span>剩余量</span>
-                  <span v-text="item.value + item.unit"></span>
+                  <span v-text="item.total - item.value + item.unit"></span>
                 </p>
               </div>
             </div>
@@ -1515,7 +1515,9 @@ export default {
       this.init(this.tempFliter);
     }, // 云资源分配成功
     getDashboardOption(item) {
-      let percent = Math.round((item.value / item.total) * 100) || 0;
+      let percent = parseFloat(
+        ((item.value / item.total) * 100 || 0).toFixed(1)
+      );
       let colors = [];
 
       if (this.level == 2) {
@@ -1791,6 +1793,7 @@ export default {
 }
 .dashboard_info > span:nth-of-type(2) {
   color: #0d1847;
+  margin-left: 10px;
 }
 .admin_preview {
   display: flex;

src/pages/workbench/fwgl/organizationCloudResource.vue

@@ -42,7 +42,7 @@
             </p>
             <p class="dashboard_info">
               <span>剩余量</span>
-              <span v-text="item.value + item.unit"></span>
+              <span v-text="item.total - item.value + item.unit"></span>
             </p>
           </div>
         </div>
@@ -162,7 +162,9 @@ export default {
         });
     },
     getDashboardOption(item) {
-      let percent = Math.round((item.value / item.total) * 100) || 0;
+      let percent = parseFloat(
+        ((item.value / item.total) * 100 || 0).toFixed(1)
+      );
       let colors = ["#515fe7", "#e7ecfd"];
 
       if (percent >= 80) {