Merge branch 'dvadmin-liqianglog' of https://gitee.com/liqianglog/django-vue-admin into dvadmin-xt12321

pull/19/head
xt12321 2021-04-24 12:48:10 +08:00
commit d003d194f3
1 changed files with 1 additions and 1 deletions

View File

@ -81,7 +81,7 @@ class MonitorModelViewSet(CustomModelViewSet):
"cpu": {
"total": int(data.get('cpu_num'), 0),
"used": "", # cpu核心 可不传如指cpu当前主频该值可以传
"rate": float(data.get('cpu_sys', 0)),
"rate": float(data.get('cpu_sys', 0)) / 100,
"unit": "核心", # 默认单位 核心
},
"memory": {