Merge branch 'master' into deploy

2020-11-16 19:27:10 +08:00
parent 4e5520ba25 9888efd061
commit 5efa89e2e4
1 changed files with 1 additions and 1 deletions
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -242,7 +242,7 @@ export default {
        }
        this.cpuInfo.xAxis.data.push(data.time)
        this.memoryInfo.xAxis.data.push(data.time)
-        this.cpuInfo.series[0].data.push(parseFloat(data.memory.used))
+        this.cpuInfo.series[0].data.push(parseFloat(data.cpu.used))
        this.memoryInfo.series[0].data.push(parseFloat(data.memory.usageRate))
      })
    }