diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index e83afed..bd9790c 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -73,8 +73,9 @@ export const useChartDataFetch = ( clearInterval(fetchInterval) const fetchFn = async () => { - + console.log('看板编辑') const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig)) + if (res) { try { const filter = targetComponent.filter diff --git a/src/utils/request.js b/src/utils/request.js index c26b3cf..521c954 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,7 +14,7 @@ axios.defaults.headers['Content-Type'] = 'multipart/form-data' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - baseURL: '/ai', + baseURL: 'http://baijiahu.mynatapp.cc', // 超时(60秒) timeout: 60000 }) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js new file mode 100644 index 0000000..88cbd24 --- /dev/null +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js @@ -0,0 +1,23 @@ +export const lineAndBar = ` +const obj = { + dimensions: ['product', 'data1'], + source:[] + } + + if(res.type === 'bar' || res.type === 'line'){ + res.data.forEach((item,index) => { + obj.source.push({ + product: res.xData[index] , + data1: item, + }) + }); + }else if(res.type === 'pie'){ + res.data.forEach((item)=>{ + obj.source.push({ + product:item.name, + data1:item.value, + }) + }) + } + +return obj ` 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 2c49952..6c76189 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -1,39 +1,52 @@