From 92391b7a0c2361b2f364759525bd8e73b7d83574 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 23 Jul 2021 10:11:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dpie=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9A=84=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/ColumnCustomize.vue | 23 ++++++-----
 src/views/charts/Chart.vue               | 49 +++++++++---------------
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/components/table/ColumnCustomize.vue b/src/components/table/ColumnCustomize.vue
index 5e60983f..567f8966 100644
--- a/src/components/table/ColumnCustomize.vue
+++ b/src/components/table/ColumnCustomize.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pop-custom">
+  <div class="pop-custom" v-ele-click-outside="esc">
     <div class="pop-title">{{$t('overall.select')}}</div>
     <div class="pop-box custom-labels">
       <div style="height: 100%; overflow: auto;">
@@ -19,19 +19,19 @@
       </div>
     </div>
     <div class="custom-bottom-btns">
-      <button v-if="isCancel" :id="tableId+'-element-set-none'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new is-cancel" type="button" @click="batchHandler(false)">
+      <el-button size="mini" v-if="isCancel" :id="tableId+'-element-set-none'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new is-cancel" type="button" @click="batchHandler(false)">
         <span class="top-tool-btn-txt">{{$t('overall.clear')}}</span>
-      </button>
-      <button v-if="!isCancel" :id="tableId+'-element-set-all'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new" type="button" @click="batchHandler(true)">
+      </el-button>
+      <el-button size="mini" v-if="!isCancel" :id="tableId+'-element-set-all'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new" type="button" @click="batchHandler(true)">
         <span class="top-tool-btn-txt">{{$t('overall.all')}}</span>
-      </button>
+      </el-button>
       <div>
-        <button :id="tableId+'-element-set-esc'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new" type="button" @click="esc">
+        <el-button size="mini" :id="tableId+'-element-set-esc'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new" type="button" @click="esc">
           <span class="top-tool-btn-txt">{{$t('overall.esc')}}</span>
-        </button>
-        <button :id="tableId+'-element-set-save'" class="cn-btn cn-btn-size-small-new cn-btn-style-normal-new" type="button" @click="save">
+        </el-button>
+        <el-button size="mini" :id="tableId+'-element-set-save'" class="cn-btn cn-btn-size-small-new cn-btn-style-normal-new" type="button" @click="save">
           <span class="top-tool-btn-txt">{{$t('overall.save')}}</span>
-        </button>
+        </el-button>
       </div>
     </div>
   </div>
@@ -170,3 +170,8 @@ export default {
   display: none;
 }
 </style>
+<style scoped>
+  /deep/ .el-button--mini{
+    padding: 5px 7px;
+  }
+</style>
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index 80a35865..5a77287e 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -530,42 +530,31 @@ export default {
         self.myChart.setOption({
           legend: { selected: { [params.name]: true } }
         })
-        self.chartOption.series[0].data.forEach((d, i) => {
-          // 遍历到当前点击的legend时
-          if (d.name === params.name) {
-            // 如果这个legend是已激活状态，则取消激活，并且查询全部
-            if (self.selectPieChartName === d.name) {
-              self.myChart.dispatchAction({
-                type: 'unselect',
-                seriesIndex: 0,
-                dataIndex: i
-              })
-              self.selectPieChartName = ''
-              self.loadPieTableData()
-            } else { // 否则激活，并且查询当前name的数据
-              self.selectPieChartName = d.name
-              self.myChart.dispatchAction({
-                type: 'select',
-                seriesIndex: 0,
-                dataIndex: i
-              })
-              self.loadPieTableData(params.name)
-            }
-          } else {
-            self.myChart.dispatchAction({
-              type: 'unselect',
-              seriesIndex: 0,
-              dataIndex: i
-            })
-          }
-        })
+        const index = self.chartOption.series[0].data.findIndex(d => d.name === params.name)
+        if (self.selectPieChartName !== params.name) {
+          self.myChart.dispatchAction({
+            type: 'select',
+            seriesIndex: 0,
+            dataIndex: index
+          })
+          self.selectPieChartName = params.name
+          self.loadPieTableData(params.name)
+        } else {
+          self.myChart.dispatchAction({
+            type: 'unselect',
+            seriesIndex: 0,
+            dataIndex: index
+          })
+          self.selectPieChartName = ''
+          self.loadPieTableData(this.allSelectPieChartName)
+        }
       })
       // 饼图色块点击事件
       this.myChart.on('click', function (echartParams) {
         // 若是已选，则点击后取消选择，并查询全部数据
         if (echartParams.name === self.selectPieChartName) {
           self.selectPieChartName = ''
-          self.loadPieTableData()
+          self.loadPieTableData(this.allSelectPieChartName)
         } else { // 否则查询当前name数据
           self.selectPieChartName = echartParams.name
           self.loadPieTableData(echartParams.name)