Parcourir la source

Merge branch 'liyangzheng' into v3

liyangzheng il y a 2 ans
Parent
commit
cdc70caf4e

+ 214 - 211
index.html

@@ -1,217 +1,220 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<meta name="renderer" content="webkit">
-		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-		<link rel="icon" href="/favicon.ico">
-		<title>若依管理系统</title>
-		<!--引入onlyoffice组件-->
-		<script type="text/javascript" src="http://192.168.188.188:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
-		<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-		<style>
-			html,
-			body,
-			#app {
-				height: 100%;
-				margin: 0px;
-				padding: 0px;
-			}
-
-			.chromeframe {
-				margin: 0.2em 0;
-				background: #ccc;
-				color: #000;
-				padding: 0.2em 0;
-			}
-
-			#loader-wrapper {
-				position: fixed;
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 100%;
-				z-index: 999999;
-			}
-
-			#loader {
-				display: block;
-				position: relative;
-				left: 50%;
-				top: 50%;
-				width: 150px;
-				height: 150px;
-				margin: -75px 0 0 -75px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #FFF;
-				-webkit-animation: spin 2s linear infinite;
-				-ms-animation: spin 2s linear infinite;
-				-moz-animation: spin 2s linear infinite;
-				-o-animation: spin 2s linear infinite;
-				animation: spin 2s linear infinite;
-				z-index: 1001;
-			}
-
-			#loader:before {
-				content: "";
-				position: absolute;
-				top: 5px;
-				left: 5px;
-				right: 5px;
-				bottom: 5px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #FFF;
-				-webkit-animation: spin 3s linear infinite;
-				-moz-animation: spin 3s linear infinite;
-				-o-animation: spin 3s linear infinite;
-				-ms-animation: spin 3s linear infinite;
-				animation: spin 3s linear infinite;
-			}
-
-			#loader:after {
-				content: "";
-				position: absolute;
-				top: 15px;
-				left: 15px;
-				right: 15px;
-				bottom: 15px;
-				border-radius: 50%;
-				border: 3px solid transparent;
-				border-top-color: #FFF;
-				-moz-animation: spin 1.5s linear infinite;
-				-o-animation: spin 1.5s linear infinite;
-				-ms-animation: spin 1.5s linear infinite;
-				-webkit-animation: spin 1.5s linear infinite;
-				animation: spin 1.5s linear infinite;
-			}
-
-
-			@-webkit-keyframes spin {
-				0% {
-					-webkit-transform: rotate(0deg);
-					-ms-transform: rotate(0deg);
-					transform: rotate(0deg);
-				}
-
-				100% {
-					-webkit-transform: rotate(360deg);
-					-ms-transform: rotate(360deg);
-					transform: rotate(360deg);
-				}
-			}
-
-			@keyframes spin {
-				0% {
-					-webkit-transform: rotate(0deg);
-					-ms-transform: rotate(0deg);
-					transform: rotate(0deg);
-				}
-
-				100% {
-					-webkit-transform: rotate(360deg);
-					-ms-transform: rotate(360deg);
-					transform: rotate(360deg);
-				}
-			}
-
-
-			#loader-wrapper .loader-section {
-				position: fixed;
-				top: 0;
-				width: 51%;
-				height: 100%;
-				background: #7171C6;
-				z-index: 1000;
-				-webkit-transform: translateX(0);
-				-ms-transform: translateX(0);
-				transform: translateX(0);
-			}
-
-			#loader-wrapper .loader-section.section-left {
-				left: 0;
-			}
-
-			#loader-wrapper .loader-section.section-right {
-				right: 0;
-			}
-
-
-			.loaded #loader-wrapper .loader-section.section-left {
-				-webkit-transform: translateX(-100%);
-				-ms-transform: translateX(-100%);
-				transform: translateX(-100%);
-				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-			}
-
-			.loaded #loader-wrapper .loader-section.section-right {
-				-webkit-transform: translateX(100%);
-				-ms-transform: translateX(100%);
-				transform: translateX(100%);
-				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-			}
-
-			.loaded #loader {
-				opacity: 0;
-				-webkit-transition: all 0.3s ease-out;
-				transition: all 0.3s ease-out;
-			}
-
-			.loaded #loader-wrapper {
-				visibility: hidden;
-				-webkit-transform: translateY(-100%);
-				-ms-transform: translateY(-100%);
-				transform: translateY(-100%);
-				-webkit-transition: all 0.3s 1s ease-out;
-				transition: all 0.3s 1s ease-out;
-			}
-
-			.no-js #loader-wrapper {
-				display: none;
-			}
-
-			.no-js h1 {
-				color: #222222;
-			}
-
-			#loader-wrapper .load_title {
-				font-family: 'Open Sans';
-				color: #FFF;
-				font-size: 19px;
-				width: 100%;
-				text-align: center;
-				z-index: 9999999999999;
-				position: absolute;
-				top: 60%;
-				opacity: 1;
-				line-height: 30px;
-			}
-
-			#loader-wrapper .load_title span {
-				font-weight: normal;
-				font-style: italic;
-				font-size: 13px;
-				color: #FFF;
-				opacity: 0.5;
-			}
-		</style>
-	</head>
-
-	<body>
-		<div id="app">
-			<div id="loader-wrapper">
-				<div id="loader"></div>
-				<div class="loader-section section-left"></div>
-				<div class="loader-section section-right"></div>
-				<div class="load_title">正在加载系统资源,请耐心等待</div>
-			</div>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+	<link rel="icon" href="/favicon.ico">
+	<title>若依管理系统</title>
+	<!--引入onlyoffice组件-->
+	<!-- <script type="text/javascript" src="http://192.168.188.188:19531/web-apps/apps/api/documents/api.js" charset="utf-8"
+		async></script> -->
+	<script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8"
+		async></script>
+	<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+	<style>
+		html,
+		body,
+		#app {
+			height: 100%;
+			margin: 0px;
+			padding: 0px;
+		}
+
+		.chromeframe {
+			margin: 0.2em 0;
+			background: #ccc;
+			color: #000;
+			padding: 0.2em 0;
+		}
+
+		#loader-wrapper {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 999999;
+		}
+
+		#loader {
+			display: block;
+			position: relative;
+			left: 50%;
+			top: 50%;
+			width: 150px;
+			height: 150px;
+			margin: -75px 0 0 -75px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #FFF;
+			-webkit-animation: spin 2s linear infinite;
+			-ms-animation: spin 2s linear infinite;
+			-moz-animation: spin 2s linear infinite;
+			-o-animation: spin 2s linear infinite;
+			animation: spin 2s linear infinite;
+			z-index: 1001;
+		}
+
+		#loader:before {
+			content: "";
+			position: absolute;
+			top: 5px;
+			left: 5px;
+			right: 5px;
+			bottom: 5px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #FFF;
+			-webkit-animation: spin 3s linear infinite;
+			-moz-animation: spin 3s linear infinite;
+			-o-animation: spin 3s linear infinite;
+			-ms-animation: spin 3s linear infinite;
+			animation: spin 3s linear infinite;
+		}
+
+		#loader:after {
+			content: "";
+			position: absolute;
+			top: 15px;
+			left: 15px;
+			right: 15px;
+			bottom: 15px;
+			border-radius: 50%;
+			border: 3px solid transparent;
+			border-top-color: #FFF;
+			-moz-animation: spin 1.5s linear infinite;
+			-o-animation: spin 1.5s linear infinite;
+			-ms-animation: spin 1.5s linear infinite;
+			-webkit-animation: spin 1.5s linear infinite;
+			animation: spin 1.5s linear infinite;
+		}
+
+
+		@-webkit-keyframes spin {
+			0% {
+				-webkit-transform: rotate(0deg);
+				-ms-transform: rotate(0deg);
+				transform: rotate(0deg);
+			}
+
+			100% {
+				-webkit-transform: rotate(360deg);
+				-ms-transform: rotate(360deg);
+				transform: rotate(360deg);
+			}
+		}
+
+		@keyframes spin {
+			0% {
+				-webkit-transform: rotate(0deg);
+				-ms-transform: rotate(0deg);
+				transform: rotate(0deg);
+			}
+
+			100% {
+				-webkit-transform: rotate(360deg);
+				-ms-transform: rotate(360deg);
+				transform: rotate(360deg);
+			}
+		}
+
+
+		#loader-wrapper .loader-section {
+			position: fixed;
+			top: 0;
+			width: 51%;
+			height: 100%;
+			background: #7171C6;
+			z-index: 1000;
+			-webkit-transform: translateX(0);
+			-ms-transform: translateX(0);
+			transform: translateX(0);
+		}
+
+		#loader-wrapper .loader-section.section-left {
+			left: 0;
+		}
+
+		#loader-wrapper .loader-section.section-right {
+			right: 0;
+		}
+
+
+		.loaded #loader-wrapper .loader-section.section-left {
+			-webkit-transform: translateX(-100%);
+			-ms-transform: translateX(-100%);
+			transform: translateX(-100%);
+			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+		}
+
+		.loaded #loader-wrapper .loader-section.section-right {
+			-webkit-transform: translateX(100%);
+			-ms-transform: translateX(100%);
+			transform: translateX(100%);
+			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+		}
+
+		.loaded #loader {
+			opacity: 0;
+			-webkit-transition: all 0.3s ease-out;
+			transition: all 0.3s ease-out;
+		}
+
+		.loaded #loader-wrapper {
+			visibility: hidden;
+			-webkit-transform: translateY(-100%);
+			-ms-transform: translateY(-100%);
+			transform: translateY(-100%);
+			-webkit-transition: all 0.3s 1s ease-out;
+			transition: all 0.3s 1s ease-out;
+		}
+
+		.no-js #loader-wrapper {
+			display: none;
+		}
+
+		.no-js h1 {
+			color: #222222;
+		}
+
+		#loader-wrapper .load_title {
+			font-family: 'Open Sans';
+			color: #FFF;
+			font-size: 19px;
+			width: 100%;
+			text-align: center;
+			z-index: 9999999999999;
+			position: absolute;
+			top: 60%;
+			opacity: 1;
+			line-height: 30px;
+		}
+
+		#loader-wrapper .load_title span {
+			font-weight: normal;
+			font-style: italic;
+			font-size: 13px;
+			color: #FFF;
+			opacity: 0.5;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="app">
+		<div id="loader-wrapper">
+			<div id="loader"></div>
+			<div class="loader-section section-left"></div>
+			<div class="loader-section section-right"></div>
+			<div class="load_title">正在加载系统资源,请耐心等待</div>
 		</div>
