From 671ad6d848a776f2e3924dd385e4fcd3cebfd3a0 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Thu, 16 Nov 2023 11:00:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=9B=BE=E8=A1=A8=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/G2Plots/进度图/圆角进度条.js | 2 +-
 data-room-ui/packages/G2Plots/进度图/水波图.js       | 2 +-
 data-room-ui/packages/G2Plots/进度图/钻石水波图.js | 2 ++
 data-room-ui/packages/js/api/bigScreenApi.js               | 4 +++-
 data-room-ui/packages/js/mixins/commonMixins.js            | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
index ca816fa4..77c2a791 100644
--- a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
+++ b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
@@ -90,7 +90,7 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 // 图表配置 new Gauge('domName', option)
 const option = {
   // 数据将要放入到哪个字段中
-  dataKey: 'data',
+  dataKey: 'percent',
   // 图表内边距
   appendPadding: [0, 0, 0, 0],
   data,
diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js
index 520454df..c3f9f812 100644
--- a/data-room-ui/packages/G2Plots/进度图/水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/水波图.js
@@ -176,7 +176,7 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 // 图表配置 new Liquid('domName', option)
 const option = {
   // 数据将要放入到哪个字段中
-  dataKey: 'data',
+  dataKey: 'percent',
   // 图表内边距
   appendPadding: [0, 0, 0, 0],
   data,
diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
index c016224b..69fe9e4b 100644
--- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
@@ -173,6 +173,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce
 
 // 图表配置 new Liquid('domName', option)
 const option = {
+  // 数据将要放入到哪个字段中
+  dataKey: 'percent',
   renderer: 'canvas',
   // 图表内边距
   appendPadding: [0, 0, 0, 0],
diff --git a/data-room-ui/packages/js/api/bigScreenApi.js b/data-room-ui/packages/js/api/bigScreenApi.js
index 789898ef..caa595f3 100644
--- a/data-room-ui/packages/js/api/bigScreenApi.js
+++ b/data-room-ui/packages/js/api/bigScreenApi.js
@@ -9,7 +9,9 @@ export function saveScreen(data) {
   data.chartList.forEach((item) => {
     if (item.type == 'customComponent') {
       const a = JSON.parse(item.option)
-      a[a.dataKey] = []
+      if (a.data) {
+        a.data = []
+      }
       item.option=JSON.stringify(a)
       item.setting=item.setting.map((x) => {
         const {field,value,...obj}=x
diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js
index dcfe11ab..d65e5d4c 100644
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@@ -258,7 +258,7 @@ export default {
           config = this.dataFormatting(config, _res)
           if (this.chart) {
             // 单指标组件和多指标组件的changeData传参不同
-            if (['Liquid', 'Gauge', 'RingProgress'].includes(config.chartType)) {
+            if (['Liquid', 'Gauge', 'RingProgress', 'Progress'].includes(config.chartType)) {
               this.chart.changeData(config.option.percent)
             } else {
               this.chart.changeData(config.option.data)