From d3bb8da0559777499d41d71498a7e2ede8bc612a Mon Sep 17 00:00:00 2001
From: xt12321 <1499410095@qq.com>
Date: Tue, 27 Apr 2021 22:42:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96(?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9B=91=E6=8E=A7):=20=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-ui/src/views/vadmin/monitor/server/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue
index 5e375c1..f9976a2 100755
--- a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue
+++ b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue
@@ -327,7 +327,7 @@ export default {
         cancelButtonText: '放弃'
       }).then(() => {
         cleanMonitorLog().then(results => {
-          this.msgSuccess( '清除记录成功！')
+          this.msgSuccess('清除记录成功！')
         }).catch(error => {
           this.$message.warning(error.msg || '清除记录失败，请重试！')
         })
@@ -405,12 +405,16 @@ export default {
 }
 
 .server-monitor-top {
-  padding: 0 10px;
+  padding: 10px 10px;
   text-align: justify-all;
+  overflow-x: scroll;
+  display: flex;
 }
 
 .server-monitor-bottom {
   text-align: left;
+  overflow-x: scroll;
+  display: flex;
 }
 
 .server-information {
@@ -489,6 +493,7 @@ export default {
   min-width: 500px;
   margin: 10px;
   display: inline-block;
+  overflow-x: scroll;
 }
 
 </style>

From d2f0a71e7bca8100f5aa2bb1ce87f68d189dec1c Mon Sep 17 00:00:00 2001
From: xt12321 <1499410095@qq.com>
Date: Tue, 27 Apr 2021 23:30:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG(permission):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=B4=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=9B=91=E6=8E=A7=E8=B7=AF=E7=94=B1=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-ui/src/store/modules/permission.js | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/dvadmin-ui/src/store/modules/permission.js b/dvadmin-ui/src/store/modules/permission.js
index 3be95be..4a34bef 100755
--- a/dvadmin-ui/src/store/modules/permission.js
+++ b/dvadmin-ui/src/store/modules/permission.js
@@ -3,6 +3,7 @@ import { getRouters } from '@/api/vadmin/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
 import { handleTree } from "@/utils/ruoyi";
+import de from 'element-ui/src/locale/lang/de'
 const permission = {
   state: {
     routes: [],
@@ -24,28 +25,11 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {
-          let tempData =  handleTree(res.data, "id");
-          tempData[2].children.push({
-            component: "vadmin/monitor/server/index",
-            hidden: false,
-            id: 97,
-            meta: {title: "服务监控", icon: "server", noCache: false},
-            name: "server",
-            orderNum: 3,
-            parentId: 66,
-            path: "server",
-            redirect: "server"
-          })
-          const data = tempData
-
-
-          // console.log("handleTree:", data)
+          const data =  handleTree(res.data, "id");
           const sdata = JSON.parse(JSON.stringify(data))
           const rdata = JSON.parse(JSON.stringify(data))
           const sidebarRoutes = filterAsyncRouter(sdata)
-          // console.log(sidebarRoutes)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-          // console.log(rewriteRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', sidebarRoutes)