From 61006f2e608fcf4059ac780a4d84c299d1623449 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 27 Sep 2019 09:44:04 +0800
Subject: [PATCH] =?UTF-8?q?2.2=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E9=98=85=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  4 ++--
 src/main.js                           | 10 +++++-----
 src/views/system/dept/index.vue       |  2 +-
 src/views/system/menu/index.vue       |  2 +-
 src/views/system/permission/index.vue |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 66ccd70..ca15f57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eladmin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "license": "Apache-2.0",
   "description": "eladmin 前端代码",
   "author": "jie <elunez@qq.com>",
@@ -23,7 +23,7 @@
     "codemirror": "^5.38.0",
     "connect": "3.6.6",
     "echarts": "4.1.0",
-    "element-ui": "^2.11.1",
+    "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
diff --git a/src/main.js b/src/main.js
index 44dd629..905dfa8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,17 +15,17 @@ import store from './store'
 
 import '@/icons' // icon
 import './router/index' // permission control
-import Router from 'vue-router'
+// import Router from 'vue-router'
 
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(ElementUI, { locale })
 Vue.config.productionTip = false
 
-const routerPush = Router.prototype.push
-Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(error => error)
-}
+// const routerPush = Router.prototype.push
+// Router.prototype.push = function push(location) {
+//   return routerPush.call(this, location).catch(error => error)
+// }
 require('babel-polyfill')
 
 new Vue({
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 46c4497..56a848b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -23,7 +23,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true" :dicts="dicts"/>
       </div>
     </div>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 88acf1e..fe503a6 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -20,7 +20,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true"/>
       </div>
     </div>
diff --git a/src/views/system/permission/index.vue b/src/views/system/permission/index.vue
index 951b6ee..a898562 100644
--- a/src/views/system/permission/index.vue
+++ b/src/views/system/permission/index.vue
@@ -20,7 +20,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true"/>
       </div>
     </div>