-		<script type="module" src="/src/main.js"></script>
-	</body>
+	</div>
+	<script type="module" src="/src/main.js"></script>
+</body>
 
 </html>

+ 7 - 0
src/api/document/document.js

@@ -36,10 +36,17 @@ function delDocument(data) {
         method: "delete",
     })
 }
+function fileTree(data){
+    return request({
+        url:`/biz/dir/file-tree/${data}`,
+        method:"get"
+    })
+}
 export default {
     getALLdocument,
     addDocument,
     delDocument,
     editDocument,
     getTop,
+    fileTree,
 }

+ 1 - 2
src/components/OnlyOffice/index.vue

@@ -94,7 +94,7 @@
 							},
 						},
 						user: {
-							id: option.user.id,
+							id: option.user.id+'',
 							name: option.user.name
 						},
 						mode: option.model ? option.model : 'edit',
@@ -108,7 +108,6 @@
 					height: document.body.clientHeight - 150,
 					token: option.token || ''
 				}
-
 				// eslint-disable-next-line no-undef,no-unused-vars
 				this.docEditor = new DocsAPI.DocEditor('jjtOnlyOffice', config)
 

+ 101 - 65
src/views/myfile/MyFile.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="overflow: hidden;">
         <div class="bigBox">
             <div class="settingBox">
                 <!-- 设置盒子顶部搜索 -->
