Merge pull request 'master' (#814) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/814

src/components/filePreview/PptPreview.vue

@@ -0,0 +1,28 @@
+<template>
+  <div id="pptx" ></div>
+</template>
+
+<script setup >
+const props = defineProps({
+  fileUrl: {
+    type: String,
+    default: ''
+  },
+  fullscreen: {
+    type: Boolean,
+    default:false
+  }
+})
+// js部分 jquery已在index.html中引入 无需另外安装
+const handlePPtx = () => {
+  $("#pptx").pptxToHtml({
+    pptxFileUrl: props.fileUrl, //pptx文件地址
+    slidesScale: "100%",
+  });
+}
+handlePPtx()
+</script>
+
+<style scoped>
+
+</style>

src/components/filePreview/index.vue

@@ -6,6 +6,7 @@
                :append-to-body="false"
                :close-on-click-modal="true"
     >
+<!--      <ppt-preview :file-url="fileUrl" :fullscreen="fullscreen" v-if="fileType === 'ppt'||fileType === 'pptx'"/>-->
       <pdf-preview :file-url="fileUrl" :fullscreen="fullscreen" v-if="fileType === 'pdf'"/>
       <docx-preview :file-url="fileUrl" :fullscreen="fullscreen" v-if="fileType === 'docx'"/>
       <image-preview :fileUrl="fileUrl" :fullscreen="fullscreen" :fileName="fileName" v-if="checkImgType(fileType)"/>

src/views/home/index.vue

@@ -159,7 +159,7 @@
       </el-col>
     </el-row>
     <el-row gutter="10" style="margin-top: 10px">
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="6">
+      <el-col :xs="24" :sm="24" :md="12" :lg="6" :xl="6">
         <div class="right bottom">
           <div class="right-top ">
             <div class="title-block">
@@ -183,7 +183,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
         <div class="right  bottom">
           <div class="right-top ">
             <div class="title-block">
@@ -221,7 +221,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="10">
+      <el-col :xs="24" :sm="24" :md="24" :lg="10" :xl="10">
         <el-card shadow="never" class="todo-bg">
           <el-tabs v-model="docActiveTab" editable @tab-add="goToArticleList">
             <template #add-icon>
@@ -748,9 +748,9 @@ const handleView = (row) => {
   //.home-bg .notice-block {
   //  height: 624px !important;
   //}
-  .todo-bg {
+  //.todo-bg {
-    margin-top: 10px;
+  //  margin-top: 10px;
-  }
+  //}
   .block {
     width: 300px !important;
   }
@@ -1224,7 +1224,7 @@ const handleView = (row) => {
         cursor: pointer;
         display: flex;
         align-items: center;
-        width: 344px;
+        width: 324px;
         height: 170px;
         background-size: 100% 100%;
         background-repeat: no-repeat;

vite.config.js

@@ -83,11 +83,11 @@ export default defineConfig({
       //   rewrite: (path) => path.replace(/^\/api/, '')
       // },
       '/api': {
-        // // target: 'http://kyglweb.scgzjy.com:8080/',
+        // 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/, '')
       },