diff --git a/src/api/axios.ts b/src/api/axios.ts index 75e3d07..ce2538d 100644 --- a/src/api/axios.ts +++ b/src/api/axios.ts @@ -12,6 +12,7 @@ import { refreshToken, isRefreshRequest } from '@/api/refresh.js' export interface MyResponseType { code: ResultEnum data: T + type:string message: string } diff --git a/src/packages/components/Charts/Mores/index.ts b/src/packages/components/Charts/Mores/index.ts index 21ca927..abccf5d 100644 --- a/src/packages/components/Charts/Mores/index.ts +++ b/src/packages/components/Charts/Mores/index.ts @@ -17,5 +17,5 @@ export default [ // TreeMapConfig, // GraphConfig, // SankeyConfig, - DialConfig + // DialConfig ] diff --git a/src/packages/components/Photos/index.ts b/src/packages/components/Photos/index.ts index 1bc6f70..365c9dc 100644 --- a/src/packages/components/Photos/index.ts +++ b/src/packages/components/Photos/index.ts @@ -1,4 +1,4 @@ import Private from './Private' import Share from './Share' -export const PhotoList = [...Private, ...Share] +export const PhotoList = [...Private, ]//...Share diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index f10d5b4..fa5a82b 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -208,7 +208,7 @@ export type PackagesType = { // [PackagesCategoryEnum.VCHART]: ConfigType[] [PackagesCategoryEnum.INFORMATIONS]: ConfigType[] [PackagesCategoryEnum.TABLES]: ConfigType[] - // [PackagesCategoryEnum.PHOTOS]: ConfigType[] + [PackagesCategoryEnum.PHOTOS]: ConfigType[] // [PackagesCategoryEnum.ICONS]: ConfigType[] [PackagesCategoryEnum.DECORATES]: ConfigType[] } diff --git a/src/packages/index.ts b/src/packages/index.ts index 2dbde31..1b6b594 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -24,7 +24,7 @@ export let packagesList: PackagesType = { [PackagesCategoryEnum.INFORMATIONS]: InformationList, [PackagesCategoryEnum.TABLES]: TableList, [PackagesCategoryEnum.DECORATES]: DecorateList, - // [PackagesCategoryEnum.PHOTOS]: PhotoList, + [PackagesCategoryEnum.PHOTOS]: PhotoList, // [PackagesCategoryEnum.ICONS]: IconList } diff --git a/src/views/AI/components/aiChart/index.vue b/src/views/AI/components/aiChart/index.vue index f0cc984..5029181 100644 --- a/src/views/AI/components/aiChart/index.vue +++ b/src/views/AI/components/aiChart/index.vue @@ -105,7 +105,7 @@ let isloading = ref(false) let infoId = ref(null) let stopWatch = null let isWatching = ref(false) -let showModal = ref(true) +let showModal = ref(false) let messageList = ref([]) //聊天记录最后一个索引 let lastIndex = ref(0) diff --git a/src/views/AI/index.vue b/src/views/AI/index.vue index b457db2..ce49f6b 100644 --- a/src/views/AI/index.vue +++ b/src/views/AI/index.vue @@ -45,22 +45,17 @@ diff --git a/src/views/AI/myBoard/index.vue b/src/views/AI/myBoard/index.vue index e1d7eb9..758ccc5 100644 --- a/src/views/AI/myBoard/index.vue +++ b/src/views/AI/myBoard/index.vue @@ -101,7 +101,7 @@ const previewHandle = cardData => { openNewWindow(previewPath(cardData.id)) } onMounted(() => { - // fetchList() + fetchList() }) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js index 711c10d..832bee9 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/handlerFormat.js @@ -1,22 +1,61 @@ -export const lineAndBar = ` -const obj = { - dimensions: ['product', 'data1'], - source:[] - } - if(res.type === 'bar' || res.type === 'line'){ - res.data.forEach((item,index) => { +// 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 ` + +const lineAndBar = ` + const obj = { + dimensions: ['product', '数据'], + source:[] + } + res.data.forEach((item,index) => { obj.source.push({ product: res.xData[index] , - data1: item, + 数据: item, }) }); - }else if(res.type === 'pie'){ - res.data.forEach((item)=>{ - obj.source.push({ - product:item.name, - data1:item.value, - }) - }) - } + return obj` + + const pie = ` + const obj = { + dimensions: ['product', '数据'], + source:[] + } + res.data.forEach((item)=>{ + obj.source.push({ + product:item.name, + 数据:item.value, + }) + }) + return obj + ` + +const filterData = { + LineCommon: lineAndBar, + LineLinearSingle: lineAndBar, + BarCommon:lineAndBar, + BarCrossrange:lineAndBar, + PieCommon:pie, + PieCircle:'return res.data', + Dial:'return res.data' +} -return obj ` +export { filterData } 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 1a4e508..17b3ae1 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -45,7 +45,7 @@