From 222cc479251c4e68d263e745f63a12162c663121 Mon Sep 17 00:00:00 2001
From: qianbao <qianbaoqianbao>
Date: Mon, 24 Jul 2023 14:04:36 +0800
Subject: [PATCH] 1、饼图添加过程返回自定义颜色

---
 src/mixins/queryform.js                                            |  6 ++++--
 src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue | 33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js
index 7bc044d..43dc103 100644
--- a/src/mixins/queryform.js
+++ b/src/mixins/queryform.js
@@ -153,7 +153,7 @@ export default {
       }
       ananysicData["xAxis"] = axis;
       ananysicData["series"] = series;
-      console.log(ananysicData);
+      // console.log(ananysicData);
       return ananysicData;
     },
     // 柱状图、折线图、柱线图
@@ -262,7 +262,9 @@ export default {
           const value = chartProperties[key];
           if (value === "name") {
             obj["name"] = data[i][key];
-          } else {
+          } else if (value === "color") {
+            obj["color"] = data[i][key];
+          }else {
             obj["value"] = data[i][key];
           }
         }
diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
index 01c2ef9..1f38d7a 100644
--- a/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
+++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
@@ -88,9 +88,9 @@ export default {
       this.setOptionsValue();
       this.setOptionsTooltip();
       this.setOptionsLegend();
-      this.setOptionsColor();
       this.setOptionsData();
       this.setOptionsPiechartStyle();
+      // this.setOptionsColor();
     },
     // 饼图样式
     setOptionsPiechartStyle() {
@@ -194,13 +194,17 @@ export default {
       legend.itemWidth = optionsSetup.legendWidth;
     },
     // 图例颜色修改
-    setOptionsColor() {
-      const optionsSetup = this.optionsSetup;
-      const customColor = optionsSetup.customColor;
-      if (!customColor) return;
-      const arrColor = [];
-      for (let i = 0; i < customColor.length; i++) {
-        arrColor.push(customColor[i].color);
+    setOptionsColor(arrColorData) {
+      let arrColor = [];
+      if(arrColorData!==undefined && arrColorData.length>0){
+        arrColor = arrColorData;
+      }else{
+        const optionsSetup = this.optionsSetup;
+        const customColor = optionsSetup.customColor;
+        if (!customColor) return;
+        for (let i = 0; i < customColor.length; i++) {
+          arrColor.push(customColor[i].color);
+        }
       }
       this.options.color = arrColor;
       this.options = Object.assign({}, this.options);
@@ -232,9 +236,18 @@ export default {
     },
     getEchartData(val) {
       const data = this.queryEchartsData(val);
-      data.then(res => {
+      const arrColorData = [];
+      for (let i = 0; i < data.length; i++) {
+        const res = data[i];
         this.renderingFn(res);
-      });
+        if(this.isNotBlank(res.color)){
+          arrColorData[i]=res.color;
+        }
+      }
+      this.setOptionsColor(arrColorData)
+      // data.then(res => {
+      //   this.renderingFn(res);
+      // });
     },
     renderingFn(val) {
       for (const key in this.options.series) {
--
libgit2 0.22.2