From 2ce88f1f120960f0636672bf4d0d2a513269b27b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 23 Jul 2021 15:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/wx-index/voice.vue         |  5 +++++
 .../customer/customize/CustomerList.vue       | 19 +++++--------------
 .../modules/customer/customize/RoleAuth.vue   |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/epmet-oper-web/src/components/wx-index/voice.vue b/epmet-oper-web/src/components/wx-index/voice.vue
index 30a9779..9bfd920 100644
--- a/epmet-oper-web/src/components/wx-index/voice.vue
+++ b/epmet-oper-web/src/components/wx-index/voice.vue
@@ -194,6 +194,11 @@ export default {
   },
   mounted () {
 
+  },
+  beforeRouteEnter (to, from, next) {
+    // todo
+    console("路由来源", to)
+    until.data(to)
   },
   methods: {
 
diff --git a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
index 58215f2..1282f75 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
@@ -59,9 +59,7 @@
               <el-button type="text"
                          size="small"
                          @click="showRoleAuth(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
-              <!-- <el-button type="text"
-                         size="small"
-                         @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限2</el-button> -->
+
               <el-button type="text"
                          size="small"
                          @click="showMost(scope.row.customerId,scope.row.customerName)">高级配置</el-button>
@@ -109,7 +107,7 @@
                        @cancleBack="cancleBack"></category-list>
       </div>
 
-      <el-dialog :visible.sync="funcVisible"
+      <!-- <el-dialog :visible.sync="funcVisible"
                  title="功能列表"
                  :close-on-click-modal="false"
                  :close-on-press-escape="false"
@@ -118,7 +116,7 @@
         <role-list v-if="funcVisible"
                    :customer-id="customerId"
                    :customer-name="customerName" />
-      </el-dialog>
+      </el-dialog> -->
       <div v-show="showType==='startPage'">
         <start-page ref="ref_startPage"
                     :customer-id="customerId"
@@ -135,7 +133,7 @@ import ConfigItem from './ConfigItem'
 import FootbarList from '../../productConfig/footbar/FootbarList'
 import MiniHome from './MiniHome'
 import MostList from './MostList'
-import RoleList from './roleList'
+// import RoleList from './roleList'
 import categoryList from './CategoryList'
 import StartPage from './StartPage'
 import RoleAuth from './RoleAuth'
@@ -163,7 +161,7 @@ export default {
   components: {
     ConfigItem,
     MiniHome,
-    RoleList,
+    // RoleList,
     FootbarList,
     MostList,
     categoryList,
@@ -256,13 +254,6 @@ export default {
         this.$refs['ref_category'].initData(customerId, customerName)
       })
     },
-    // 显示权限配置
-    showLimitConfig (customerId, customerName) {
-      this.customerId = customerId
-      this.customerName = customerName
-      this.funcVisible = !this.funcVisible
-      // this.$message.warning("当前功能还未开发");
-    },
 
     // 显示权限配置
     showRoleAuth (customerId, customerName) {
diff --git a/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue b/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue
index 40f0b3d..a4b5537 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/RoleAuth.vue
@@ -198,6 +198,7 @@ export default {
   data () {
     return {
       activeName: "work",
+      customerName: "",
       loading1: false,
       loading2: false,
       loading3: false,