diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 0bf6400..ffd4d1c 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -26,17 +26,15 @@
class="filter-item"
type="warning"
icon="el-icon-refresh"
- @click="refresh">刷新
+ @click="refresh">刷新
+
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ formatMem(scope.row) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatDisk(scope.row) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatSwap(scope.row) }}
+
+
+
+
+
+
+
+
@@ -107,7 +141,7 @@ export default {
checkPermission,
beforeInit() {
this.url = 'api/server'
- const sort = 'id,desc'
+ const sort = 'sort,asc'
this.params = { page: this.page, size: this.size, sort: sort }
const query = this.query
const type = query.type
@@ -163,26 +197,40 @@ export default {
refresh() {
this.init()
},
- percentNumber(row, column) {
- let num = row.cpuRate
- if (!num) {
- return '-'
+ formatCpuRate(row, column) {
+ const value = row.cpuRate
+ if (!value) {
+ return 0
}
- num = num * 100 + ''
- if (num.length > 5) {
- num = num.substring(0, 5)
+ return (Math.floor(value * 10000) / 100) + '%'
+ },
+ percentNumber(value, total) {
+ if (!value || !total) {
+ return 0
+ }
+ return value / total * 100
+ },
+ percentStatus(value, total) {
+ const percent = this.percentNumber(value, total)
+ if (percent < 60) {
+ return 'success'
+ } else if (percent < 90) {
+ return 'warning'
+ } else {
+ return 'exception'
}
- return num + '%'
},
convertToGb(num) {
if (!num) {
return '-'
}
- num = num + ''
- if (num.length > 5) {
- num = num.substring(0, 5)
+ let unit = 'G'
+ if (num > 1024) {
+ num = num / 1024
+ unit = 'T'
}
- return num + 'GB'
+ num = Math.floor(num * 100) / 100
+ return num + unit
},
formatMem(row, column) {
return this.convertToGb(row.memUsed) + ' / ' + this.convertToGb(row.memTotal)
@@ -198,5 +246,7 @@ export default {