@@ -11,9 +11,10 @@
                         </el-icon>
                     </div>
                     <div>
-                        <el-icon style="font-size: 24px;" @click="createNewFile">
+                        <el-icon style="font-size: 24px;" @click="createNewMenu">
                             <Plus />
                         </el-icon>
+                        <!-- @click="createNewFile" -->
                     </div>
                 </div>
                 <!-- 方块点击盒子 -->
@@ -71,7 +72,8 @@
                             style="display: flex;width: 82px;height: 32px;justify-content: flex-start;align-items: center;">
                             <div style="margin-left: 5px;">
                                 <el-icon
-                                    style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;">
+                                    style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
+                                    @click="createNewMenu">
                                     <Plus />
                                 </el-icon>
                             </div>
@@ -107,7 +109,7 @@
                         <div style="display: flex;justify-content: space-around;align-items: center;">
                             <!-- 前进后退 -->
                             <div style="display: flex;justify-content: space-around;align-items: center;">
-                                <img style="display:block;width: 11px;height: 11px;" :src="blueLeft" alt="">
+                                <img style="display:block;width: 11px;height: 11px;" :src="blueLeft" alt="" @click="getAllTop()">
                                 <img style="display:block;width: 16px;height: 16px;" :src="grayRight" alt="">
                             </div>
                             <!-- 面包屑 -->
