From b0aade5fa2acfea1be402ed9668110a3b16bf1ad Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Fri, 16 Aug 2019 18:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/echarts/permission.vue     | 17 ++++++++++-------
 .../map/mapdraft/mapedit/mapoperate/index.vue  | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/echarts/permission.vue b/src/views/dashboard/echarts/permission.vue
index df8f579c2..e53041f8f 100644
--- a/src/views/dashboard/echarts/permission.vue
+++ b/src/views/dashboard/echarts/permission.vue
@@ -124,13 +124,16 @@ export default {
 		async loadExamData(mapName) {
 			if (mapName) {
 				var data = {};
-				var list = this.permissionList.filter(elem => { return elem.mapName == mapName; });
-				list.forEach(elem => {
-					if (!data[elem.mapProductName]) {
-						data[elem.mapProductName] = elem.remains;
-					} else {
-						data[elem.mapProductName] += elem.remains;
-					}
+				var permissionType = {};
+				var list = await this.$Dictionary.permissionType();
+				if (list) {
+					(list ||[]).forEach(elem => {
+						permissionType[elem.code] = elem.name;
+					});
+				}
+
+				(this.permissionList.filter(elem => { return elem.mapName == mapName; })|| []).forEach(elem => {
+					data[`${elem.mapProductName}-${permissionType[elem.type]}`] = elem.remains;
 				});
 
 				const keys = Object.keys(data);
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
index 9ac86107f..2ffdf91ac 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
@@ -1,7 +1,7 @@
 <template>
   <transition name="el-zoom-in-center">
     <div class="map-control">
-      <el-card>
+      <el-card type="border-card">
         <div slot="header" class="clearfix">
           <span>
             {{ $t('map.mapName') }}
@@ -397,9 +397,21 @@ export default {
         margin: 10px 5px;
     }
 
-    /deep/ {
-        .view-control {
+    /deep/ .view-control {
             overflow-y: auto;
         }
+
+    /deep/ {
+      .el-tabs__nav-wrap.is-scrollable  {
+        padding: 0 40px;
+      }
+
+      .el-tabs__nav-prev {
+        left: 15px;
+      }
+
+      .el-tabs__nav-next {
+        right: 15px;
+      }
     }
 </style>