From d50ee414ae5d2d7eae72ab930986ff14e4dcf2fd Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 19 Nov 2019 13:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  2 +-
 src/layout/components/Sidebar/SidebarItem.vue | 44 +++++++++----------
 src/layout/components/Sidebar/index.vue       | 26 +++++------
 src/views/display/index.vue                   |  1 -
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/public/index.html b/public/index.html
index c17491a57..956a01818 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,7 @@
 
     <script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script>
     <script src="https://cdn.bootcss.com/vuex/3.1.0/vuex.min.js"></script>
-    <script src="https://cdn.bootcss.com/vue-router/3.0.6/vue-router.min.js"></script>
+    <script src="https://cdn.bootcss.com/vue-router/3.1.2/vue-router.min.js"></script>
     <script src="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
 
     <script src="https://cdn.bootcss.com/element-ui/2.7.2/index.js"></script>
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index f7714e1cf..08cd9c9fd 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -38,27 +38,27 @@
 
 <script>
 export default {
-	name: 'SidebarItem',
-	props: {
-		routes: {
-			type: Array,
-			required: true
-		},
-		isNest: {
-			type: Boolean,
-			default: false
-		}
-	},
-	methods: {
-		hasOneShowingChildren(children) {
-			const showingChildren = children.filter(item => {
-				return !item.hidden;
-			});
-			if (showingChildren.length === 1) {
-				return true;
-			}
-			return false;
-		}
-	}
+    name: 'SidebarItem',
+    props: {
+        routes: {
+            type: Array,
+            required: true
+        },
+        isNest: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        hasOneShowingChildren(children) {
+            const showingChildren = children.filter(item => {
+                return !item.hidden;
+            });
+            if (showingChildren.length === 1) {
+                return true;
+            }
+            return false;
+        }
+    }
 };
 </script>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index d2c0b8de4..7441341a4 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -19,18 +19,18 @@ import { mapGetters } from 'vuex';
 import SidebarItem from './SidebarItem';
 
 export default {
-	components: { SidebarItem },
-	computed: {
-		...mapGetters([
-			'sidebar',
-			'routers'
-		]),
-		routes() {
-			return this.$router.options.routes;
-		},
-		isCollapse() {
-			return !this.sidebar.opened;
-		}
-	}
+    components: { SidebarItem },
+    computed: {
+        ...mapGetters([
+            'sidebar',
+            'routers'
+        ]),
+        routes() {
+            return this.$router.options.routes;
+        },
+        isCollapse() {
+            return !this.sidebar.opened;
+        }
+    }
 };
 </script>
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index ddfacfb3a..d44e25291 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -234,7 +234,6 @@ export default {
 
         await this.setWindowSize();
         await this.initLoadData();
-        console.log(history);
     },
     async beforeDestroy() {
         await this.clearAllTimer();