@@ -121,6 +123,9 @@
                             <img :src="squre" alt="">
                         </div>
                     </div>
+                    <div v-else>
+                        <el-button @click="editOnline = true">返回</el-button>
+                    </div>
                 </div>
                 <!-- 展示文件夹盒子 -->
                 <div v-if="editOnline">
@@ -274,7 +279,7 @@
             </div>
             <!-- 新增文件夹弹窗 -->
             <div>
-                <el-dialog v-model="addBoser" title="Tips" width="30%">
+                <el-dialog v-model="addBoser" title="新建文件夹" width="30%">
                     <el-form :model="boserForm" label-width="120px">
                         <!-- <el-form-item label="空间id">
                             <el-input v-model="boserForm.spaceId" />
@@ -305,24 +310,19 @@
                     </template>
                 </el-dialog>
             </div>
+            <!-- 废弃的顶层目录新增 -->
             <div>
                 <el-dialog v-model="addFile" title="Tips" width="30%">
                     <el-form :model="fileForm" label-width="120px">
                         <el-form-item label="空间类型">
-                            <el-input v-model="fileForm.spaceType" />
+                            <el-select v-model="spaceValue" placeholder="请选择空间类型">
+                                <el-option v-for="(item, index) in spaceSelect" :key="item.value" :label="item.label"
+                                    :value="item.value" :disabled="item.disabled" />
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="空间名称">
                             <el-input v-model="fileForm.spaceName" />
                         </el-form-item>
-                        <el-form-item label="空间容量">
-                            <el-input v-model="fileForm.spaceCap" />
-                        </el-form-item>
-                        <el-form-item label="已使用空间">
-                            <el-input v-model="fileForm.usedCap" />
-                        </el-form-item>
-                        <el-form-item label="剩余空间">
-                            <el-input v-model="fileForm.freeCap" />
-                        </el-form-item>
                         <el-form-item label="备注">
                             <el-input v-model="fileForm.remark" />
                         </el-form-item>
@@ -437,7 +437,7 @@ import fileShare from '../../api/fileShare/fileShare'
 import collect from '../../api/collect/collect'
 import fileCount from '../../api/fileCount/fileCount'
 import BreadMenu from './components/BreadMenu.vue'
-import FileEdit from './components/fileedit.vue'
+import FileEdit from './components/FileEdit.vue'
 import ImgFile from "./jsComponents/ImgFile"
 import { Search } from '@element-plus/icons-vue'
 import blueLeft from '../../assets/images/blueLeft.png'
