liuQiang преди 1 година
родител
ревизия
75c7a12155
променени са 3 файла, в които са добавени 101 реда и са изтрити 8 реда
  1. 33 2
      src/views/department/MyFile.vue
  2. 33 2
      src/views/myfile/MyFile.vue
  3. 35 4
      src/views/publicment/MyFile.vue

+ 33 - 2
src/views/department/MyFile.vue

@@ -241,7 +241,7 @@
                                     <el-table v-if="fileGrid == 1" :data="folderList" height="37vh" style="width: 100%" :scrollbar-always-on="true"
                                         @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                         @row-contextmenu="folderRClick" ref="taskTableRef">
-                                        <el-table-column type="selection" width="55" />
+                                        <!-- <el-table-column type="selection" width="55" /> -->
                                         <el-table-column label="名称" :show-overflow-tooltip="true" :tooltip-options="{showAfter: 1000}" width="600">
                                             <template #default="scope">
                                                 <span class="juzhong">
@@ -295,6 +295,10 @@
                                         <img src="@/assets/images/notePencil.png" alt="" />
                                         <span class="shouzhi">编辑</span>
                                     </div>
+                                    <div class="menu_item" v-if="isDept" @click="delFolderMenu">
+                                        <img src="@/assets/images/trash.png" alt="" />
+                                        <span>删除</span>
+                                    </div>
                                 </div>
                             </div>
                             <!-- 文件 -->
