liyangzheng 2 anni fa
parent
commit
8d25c58d72

+ 4 - 5
src/views/myfile/MyFile.vue

@@ -110,7 +110,7 @@
                             <!-- 前进后退 -->
                             <div style="display: flex;justify-content: space-around;align-items: center;">
                                 <img style="display:block;width: 11px;height: 11px;" :src="blueLeft" alt=""
-                                    @click="arrowLift">
+                                    @click="getAllTop">
                                 <img style="display:block;width: 16px;height: 16px;" :src="grayRight" alt="">
                             </div>
                             <!-- 面包屑 -->
@@ -122,7 +122,7 @@
                         <!-- 右侧 -->
                         <div>
                             <img :src="sort" alt="">
-                            <img :src="squre" alt="" @click="gridChange">
+                            <img :src="squre" alt="">
                         </div>
                     </div>
                 </div>
@@ -160,7 +160,7 @@
 
                             </el-table>
                             <PlaceGridFolder v-else :folderClick="folderClick" :restName="restName"
-                                :collectFolder="collectFolder" :getAllTop="getAllTop" @folderBack="folderBack">
+                                :collectFolder="collectFolder" :getAllTop="getAllTop" @folderBack="folderBack" >
                             </PlaceGridFolder>
                         </el-collapse-item>
                     </el-collapse>
@@ -212,7 +212,7 @@
                                 </el-table-column>
                             </el-table>
                             <PalaceGridFile v-else @showFile="showFile" :getAllTop="getAllTop" @navBack="navBack"
-                                @lastBB="lastBB" @onlineCase="onlineCase" @shareBack="shareBack"></PalaceGridFile>
+                                @lastBB="lastBB" @onlineCase="onlineCase" @shareBack="shareBack" ></PalaceGridFile>
                         </el-collapse-item>
                     </el-collapse>
                     <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: yz - 260 + 'px' }">
@@ -353,7 +353,6 @@ import { listVersion } from "@/api/biz/version";
 import useUserStore from "@/store/modules/user";
 import { useRouter, useRoute } from "vue-router";
 import { canPreviewFile } from "@/utils/index.js"