@@ -500,9 +500,6 @@ export default {
         let fileForm = ref({
             spaceType: '',
             spaceName: "",
-            spaceCap: "",
-            usedCap: "",
-            freeCap: "",
             remark: "",
         })
         let fileList = ref([
@@ -624,10 +621,26 @@ export default {
         let fileMenu = ref([])
         let collectList = ref([])
         let copyRow = ref({})
-        // 获取所有文件
-        function getAll() {
-            
-        }
+        let spaceValue = ref("")
+        let newDirId = ref('')
+        let newSpaceId = ref('')
+        let spaceSelect = ref([
+            {
+                label: "个人空间",
+                value: 3,
+            },
+            {
+                label: "部门空间",
+                value: 2,
+                disabled: true
+            },
+            {
+                label: "公共空间",
+                value: 1,
+                disabled: true
+            },
+
+        ])
         // 获取用户树
         function getAllUser() {
             userTree.getUserTree({}).then(res => {
@@ -664,28 +677,36 @@ export default {
         // 获取文件夹,中栏,文件
         function getAllTop() {
             documents.getTop(3).then(res => {
-                fileMenu.value = [res]
-                documents.getALLdocument({ parentId: fileMenu.value[0].parentId - 0, spaceId: fileMenu.value[0].spaceId - 0 }).then(res => {
+                let userMe = [res]
+                documents.getALLdocument({ dirId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId }).then(res => {
+                    fileMenu.value = res.data
                     folderList.value = res.data
                 })
-                myfile.getAllFileMenu({ dirId: fileMenu.value[0].dirId - 0 }).then(res => {
-                if (res.code === 200) {
-                    fileList.value = res.rows
-                }
-            })
+                myfile.getAllFileMenu({ dirId: userMe[0].dirId - 0 }).then(res => {
+                    if (res.code === 200) {
+                        fileList.value = res.rows
+                    }
+                })
             })
         }
-        // 获取所有文件夹
-        function getAllFolder() {
-
-        }
         function changeFile(row, num) {
             copyParentId.value = row.parentId
-            getAllFolder()
+            newDirId.value = row.dirId
+            newSpaceId.value = row.spaceId
+            documents.getALLdocument({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 }).then(res => {
+                folderList.value = res.data
+                if (res.code === 200) {
+                    myfile.getAllFileMenu({ dirId: res.data[0].dirId - 0 }).then(res => {
+                        if (res.code === 200) {
+                            fileList.value = res.rows
+                        }
+                    })
+                }
+            })
             this.selectedIndex = num
             const newItem = {
-                name: row.spaceName,
-                choose: row.spaceId
+                name: row.dirName,
+                choose: row.dirName
             };
             // 检查 newItem 是否已存在于 menuList 中
             const isItemExist = menuList.value.some(item => item.choose === newItem.choose);
@@ -757,7 +778,7 @@ export default {
                             type: "success",
                             message: "删除成功"
                         })
-                        getAll()
+                        getAllTop()
                     }
                 })
             }
@@ -793,6 +814,7 @@ export default {
             }
             if (row.name === '在线编辑') {
                 editOnline.value = false
+                cliCC.value = false
             }
         }
         function chooseSet1() {
@@ -806,16 +828,19 @@ export default {
         function createNewMenu() {
             addBoser.value = true
         }
-        // 新文件夹
+        // 新文件夹
         function sureAddBoser() {
-            documents.addDocument({
-                "dirName": boserForm.value.dirName,
-                // "dirRole": boserForm.value.dirPower,
-                // "dirType": boserForm.value.dirType,
-                "parentId": copyParentId.value - 0,
-                // "remark": boserForm.value.remark,
-                "spaceId": fileMenu.value[0].spaceId-0,
-            }).then(res => {
+            if (newDirId.value === '' || newSpaceId.value === "") {
+                newDirId.value = fileMenu.value[0].dirId
+                newSpaceId.value = fileMenu.value[0].spaceId
+            }
+            documents.addDocument(
+                {
+                    "dirName": boserForm.value.dirName,
+                    "parentId": newDirId.value - 0,
+                    "spaceId": newSpaceId.value - 0,
+                }
+            ).then(res => {
                 if (res.code === 200) {
                     ElMessage({
                         message: '添加成功',
@@ -836,9 +861,6 @@ export default {
                 {
                     "spaceName": fileForm.value.spaceName,
                     "spaceType": fileForm.value.spaceType,
-                    "spaceCap": fileForm.value.spaceCap - 0,//空间容量
-                    "usedCap": fileForm.value.usedCap - 0,//已用空间
-                    "freeCap": fileForm.value.freeCap - 0,//剩余空间
                     "remark": fileForm.value.remark,//备注
                 }
             ).then(res => {
@@ -847,7 +869,7 @@ export default {
                         message: "新增成功",
                         type: "success"
                     })
-                    getAllMiddle()
+                    getAllTop()
                     addFile.value = false
                 } else {
                     ElMessage({
@@ -867,10 +889,14 @@ export default {
         // 确认上传
         function sureUpload() {
             if (fileArr.value.length > 0) {
+                if (newDirId.value === '' || newSpaceId.value === "") {
+                    newDirId.value = fileMenu.value[0].dirId
+                    newSpaceId.value = fileMenu.value[0].spaceId
+                }
                 for (var i = 0; i <= fileArr.value.length; i++) {
                     myfile.uploadFile({
-                        spaceId: fileMenu.value[0].spaceId-0,
-                        dirId: fileMenu.value[0].dirId-0,
+                        spaceId: newSpaceId.value - 0,
+                        dirId: newDirId.value - 0,
                         file: fileArr.value[i]
                     }).then(res => {
                         if (res.code === 200) {
@@ -956,7 +982,7 @@ export default {
                             message: "删除成功",
                             type: "success"
                         })
-                        getAll()
+                        getAllTop()
                     }
                 })
             }
@@ -982,8 +1008,17 @@ export default {
         }
         // 文件夹每行点击事件
         function folderClick(row, list) {
-            folderId.value = row.dirId
-            getAll()
+            // 上一级dirId就是下一级的parentId
+            newDirId.value = row.dirId
+            newSpaceId.value = row.spaceId
+            documents.getALLdocument({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 }).then(res => {
+                folderList.value = res.data
+                myfile.getAllFileMenu({ dirId: res.data[0].dirId - 0 }).then(res => {
+                    if (res.code === 200) {
+                        fileList.value = res.rows
+                    }
+                })
+            })
         }
         // 确认文件重命名
         function sureChangeName() {
@@ -1003,7 +1038,7 @@ export default {
                         type: "success"
                     })
                     fileNameChange.value = false
-                    getAll()
+                    getAllTop()
                 }
             })
         }
@@ -1083,7 +1118,7 @@ export default {
             }
             if (this.folderId === '') {
                 this.folderId = 0
-                this.getAll()
+                this.getAllTop()
             }
         }
         // 中栏重命名
@@ -1106,7 +1141,6 @@ export default {
             allBag,
             folderList,//文件夹的数据
             fileList,//文件夹的数据
-            getAll,//拿到数据的方法
             searchFire,//搜索文件的model
             changeFile,//切换右侧视图的file
             menuList,//右侧切换
@@ -1204,22 +1238,22 @@ export default {
             isId,
             editOnline,//在线编辑
             copyParentId,
-            getAllFolder,
             folderName,
             sureFolderName,
             copyRow,
             getAllTop,
+            spaceValue,
+            spaceSelect,
+            newDirId,
+            newSpaceId,
         }
     },
     created() {
         this.getAllTop()
-        this.getAll();
         this.getSpace()
-        // this.getAllMiddle()
         this.getAllUser()
         this.getAllCollect()
         this.isId()
-        this.getAllFolder()
 
     },
     watch: {
@@ -1387,7 +1421,7 @@ p {
 
 .setCli {
     width: 156px;
-    height: auto;
+    height: 400px;
     position: absolute;
     top: -70px;
     left: 300px;
@@ -1395,11 +1429,12 @@ p {
     border: 1px solid gray;
     border-radius: 4px;
     z-index: 2;
+    overflow-y: auto;
 }
 
 .setCli1 {
     width: 156px;
-    height: auto;
+    height: 400px;
     position: absolute;
     top: 185px;
     left: 155px;
@@ -1407,6 +1442,7 @@ p {
     border: 1px solid gray;
     border-radius: 4px;
     z-index: 2;
+    overflow-y: auto;
 }
 
 .chooseSet {

+ 4 - 4
src/views/myfile/components/FileEdit.vue

@@ -3,7 +3,6 @@
         <div class='qualityManual-container-office'>
             <jjtOnlyOffice :option='option' />
         </div>
-        <p>222</p>
     </div>
 </template>
 
@@ -60,10 +59,11 @@ export default {
                 option.value.fileType = obj.fileType.replace(".", "");
                 option.value.editUrl = `${window.location.origin}${import.meta.env.VITE_APP_BASE_API}/only-office/callback/${obj.docId}?name=${useUserStore().uname}`;
                 option.value.user = {
-				id: useUserStore().uid, //用户ID
-				name: useUserStore().uname //用户姓名
-			};
+                    id: useUserStore().uid, //用户ID
+                    name: useUserStore().uname //用户姓名
+                };
             });
+            console.log(option.value,'option');
         }
         /** 修改按钮操作 */
         function edit() {