liuQiang 1 year ago
parent
commit
b56ddd7b25
2 changed files with 28 additions and 13 deletions
  1. 24 9
      src/views/myfile/MyFile.vue
  2. 4 4
      vite.config.js

+ 24 - 9
src/views/myfile/MyFile.vue

@@ -333,7 +333,7 @@
                     :copyFolderName="copyFolderName" @getRename="getRename">
                 </FolderReName>
             </div>
-            <ImgPreview :previewData="previewData" :copyFileType="copyFileType" :showPreview="showPreview"
+            <ImgPreview  :previewData="previewData" :copyFileType="copyFileType" :showPreview="showPreview"
                 @closeImgPreview="closeImgPreview"></ImgPreview>
             <div>
                 <FileTree v-if="fileTrees" :fileTrees="fileTrees" :newSpaceId="newSpaceId" :fileId="clickRowId"
@@ -355,6 +355,7 @@
     <!-- 历史版本 -->
     <!-- 二次密码验证 -->
     <inputPassword v-if="showInputPassword" @surePass="surePass" @closeIptPass="closeIptPass" :showInputPassword="showInputPassword"></inputPassword>
+    <div v-loading.fullscreen="loadingPreview" v-if="loadingPreview" class="lodingBox"></div>
 </template>
 
 <script>
@@ -383,7 +384,7 @@ import level1 from "@/assets/images/level1.png";
 import level2 from "@/assets/images/level2.png";
 import level3 from "@/assets/images/level3.png";
 import level4 from "@/assets/images/level4.png";
-import { ElMessage } from 'element-plus'
+import { ElMessage ,ElLoading } from 'element-plus'
 import ImgPreview from '@/components/ImgPreview/ImgPreview.vue'
 import { preview } from "@/api/common/common.js";
 import historyList from "@/components/historyList/index.vue"; //选择文件发送的列表,历史版本
@@ -587,6 +588,7 @@ export default {
         const showInputPassword = ref(false)
         const chooseRow = ref()
         const chooseNum = ref()
+        const loadingPreview = ref(false)
         // 获取文件夹,中栏,文件
         function getAllTop() {
             documents.getTop(3).then(res => {
@@ -765,7 +767,7 @@ export default {
         //mouse弹框
         async function chooseSet(row, index, num) {
             // 权限控制
-            if(thisFolderRole.value.roles){
+            if(thisFolderRole.value && thisFolderRole.value.roles){
                 if(thisFolderRole.value.roles.l0600){
                     const passArr = localStorage.getItem('passArr');
                     const passArrObj = JSON.parse(passArr)
@@ -778,6 +780,8 @@ export default {
                     // console.log('needc');
                 }
             }
+            console.log('chooseSetrow',row);
+            console.log('chooseSetnum',num);
             if (row.name == '在线编辑' || row.name == '协作') {
                 cliCC.value = true
             }
@@ -852,22 +856,24 @@ export default {
                 })
             }
             if (row.name === '预览') {
+                loadingPreview.value = true
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                     onlyView.value = true
                     editOnline.value = false
                     cliCC.value = false
                 } else {
-                    showPreview.value = true
                     const res = await preview(copyFileId.value)
+                    showPreview.value = true
                     previewData.value = URL.createObjectURL(res)
                 }
+                loadingPreview.value = false
                 console.log('filePreview', filePreview);
 
-                // console.log('res',res);
-                showPreview.value = true
-                const res = await preview(copyFileId.value)
-                previewData.value = URL.createObjectURL(res)
+                // // console.log('res',res);
+                // const res = await preview(copyFileId.value)
+                // showPreview.value = true
+                // previewData.value = URL.createObjectURL(res)
             } else if (row.name === "历史版本") {
                 const resHistory = await listVersion({ docId: clickRowId.value })
                 console.log('resHistory',resHistory);
@@ -1609,7 +1615,8 @@ export default {
             closeIptPass,
             surePass,
             chooseRow,
-            chooseNum
+            chooseNum,
+            loadingPreview
         }
     },
     watch: {
@@ -1634,6 +1641,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.lodingBox{
+    position:absolute;
+    top: 0;
+    left: 0;
+    width: 100vh;
+    height: 100vh;
+    z-index: 10000000;
+}
 p {
     margin: 0;
     padding: 0;

+ 4 - 4
vite.config.js

@@ -40,15 +40,15 @@ export default defineConfig(({
 				// https://cn.vitejs.dev/config/#server-proxy
 				'/dev-api': {
 					// target: 'http://192.168.1.28:8080/',
-					// target: 'http://8.142.173.95:19527/',
-					target:'http://192.168.1.28:8080/',
+					target: 'http://8.142.173.95:19527/',
+					// target:'http://192.168.1.28:8080/',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/dev-api/, '')
 				},
 				//websocket代理
 				'/websocket': {				
-					// target:'ws://8.142.173.95:19527/websocket',
-					target:'ws://192.168.1.28:8080/websocket',
+					target:'ws://8.142.173.95:19527/websocket',
+					// target:'ws://192.168.1.28:8080/websocket',
 					// target:'ws://192.168.1.11:8080/websocket',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/websocket/, '')