From 4b7b18e5ebfb69844a2d5cebab197c4ce686fc20 Mon Sep 17 00:00:00 2001 From: huanghao1412 Date: Wed, 6 Mar 2024 17:19:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/fileTypeEnum.ts | 3 + .../Informations/Mores/Video/config.ts | 2 +- .../Informations/Mores/Video/config.vue | 93 ++++++++++++++++--- src/settings/designSetting.ts | 3 + .../components/CanvasPage/index.vue | 1 - 5 files changed, 87 insertions(+), 15 deletions(-) diff --git a/src/enums/fileTypeEnum.ts b/src/enums/fileTypeEnum.ts index bbc50db4..eb0e8c34 100644 --- a/src/enums/fileTypeEnum.ts +++ b/src/enums/fileTypeEnum.ts @@ -7,4 +7,7 @@ export enum FileTypeEnum { PNG = 'image/png', JPEG = 'image/jpeg', GIF = 'image/gif', + // 视频 + MP4 = 'video/mp4', + WEBM = 'video/webm', } diff --git a/src/packages/components/Informations/Mores/Video/config.ts b/src/packages/components/Informations/Mores/Video/config.ts index 78059f09..006000fd 100644 --- a/src/packages/components/Informations/Mores/Video/config.ts +++ b/src/packages/components/Informations/Mores/Video/config.ts @@ -6,7 +6,7 @@ import video from '@/assets/videos/earth.mp4' export const option = { // 视频路径 - dataset: 'https://goviewpro.tos-cn-beijing.volces.com/charts-img-db/charts-img-db_id_17bwi76fzta800.mp4', + dataset: '', datasetCustom: '', // 视频列表 datasetList: [], diff --git a/src/packages/components/Informations/Mores/Video/config.vue b/src/packages/components/Informations/Mores/Video/config.vue index b3af2581..5501f31c 100644 --- a/src/packages/components/Informations/Mores/Video/config.vue +++ b/src/packages/components/Informations/Mores/Video/config.vue @@ -2,6 +2,18 @@ diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index 87ed6fd3..aa5bbb10 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -52,6 +52,9 @@ export const carouselInterval = 4000 // 工作台大屏背景图片大小限制(5M) export const backgroundImageSize = 5 +// 工作台视频组件大小限制(500M) +export const videoSize = 500 + // 预览展示方式 export const previewScaleType = PreviewScaleEnum.SCROLL_Y diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue index 1328c8fc..ddaf18d8 100644 --- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue +++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue @@ -270,7 +270,6 @@ const clearColor = () => { // 自定义上传操作 const customRequest = (options: UploadCustomRequestOptions) => { const { file } = options - console.log(file) nextTick(async () => { if (file.file) { // 修改名称