From 9c12d17f7a646e36eaf725b53d72135e7ccb33ee Mon Sep 17 00:00:00 2001
From: Admin <12544914+hangzhou-zhide-software_0@user.noreply.gitee.com>
Date: Fri, 2 Jun 2023 06:20:41 +0000
Subject: [PATCH] =?UTF-8?q?update=20src/packages/components/Charts/Mores/P?=
 =?UTF-8?q?rocess/index.vue.=20=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E4=B8=80=E7=9B=B4=E6=98=AF=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Admin <12544914+hangzhou-zhide-software_0@user.noreply.gitee.com>
---
 .../components/Charts/Mores/Process/index.vue | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/packages/components/Charts/Mores/Process/index.vue b/src/packages/components/Charts/Mores/Process/index.vue
index 5faf79bf..31ea0946 100644
--- a/src/packages/components/Charts/Mores/Process/index.vue
+++ b/src/packages/components/Charts/Mores/Process/index.vue
@@ -8,6 +8,8 @@
     :color="color"
     :rail-color="railColor"
     :offset-degree="offsetDegree"
+    :show-indicator="showindicator"
+    :border-radius="borderradius"
   >
     <n-text
       :style="{
@@ -25,7 +27,7 @@ import { PropType, toRefs, watch, shallowReactive } from 'vue'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import config, { option as configOption } from './config'
-import { toNumber } from '@/utils'
+import { isPreview, isString, isNumber, colorGradientCustomMerge } from '@/utils'
 
 const props = defineProps({
   chartConfig: {
@@ -33,7 +35,12 @@ const props = defineProps({
     required: true
   }
 })
+// 数据处理
+const dataHandle = (newData: number | string) => {
 
+newData = isString(newData) ? parseFloat(newData) : newData
+return parseFloat(newData.toFixed(2))
+}
 // 取配置数据
 const { w, h } = toRefs(props.chartConfig.attr)
 const {
@@ -46,19 +53,21 @@ const {
   indicatorPlacement,
   indicatorTextSize,
   offsetDegree,
-  dataset
+  dataset,
+  showindicator,
+  borderradius
 } = toRefs(props.chartConfig.option)
-
 const option = shallowReactive({
-  dataset: configOption.dataset
+  dataset: props.chartConfig.option.dataset
 })
 
+
 // 手动更新
 watch(
   () => props.chartConfig.option.dataset,
   (newData: any) => {
     try {
-      option.dataset = toNumber(newData, 2)
+      option.dataset = dataHandle(newData)
     } catch (error) {
       console.log(error)
     }
@@ -69,6 +78,7 @@ watch(
 )
 // 预览更新
 useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
-  option.dataset = toNumber(newData, 2)
+
+  option.dataset =dataHandle(newData)
 })
 </script>