diff --git a/src/api/mock/index.ts b/src/api/mock/index.ts index f387a4de..a2474a61 100644 --- a/src/api/mock/index.ts +++ b/src/api/mock/index.ts @@ -5,6 +5,7 @@ import { RequestHttpEnum } from '@/enums/httpEnum' // 单个X数据 export const chartDataUrl = '/mock/chartData' export const rankListUrl = '/mock/RankList' +export const numberUrl = '/mock/number' const mockObject: MockMethod[] = [ { @@ -19,6 +20,11 @@ const mockObject: MockMethod[] = [ method: RequestHttpEnum.GET, response: () => test.fetchRankList, }, + { + url: '/mock/number', + method: RequestHttpEnum.GET, + response: () => test.fetchNumber, + }, ] export default mockObject diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts index 0a57dc55..0fc97df5 100644 --- a/src/api/mock/test.mock.ts +++ b/src/api/mock/test.mock.ts @@ -59,4 +59,10 @@ export default { { name: '@name', 'value|100-900': 5 }, ], }, + // 获取数字 + fetchNumber: { + status: 200, + msg: '请求成功', + data: '@float(0, 0.99)', + }, } diff --git a/src/packages/components/Charts/Mores/WaterPolo/config.ts b/src/packages/components/Charts/Mores/WaterPolo/config.ts index 8c786b0b..e671ed00 100644 --- a/src/packages/components/Charts/Mores/WaterPolo/config.ts +++ b/src/packages/components/Charts/Mores/WaterPolo/config.ts @@ -50,11 +50,11 @@ export const option = { borderDistance: 10, itemStyle: { borderWidth: 2, - borderColor: '#112165', - }, - }, - }, - ], + borderColor: '#112165' + } + } + } + ] } export default class Config extends publicConfig implements CreateComponentType diff --git a/src/packages/components/Charts/Mores/WaterPolo/index.vue b/src/packages/components/Charts/Mores/WaterPolo/index.vue index 1e91911d..758eb6d7 100644 --- a/src/packages/components/Charts/Mores/WaterPolo/index.vue +++ b/src/packages/components/Charts/Mores/WaterPolo/index.vue @@ -68,22 +68,18 @@ watch( } ) -const updateDataset = (newData: number) => { - props.chartConfig.option.series[0].data = [newData] +const updateDataset = (newData: string | number) => { + props.chartConfig.option.series[0].data = [parseFloat(`${newData}`).toFixed(2)] option.options = props.chartConfig.option } -updateDataset(0.5) - watch( - () => props.chartConfig.option.value, + () => props.chartConfig.option.dataset, newData => updateDataset(newData), { - deep: true, + immediate: true, } ) -const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => { - updateDataset(newData) -}) +const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue index 41b21075..60454dfd 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -28,6 +28,9 @@
  • 【表格】{{ rankListUrl }}
  • +
  • + 【0~1数字】{{ numberUrl }} +
  • @@ -65,7 +68,7 @@ import { ref, toRefs } from 'vue' import { icon } from '@/plugins' import { SettingItemBox } from '@/components/Pages/ChartItemSetting' import { RequestHttpEnum } from '@/enums/httpEnum' -import { chartDataUrl, rankListUrl } from '@/api/mock' +import { chartDataUrl, rankListUrl, numberUrl } from '@/api/mock' import { http } from '@/api/http' import { SelectHttpType } from '../../index.d' import { ChartDataMatchingAndShow } from '../ChartDataMatchingAndShow'