-
 export default {
     setup() {
         const { proxy } = getCurrentInstance();

+ 18 - 17
src/views/myfile/components/PalaceGridFile.vue

@@ -25,7 +25,7 @@
                     </p>
                 </template>
             </div>
-            <div class="setCli1" v-if="anyP" :style="{ left: xz + 155 + 'px', top: yz-50 + 'px' }">
+            <div class="setCli1" v-if="anyP" :style="{ left: xz + 155 + 'px', top: yz - 50 + 'px' }">
                 <p @click="chooseSet1(0)" class="chooseSet">
                     <img src="../../../assets/images/user.png" alt="">
                     选择人员
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { ref, onMounted } from "vue"
+import { ref, onMounted, watch } from "vue"
 import { ElMessage } from "element-plus";
 import myfile from "../../../api/myfile/myfile";
 import documents from "../../../api/document/document";
@@ -72,11 +72,11 @@ import { canPreviewFile } from "@/utils/index.js"
 import { preview } from "@/api/common/common.js";
 import { listVersion } from "@/api/biz/version";
 export default {
-    props:{
-        getAllTop:{
-            type:Function,
-            required:true
-        }
+    props: {
+        getAllTop: {
+            type: Function,
+            required: true
+        },
     },
     setup(props, { emit }) {
         let impDirId = ref(0)
@@ -282,6 +282,7 @@ export default {
             }
         }
         async function chooseSet(row, index, num) {
+
             if (row.name == '协作') {
                 cliCC.value = true
             } else {
@@ -290,7 +291,7 @@ export default {
             if (row.name == '分享') {
                 workOrEdit.value = num
                 thanks.value = true
-                emit("shareBack",thanks.value,workOrEdit.value)
+                emit("shareBack", thanks.value, workOrEdit.value)
             } else {
                 thanks.value = false
             }
@@ -303,7 +304,7 @@ export default {
             } else {
                 anyP.value = false
             }
-            console.log(anyP.value,'anyp');
+            console.log(anyP.value, 'anyp');
             if (row.name == '删除') {
                 myfile.delMenu(clickRowId.value).then(res => {
                     if (res.code === 200) {
@@ -325,7 +326,7 @@ export default {
             }
             if (row.name === '重命名') {
                 fileNameChange.value = true
-                emit("navBack", fileNameChange.value,nameForm.value.name)
+                emit("navBack", fileNameChange.value, nameForm.value.name)
             }
             if (row.name === "下载") {
                 location.href = `${import.meta.env.VITE_APP_BASE_API}/api/download/${copyFileId.value}`;
@@ -335,7 +336,7 @@ export default {
             }
             if (row.name === '在线编辑') {
                 editOnline.value = false
-                emit("onlineCase",editOnline.value,clickRowId.value, copyRow.value)
+                emit("onlineCase", editOnline.value, clickRowId.value, copyRow.value)
             }
             if (row.name === '文字识别') {
                 router.push({
@@ -367,7 +368,7 @@ export default {
                 historyTotal.value = resHistory.total
                 fileUserTreeData.data = resHistory.rows;
                 openForwardFile.value = true
-                emit("lastBB",openForwardFile.value,historyTotal.value,fileUserTreeData.data)
+                emit("lastBB", openForwardFile.value, historyTotal.value, fileUserTreeData.data)
             }
         }
         function changeMsgClose(val, item) {
@@ -384,7 +385,7 @@ export default {
             workOrEdit.value = num
             thanks.value = true
             anyP.value = false
-            emit("shareBack",thanks.value,workOrEdit.value)
+            emit("shareBack", thanks.value, workOrEdit.value)
         }
         function getChildren(data) {
             fileTrees.value = data
@@ -401,8 +402,8 @@ export default {
         function getCollects(data) {
             collects.value = false
         }
-         // 归档
-         function goLock() {
+        // 归档
+        function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
                 if (res.code === 200) {
                     ElMessage({
@@ -416,7 +417,7 @@ export default {
         }
         onMounted(() => {
             getAllTop()
-            window.addEventListener("click", mouseClick,true);
+            window.addEventListener("click", mouseClick, true);
         })
         return {
             getAllTop,
@@ -469,7 +470,7 @@ export default {
             collects,
             fileNameChange,
             editOnline,
-            goLock
+            goLock,
         }
     },
     components: {

+ 5 - 1
src/views/myfile/components/PlaceGridFolder.vue

@@ -43,6 +43,7 @@ import { ElMessage } from "element-plus";
 import myfile from "../../../api/myfile/myfile";
 import documents from "../../../api/document/document";
 import ImgFile from "../jsComponents/ImgFile";
+import PalaceGridFile from "./PalaceGridFile.vue";
 export default {
     props: {
         folderClick: {
@@ -190,8 +191,11 @@ export default {
             copyDir,
             copySpa,
             copyNma,
-            copyFir
+            copyFir,
         }
+    },
+    components:{
+        PalaceGridFile,
     }
 }
 </script>

+ 2 - 0
src/views/myfile/jsComponents/brother.js

@@ -0,0 +1,2 @@
+import {ref} from 'vue'
+export let shareData = ref([])

+ 60 - 52
src/views/myfile/modalComponebts/CreateFloder.vue

@@ -34,38 +34,38 @@ export default {
             type: Number,
             required: true
         },
-        impDirId:{
-            type:Number,
-            required:true
+        impDirId: {
+            type: Number,
+            required: true
         },
-        impSpaceId:{
-            type:Number,
-            required:true
+        impSpaceId: {
+            type: Number,
+            required: true
         },
-        newDirId:{
-            type:Number,
-            required:true
+        newDirId: {
+            type: Number,
+            required: true
         },
-        newSpaceId:{
-            type:Number,
-            required:true
+        newSpaceId: {
+            type: Number,
+            required: true
         },
-        getAllTop:Function,
+        getAllTop: Function,
     },
     setup(props, { emit }) {
-        let { addBack, sureAddBoser,diClose } = toRef(props)
+        let { addBack, sureAddBoser, diClose } = toRef(props)
         let result = props.folderCase
         let free = props.oneOrTwo
         let spId = props.impSpaceId
         let drId = props.impDirId
-        let newspid=props.newSpaceId
+        let newspid = props.newSpaceId
         let newdrid = props.newDirId
         let addBoser = ref(false)
         let boserForm = ref({
             dirName: "",
         })
         function inital() {
-            console.log(free,'free');
+            console.log(free, 'free');
             addBoser.value = result
         }
         function backTo() {
@@ -73,43 +73,51 @@ export default {
             emit("getChildrenC", addBoser.value)
         }
         function addFloder() {
-            if (free === 1) {
-                documents.addDocument(
-                    {
-                        "dirName": boserForm.value.dirName,
-                        "parentId": drId - 0,
-                        "spaceId": spId - 0,
-                    }
-                ).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            message: '添加一级目录成功',
-                            type: 'success',
-                        })
-                    }
-                    addBoser.value = false
-                    emit("getChildrenC", addBoser.value)
-                    props.getAllTop()
+            if (boserForm.value.dirName === '') {
+                ElMessage({
+                    type: "error",
+                    message: "目录名称不能为空"
                 })
             } else {
-                documents.addDocument(
-                    {
-                        "dirName": boserForm.value.dirName,
-                        "parentId": newdrid - 0,
-                        "spaceId": newspid - 0,
-                    }
-                ).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            message: '添加成功',
-                            type: 'success',
-                        })
-                    }
-                    addBoser.value = false
-                    emit("getChildrenC", addBoser.value)
-                    props.getAllTop()
-                })
+                if (free === 1) {
+                    documents.addDocument(
+                        {
+                            "dirName": boserForm.value.dirName,
+                            "parentId": drId - 0,
+                            "spaceId": spId - 0,
+                        }
+                    ).then(res => {
+                        if (res.code === 200) {
+                            ElMessage({
+                                message: '添加一级目录成功',
+                                type: 'success',
+                            })
+                        }
+                        addBoser.value = false
+                        emit("getChildrenC", addBoser.value)
+                        props.getAllTop()
+                    })
+                } else {
+                    documents.addDocument(
+                        {
+                            "dirName": boserForm.value.dirName,
+                            "parentId": newdrid - 0,
+                            "spaceId": newspid - 0,
+                        }
+                    ).then(res => {
+                        if (res.code === 200) {
+                            ElMessage({
+                                message: '添加成功',
+                                type: 'success',
+                            })
+                        }
+                        addBoser.value = false
+                        emit("getChildrenC", addBoser.value)
+                        props.getAllTop()
+                    })
+                }
             }
+
         }
         onMounted(() => {
             inital()
@@ -119,8 +127,8 @@ export default {
             boserForm,
             inital,
             addBack: backTo,
-            sureAddBoser:addFloder,
-            diClose:backTo,
+            sureAddBoser: addFloder,
+            diClose: backTo,
             spId,
             drId,
             newdrid,