From e2bc51c7d603532bfbdb2c41556d61db39e2a0ec Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Mon, 16 Nov 2020 18:29:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?=
 =?UTF-8?q?)=EF=BC=9A=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=8F=9C=E5=8D=95Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 5679094..559c49c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -240,7 +240,10 @@ export default {
           }
         } else {
           for (let i = 0; i < childIds.length; i++) {
-            this.menuIds.push(childIds[i])
+            const index = this.menuIds.indexOf(childIds[i])
+            if (index === -1) {
+              this.menuIds.push(childIds[i])
+            }
           }
         }
         this.$refs.menu.setCheckedKeys(this.menuIds)

From 9888efd06117748050a81a7cf50eb7fe275ed1aa Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Mon, 16 Nov 2020 19:25:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?=
 =?UTF-8?q?)=EF=BC=9A=E6=9C=8D=E5=8A=A1=E7=9B=91=E6=8E=A7Cpu=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=8E=87Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/server/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 4dac1d9..749ab1e 100644
--- 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))
       })
     }