diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue index db53971d..8964c093 100644 --- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue +++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue @@ -130,9 +130,11 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d' import { StylesSetting } from '@/components/Pages/ChartItemSetting' import { UploadCustomRequestOptions } from 'naive-ui' -import { fileToUrl, loadAsyncComponent } from '@/utils' +import { fileToUrl, loadAsyncComponent, fetchRouteParamsLocation } from '@/utils' import { PreviewScaleEnum } from '@/enums/styleEnum' +import { ResultEnum } from '@/enums/httpEnum' import { icon } from '@/plugins' +import { uploadFile} from '@/api/path/project' const { ColorPaletteIcon } = icon.ionicons5 const { ZAxisIcon, ScaleIcon, FitToScreenIcon, FitToHeightIcon, FitToWidthIcon } = icon.carbon @@ -270,17 +272,30 @@ const switchSelectColorHandle = () => { // 自定义上传操作 const customRequest = (options: UploadCustomRequestOptions) => { const { file } = options - nextTick(() => { + nextTick(async () => { if (file.file) { - const ImageUrl = fileToUrl(file.file) - chartEditStore.setEditCanvasConfig( - EditCanvasConfigEnum.BACKGROUND_IAMGE, - ImageUrl - ) - chartEditStore.setEditCanvasConfig( - EditCanvasConfigEnum.SELECT_COLOR, - false + // 修改名称 + const newNameFile = new File( + [file.file], + `${fetchRouteParamsLocation()}_index_background.png`, + { type: file.file.type } ) + let uploadParams = new FormData() + uploadParams.append('object', newNameFile) + const uploadRes:any = await uploadFile(uploadParams) + + if(uploadRes.code === ResultEnum.SUCCESS) { + chartEditStore.setEditCanvasConfig( + EditCanvasConfigEnum.BACKGROUND_IAMGE, + uploadRes.data.objectContent.httpRequest.uri + ) + chartEditStore.setEditCanvasConfig( + EditCanvasConfigEnum.SELECT_COLOR, + false + ) + return + } + window['$message'].error('添加图片失败,请稍后重试!') } else { window['$message'].error('添加图片失败,请稍后重试!') } diff --git a/src/views/chart/ContentEdit/components/EditDataSync/index.vue b/src/views/chart/ContentEdit/components/EditDataSync/index.vue index 39043d04..7a2a8f84 100644 --- a/src/views/chart/ContentEdit/components/EditDataSync/index.vue +++ b/src/views/chart/ContentEdit/components/EditDataSync/index.vue @@ -10,7 +10,7 @@