liuQiang 2 лет назад
Родитель
Сommit
d423e32ff0

+ 2 - 1
src/api/biz/info.js

@@ -47,6 +47,7 @@ export function updateInfo(data) {
 export function delInfo(docId) {
   return request({
     url: '/biz/info/' + docId,
-    method: 'delete'
+    method: 'delete',
+    timeout: 10*60*1000,//配置超时时间
   })
 }

+ 1 - 0
src/api/upload/upload.js

@@ -38,6 +38,7 @@ function pdf2word(data) {
         url: `/biz/info/pdf2word`,
         method: "post",
         data,
+        timeout: 10*60*1000,//配置超时时间
         responseType:'blob',
         headers: {
 		    'Content-Type': 'multipart/form-data'

+ 1 - 1
src/components/ListShow/ListShow.vue

@@ -398,7 +398,7 @@ watch(
   (newValue, oldValue) => {
     tableData.value = newValue;
     changeSearchType(searchType.value);
-    // console.log("watchtableData", tableData.value);
+    console.log("watchtableData", tableData.value);
   },
   {
     immediate: true,

+ 15 - 13
src/views/department/MyFile.vue

@@ -473,6 +473,7 @@ import { ref, toRaw, onMounted,onActivated ,inject,watch} from 'vue'
 import myfile from '../../api/myfile/myfile'
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
+import {getInfo,delInfo}from "@/api/biz/info.js"
 import fileCount from '../../api/fileCount/fileCount'
 import FileTree from './components/FileTree.vue'
 import BreadMenu from './components/BreadMenu.vue'
@@ -1280,7 +1281,20 @@ export default {
             // })
             if (row.name === '删除') {
                 if(!canDo) return
-                const datas = []
+                const datas = delMoreFile.value.map(item=>{
+                    return item.docId
+                })
+                const filesStr = datas.join(',')
+                delInfo(filesStr).then(res=>{
+                    if (res.code === 200) {
+                            ElMessage({
+                                message: "删除成功",
+                                type: "success"
+                            })
+                            // getAllTop()
+                            refreshFile() 
+                        }
+                })
                 const isFile = ref(false)
                   delMoreFolder.value.map(i => {//多选删除
                        documents.delDocument(i.dirId).then(res => {
@@ -1299,18 +1313,6 @@ export default {
                         }
                     })
                 })
-                delMoreFile.value.map(i => {//多选删除
-                      myfile.delMenu(i.docId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            refreshFile() 
-                        }
-                    })
-                })
             }
         }
         function delName(row, num) {

+ 38 - 17
src/views/myfile/MyFile.vue

@@ -520,7 +520,7 @@
 import { ref, toRaw, onMounted, inject, onActivated ,watch} from 'vue'
 import myfile from '../../api/myfile/myfile'
 import {documentation}from "@/api/biz/actor.js"
-import {getInfo}from "@/api/biz/info.js"
+import {getInfo,delInfo}from "@/api/biz/info.js"
 import uploadApi from '../../api/upload/upload'
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
@@ -1502,7 +1502,21 @@ export default {
                     // openScan.value = true
                     return
                 } 
-                const datas = []
+                const datas = delMoreFile.value.map(item=>{
+                    return item.docId
+                })
+                const filesStr = datas.join(',')
+                // console.log('filesStr',filesStr);
+                delInfo(filesStr).then(res=>{
+                    if (res.code === 200) {
+                            ElMessage({
+                                message: "删除成功",
+                                type: "success"
+                            })
+                            // getAllTop()
+                            refreshFile() 
+                        }
+                })
                 const isFile = ref(false)
                 delMoreFolder.value.map(i => {//多选删除
                        documents.delDocument(i.dirId).then(res => {
@@ -1521,18 +1535,18 @@ export default {
                         }
                     })
                 })
-                delMoreFile.value.map(i => {//多选删除
-                      myfile.delMenu(i.docId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            refreshFile() 
-                        }
-                    })
-                })
+                // delMoreFile.value.map(i => {//多选删除
+                //       myfile.delMenu(i.docId).then(res => {
+                //         if (res.code === 200) {
+                //             ElMessage({
+                //                 message: "删除成功",
+                //                 type: "success"
+                //             })
+                //             // getAllTop()
+                //             refreshFile() 
+                //         }
+                //     })
+                // })
             }
             if (row.name == '分享给') {
                 workOrEdit.value = num
@@ -1665,7 +1679,11 @@ export default {
         }
         // 左边树节点每行点击事件
         function listfolderClick(row,firstData) {
-            thisFolder.value = row
+            if(row){
+                thisFolder.value = row
+            }
+            row = row?row:thisFolder.value
+            
             if (row.isEncrypt === "Y") {
                 getLeveldetailFn(row.encryptLevel)
             } else {
@@ -1971,10 +1989,13 @@ export default {
             if(edit){
                 getFirstFolder()
             }
-            if (toRaw(thisFolder.value)?.dirId && !leftNewFile.value) {//如果点开了文件夹
+            if (toRaw(thisFolder.value)?.dirId && !leftNewFile.value && leftShowList.value == 1 ) {//如果点开了文件夹
                 folderClick()
                 console.log(111);
-            } else {
+            } else if(toRaw(thisFolder.value)?.dirId && !leftNewFile.value && leftShowList.value == 0){
+                listfolderClick()
+                console.log('treeRe');
+            }else {
                 console.log(222);
                 getAllTop()
             }

+ 15 - 13
src/views/publicment/MyFile.vue

@@ -470,6 +470,7 @@ import myfile from '../../api/myfile/myfile'
 import {documentation}from "@/api/biz/actor.js"
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
+import {getInfo,delInfo}from "@/api/biz/info.js"
 import fileCount from '../../api/fileCount/fileCount'
 import FileTree from '@/views/myfile/components/FileTree.vue'
 import BreadMenu from './components/BreadMenu.vue'
@@ -1272,7 +1273,20 @@ export default {
             // })
             if (row.name === '删除') {
                 if(!canDo) return
-                const datas = []
+                const datas = delMoreFile.value.map(item=>{
+                    return item.docId
+                })
+                const filesStr = datas.join(',')
+                delInfo(filesStr).then(res=>{
+                    if (res.code === 200) {
+                            ElMessage({
+                                message: "删除成功",
+                                type: "success"
+                            })
+                            // getAllTop()
+                            refreshFile() 
+                        }
+                })
                 const isFile = ref(false)
                   delMoreFolder.value.map(i => {//多选删除
                        documents.delDocument(i.dirId).then(res => {
@@ -1291,18 +1305,6 @@ export default {
                         }
                     })
                 })
-                delMoreFile.value.map(i => {//多选删除
-                      myfile.delMenu(i.docId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            refreshFile() 
-                        }
-                    })
-                })
             }
         }
         function delName(row, num) {