Commit 0c08b7e8 authored by 张俊's avatar 张俊

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

parents 8508dba8 892eaf39
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</p> </p>
<p class="dashboard_info"> <p class="dashboard_info">
<span>剩余量</span> <span>剩余量</span>
<span v-text="item.value + item.unit"></span> <span v-text="item.total - item.value + item.unit"></span>
</p> </p>
</div> </div>
</div> </div>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</p> </p>
<p class="dashboard_info"> <p class="dashboard_info">
<span>剩余量</span> <span>剩余量</span>
<span v-text="item.value + item.unit"></span> <span v-text="item.total - item.value + item.unit"></span>
</p> </p>
</div> </div>
</div> </div>
...@@ -1515,7 +1515,9 @@ export default { ...@@ -1515,7 +1515,9 @@ export default {
this.init(this.tempFliter); this.init(this.tempFliter);
}, // 云资源分配成功 }, // 云资源分配成功
getDashboardOption(item) { 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 = []; let colors = [];
if (this.level == 2) { if (this.level == 2) {
...@@ -1791,6 +1793,7 @@ export default { ...@@ -1791,6 +1793,7 @@ export default {
} }
.dashboard_info > span:nth-of-type(2) { .dashboard_info > span:nth-of-type(2) {
color: #0d1847; color: #0d1847;
margin-left: 10px;
} }
.admin_preview { .admin_preview {
display: flex; display: flex;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</p> </p>
<p class="dashboard_info"> <p class="dashboard_info">
<span>剩余量</span> <span>剩余量</span>
<span v-text="item.value + item.unit"></span> <span v-text="item.total - item.value + item.unit"></span>
</p> </p>
</div> </div>
</div> </div>
...@@ -162,7 +162,9 @@ export default { ...@@ -162,7 +162,9 @@ export default {
}); });
}, },
getDashboardOption(item) { 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"]; let colors = ["#515fe7", "#e7ecfd"];
if (percent >= 80) { if (percent >= 80) {
......
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