@@ -2205,6 +2209,12 @@ export default {
         }
         const changeLeftShow = ()=>{
             leftShowList.value = leftShowList.value == 1?2:1
+            if(leftShowList.value == 2){
+                getFirstFolder()
+                fileList.value = []
+            }else{
+                refreshFile()
+            }
             thisFolder.value = {}
             localStorage.setItem('leftShowList',leftShowList.value)
             if(leftShowList.value === 1){
@@ -2242,6 +2252,26 @@ export default {
             // console.log('pathLabelData',pathLabelData.value);
 
         }
+        const delFolderMenu = ()=>{
+             documents.delDocument(clickRow.value.dirId).then(res => {
+                if (res.code === 200) {
+                    ElMessage({
+                        message: "删除成功",
+                        type: "success"
+                    })
+                    if(!thisFolder.value?.dirId){
+                        delFolderDataFn(clickRow.value)
+                    }
+                    // getAllTop()
+                    refreshFile()
+                } else {
+                    ElMessage({
+                        message: "删除失败,目录应不为空",
+                        type: "error"
+                    })
+                }
+            })
+        }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);
             console.log('files',newValue);
@@ -2621,7 +2651,8 @@ export default {
             changeListSort,
             folderBlur,
             delFolderDataFn,
-            openFolderPath
+            openFolderPath,
+            delFolderMenu
         }
     },
     watch: {

+ 33 - 2
src/views/myfile/MyFile.vue

@@ -265,7 +265,7 @@
                                     <el-table v-if="fileGrid == 1" height="37vh" :data="folderList" style="width: 100%" :scrollbar-always-on="true"
                                         @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                         @row-contextmenu="folderRClick" ref="taskTableRef">
-                                        <el-table-column type="selection" width="55" />
+                                        <!-- <el-table-column type="selection" width="55" /> -->
                                         <el-table-column label="名称" :show-overflow-tooltip="true" width="600">
                                             <template #default="scope">
                                                 <span style="display: flex;align-items: center;">
@@ -308,6 +308,10 @@
                                         <img src="@/assets/images/collect.png" alt="" />
                                         <span>收藏</span>
                                     </div>
+                                    <div class="menu_item" @click="delFolderMenu">
+                                        <img src="@/assets/images/trash.png" alt="" />
+                                        <span>删除</span>
+                                    </div>
                                 </div>
                             </div>
                             <!-- 文件 -->
@@ -2360,6 +2364,12 @@ export default {
             console.log('changeLeftShow',leftShowList.value);
             leftShowList.value = leftShowList.value == 1?2:1
             console.log('changeLeftShow-',leftShowList.value);
+            if(leftShowList.value == 2){
+                getFirstFolder()
+                fileList.value = []
+            }else{
+                refreshFile()
+            }
             thisFolder.value = {}
             localStorage.setItem('leftShowList',leftShowList.value)
             if(leftShowList.value === 1){
@@ -2397,6 +2407,26 @@ export default {
             // console.log('pathLabelData',pathLabelData.value);
 
         }
+        const delFolderMenu = ()=>{
+             documents.delDocument(clickRow.value.dirId).then(res => {
+                if (res.code === 200) {
+                    ElMessage({
+                        message: "删除成功",
+                        type: "success"
+                    })
+                    if(!thisFolder.value?.dirId){
+                        delFolderDataFn(clickRow.value)
+                    }
+                    // getAllTop()
+                    refreshFile()
+                } else {
+                    ElMessage({
+                        message: "删除失败,目录应不为空",
+                        type: "error"
+                    })
+                }
+            })
+        }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);
             console.log('files',newValue);
@@ -2782,7 +2812,8 @@ export default {
             delFolder,
             changeListSort,
             delFolderDataFn,
-            openFolderPath
+            openFolderPath,
+            delFolderMenu
         }
     },
     watch: {

+ 35 - 4
src/views/publicment/MyFile.vue

@@ -239,7 +239,7 @@
                                         <el-table v-if="fileGrid == 1" height="37vh" :data="folderList" style="width: 100%" :scrollbar-always-on="true"
                                             @selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
                                             @row-contextmenu="folderRClick" ref="taskTableRef">
-                                            <el-table-column type="selection" width="55" />
+                                            <!-- <el-table-column type="selection" width="55" /> -->
                                             <el-table-column label="名称" :show-overflow-tooltip="true" width="600">
                                                 <template #default="scope">
                                                     <span class="juzhong">
@@ -293,6 +293,10 @@
                                             <img src="@/assets/images/notePencil.png" alt="" />
                                             <span class="shouzhi">编辑</span>
                                         </div>
+                                        <div class="menu_item" v-if="isDept" @click="delFolderMenu">
+                                            <img src="@/assets/images/trash.png" alt="" />
+                                            <span>删除</span>
+                                        </div>
                                     </div>
                                 </div>
                                 <!-- 文件 -->
@@ -1306,13 +1310,13 @@ export default {
         const closeUpload =() =>{
             uploadModal.value = false;
             fileArr.value = [];
-            fileBig.value = 0
+            // fileBig.value = 0
             loadingUpload.value = false
         }
         // 移除上传的某些文件
         const handleRemove = (file,rawFile) => {
             // fileArr.value = [...rawFile]
-            fileBig.value = fileBig.value - file.size
+            // fileBig.value = fileBig.value - file.size
             fileArr.value = rawFile.map(item=>{
                 if(item.raw){
                     return item.raw
@@ -2188,6 +2192,12 @@ export default {
         }
         const changeLeftShow = ()=>{
             leftShowList.value = leftShowList.value == 1?2:1
+            if(leftShowList.value == 2){
+                getFirstFolder()
+                fileList.value = []
+            }else{
+                refreshFile()
+            }
             thisFolder.value = {}
             localStorage.setItem('leftShowList',leftShowList.value)
             if(leftShowList.value === 1){
@@ -2225,6 +2235,26 @@ export default {
             // console.log('pathLabelData',pathLabelData.value);
 
         }
+        const delFolderMenu = ()=>{
+             documents.delDocument(clickRow.value.dirId).then(res => {
+                if (res.code === 200) {
+                    ElMessage({
+                        message: "删除成功",
+                        type: "success"
+                    })
+                    if(!thisFolder.value?.dirId){
+                        delFolderDataFn(clickRow.value)
+                    }
+                    // getAllTop()
+                    refreshFile()
+                } else {
+                    ElMessage({
+                        message: "删除失败,目录应不为空",
+                        type: "error"
+                    })
+                }
+            })
+        }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);
             console.log('files',newValue);
@@ -2603,7 +2633,8 @@ export default {
             delFolder,
             changeListSort,
             delFolderDataFn,
-            openFolderPath
+            openFolderPath,
+            delFolderMenu
         }
     },
     watch: {