From 9d144af68a2f4279578a7b65b659392975f8c02a Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 9 Oct 2024 19:54:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 11 +++++++++ src/components/filePreview/PptPreview.vue | 28 +++++++++++++++++++++++ src/components/filePreview/index.vue | 3 ++- vite.config.js | 6 ++--- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/components/filePreview/PptPreview.vue diff --git a/index.html b/index.html index 264b8e9..e691b87 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,17 @@ + + + + + + + + + + + 科研管理平台 diff --git a/src/components/filePreview/PptPreview.vue b/src/components/filePreview/PptPreview.vue new file mode 100644 index 0000000..3f4cea8 --- /dev/null +++ b/src/components/filePreview/PptPreview.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/filePreview/index.vue b/src/components/filePreview/index.vue index ace2b09..f15d63a 100644 --- a/src/components/filePreview/index.vue +++ b/src/components/filePreview/index.vue @@ -6,6 +6,7 @@ :append-to-body="false" :close-on-click-modal="true" > + @@ -43,7 +44,7 @@ const checkImgType=(fileType)=>{ return fileType == 'png' || fileType == 'jpg' || fileType == 'jpeg' || fileType == 'ico' || fileType == 'PNG' || fileType == 'JPG'; } console.info("🚀 ~method:‘checkImgType(props.fileType) -----", checkImgType(props.fileType)) -if(props.fileType!=='pdf'&&props.fileType!=='docx'&&!checkImgType(props.fileType)){ +if(props.fileType!=='pdf'&&props.fileType!=='docx'&&props.fileType !== 'ppt'&&props.fileType !== 'pptx'&&!checkImgType(props.fileType)){ showPreview.value=false ElNotification({ title: '提示', diff --git a/vite.config.js b/vite.config.js index 3697c3c..46074c9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -83,11 +83,11 @@ export default defineConfig({ // rewrite: (path) => path.replace(/^\/api/, '') // }, '/api': { - // // target: 'http://kyglweb.scgzjy.com:8080/', - target: 'http://mosr.feashow.cn', + target: 'http://kyglweb.scgzjy.com:8080/', + // target: 'http://mosr.feashow.cn', changeOrigin: true, // target: 'http://clay.frp.feashow.cn', - // target: 'http://frp.feashow.cn:31800/', + // // target: 'http://frp.feashow.cn:31800/', // changeOrigin: true, // rewrite: (path) => path.replace(/^\/api/, '') }, From 62d18089c45f6d03215c68fb2714f127c18ee496 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 9 Oct 2024 21:16:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E7=AE=80=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 11 ----------- src/components/filePreview/index.vue | 4 ++-- vite.config.js | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/index.html b/index.html index e691b87..264b8e9 100644 --- a/index.html +++ b/index.html @@ -4,17 +4,6 @@ - - - - - - - - - - - 科研管理平台 diff --git a/src/components/filePreview/index.vue b/src/components/filePreview/index.vue index f15d63a..7dc3990 100644 --- a/src/components/filePreview/index.vue +++ b/src/components/filePreview/index.vue @@ -6,7 +6,7 @@ :append-to-body="false" :close-on-click-modal="true" > - + @@ -44,7 +44,7 @@ const checkImgType=(fileType)=>{ return fileType == 'png' || fileType == 'jpg' || fileType == 'jpeg' || fileType == 'ico' || fileType == 'PNG' || fileType == 'JPG'; } console.info("🚀 ~method:‘checkImgType(props.fileType) -----", checkImgType(props.fileType)) -if(props.fileType!=='pdf'&&props.fileType!=='docx'&&props.fileType !== 'ppt'&&props.fileType !== 'pptx'&&!checkImgType(props.fileType)){ +if(props.fileType!=='pdf'&&props.fileType!=='docx'&&!checkImgType(props.fileType)){ showPreview.value=false ElNotification({ title: '提示', diff --git a/vite.config.js b/vite.config.js index 46074c9..905f3c9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -83,8 +83,8 @@ export default defineConfig({ // rewrite: (path) => path.replace(/^\/api/, '') // }, '/api': { - target: 'http://kyglweb.scgzjy.com:8080/', - // target: 'http://mosr.feashow.cn', + // target: 'http://kyglweb.scgzjy.com:8080/', + target: 'http://mosr.feashow.cn', changeOrigin: true, // target: 'http://clay.frp.feashow.cn', // // target: 'http://frp.feashow.cn:31800/',