我的文件高度异常

index.html

@@ -9,7 +9,8 @@
 		<link rel="icon" href="/favicon.ico">
 		<title>若依管理系统</title>
 		<!--引入onlyoffice组件-->
-		<script type="text/javascript" src="http://192.168.1.28: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> -->
+		<script type="text/javascript" src="http://8.142.173.95: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,

src/layout/indexCommon.vue

@@ -113,14 +113,26 @@
                 :data-item="JSON.stringify(item)"
               >
                 <template #label>
-                  <div class="tab_pane" @click="paneClick(item)">
+                  <!-- <div class="tab_pane" @click="paneClick(item)">
                     <div class="tab_text">{{ item.label }}</div>
                     <img
                       src="@/assets/images/close.png"
                       @click="closeTab(item, index, $event)"
                       alt=""
                     />
-                  </div>
+                  </div> -->
+                  <router-link
+                    :key="item"
+                    :data-path="item.path"
+                    :to="{
+                      path: item.path,
+                      query: {row:item.clickRowId},
+                    }"
+                    @click="paneClick(item)"
+                    class="tags-view-item"
+                  >
+                  {{item.label}}
+                  </router-link>
                 </template>
               </el-tab-pane>
               <!-- 文件的iframe -->
@@ -216,7 +228,9 @@ const uid = useUserStore().uid;
 const iFrameData = ref([
   {
     id: 1,
-    src: `http://192.168.1.9:81/fileEdit?clickRowId=1197`,
+    // src: `http://192.168.1.9:81/fileEdit?clickRowId=1197`,
+    // src: `${window.location.origin}/fileEdit?clickRowId=1197`,
+    src: ``,
     show: false,
     name: "file1",
   },
@@ -534,7 +548,7 @@ const addFileTab = (data) => {
   const arr = oldIFrameData.map((par) => {
     if (!par.src) {
       if (thisData.docId) {
-        par.src = `http://192.168.1.9:81/fileEdit?clickRowId=${thisData.docId}`;
+        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
         par.name = data.fileName;
         thisData.docId = "";
       }
@@ -542,11 +556,11 @@ const addFileTab = (data) => {
     return toRaw(par);
   });
   iFrameData.value = arr;
-  console.log("addFileTab", arr);
+  // console.log("addFileTab", arr);
 };
 //创建tab标签事件
 const addTab = (data) => {
-  console.log("addTab", data);
+  // console.log("addTab", data);
   const arr = toRaw(editableTabs.value);
   if (!arr.some((item) => item.label == data.fileName)) {
     // editableTabs.value.push({

src/router/index.js

@@ -116,6 +116,15 @@ export const constantRoutes = [{
 					icon: 'dashboard'
 				},
 			},
+			// {
+			// 	path: "/myfile",
+			// 	component: () => import("@/views/myfile/MyFile"),
+			// 	name: "myfile",
+			// 	meta: {
+			// 		title: "我的文件",
+			// 		icon: "myfile"
+			// 	}
+			// },
 			{
 				path: "/myfile",
 				component: () => import("@/views/myfile/MyFile"),
@@ -123,7 +132,16 @@ export const constantRoutes = [{
 				meta: {
 					title: "我的文件",
 					icon: "myfile"
-				}
+				},
+				children: [{
+					path: '/myfile:dirId(\\d+)',
+					component: () => import('@/views/myfile/MyFile'),
+					name: 'myfile',
+					meta: {
+						title: '我的文件',
+						activeMenu:'/myfile'
+					}
+				}]
 			},
 			{
 				path: "/myjoin",

src/views/biz/recent/index.vue

@@ -269,8 +269,9 @@ const copyOrMove = ref();
 const backFolder = ref();
 const copyFolderName = ref();
 const addFolderAdd = inject("addFolderAdd");
+const addFileTab = inject("addFileTab");
 let collects = ref(false);
-const spacePath = ref()
+const spacePath = ref();
 let menuList = ref([
   {
     name: "我的空间",
@@ -457,7 +458,7 @@ async function chooseSet(row, index, num) {
       spacePath.value = "/myfile";
     } else if (spaceData.data.spaceType == "1") {
       spacePath.value = "/publicment";
-    }else{
+    } else {
       spacePath.value = "/department";
     }
     const addData = {
@@ -477,7 +478,8 @@ async function chooseSet(row, index, num) {
     const filePreview = canPreviewFile(copyFileType.value);
     if (filePreview) {
       loadingPreview.value = false;
-      addTab(clickRow.value);
+      // addTab(clickRow.value);
+      addFileTab(clickRow.value);
       onlyView.value = true;
       // editOnline.value = false
       cliCC.value = false;

src/views/department/MyFile.vue

@@ -355,7 +355,7 @@
     </div>
     <!-- 图片预览 -->
     <!-- 历史版本 -->
-    <historyList :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
+    <historyList v-if="openForwardFile"  :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
         @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data" @changeMsgClose="changeMsgClose"
         :historyTotal="historyTotal">
     </historyList>
@@ -600,6 +600,7 @@ export default {
         const loadingPreview = ref(false)
         const noMenuItem = ref(false)
         const addTab = inject("addTab");
+        const addFileTab = inject("addFileTab");
         // 获取文件夹，中栏，文件
         function getAllTop() {
             documents.getTop(2).then(res => {
@@ -809,27 +810,27 @@ export default {
                 collects.value = true
             }
             if (row.name === '在线编辑') {
-                editOnline.value = false
-                cliCC.value = false
-                const newItem = {
-                    name: copyFileName.value,
-                    choose: copyFileId.value,
-                    dirIds: copyDirId.value,
-                    spaceIds: copySpaceId.value
-                };
-                // 检查 newItem 是否已存在于 menuList 中
-                const isItemExist = menuList.value.some(item => item.choose === newItem.choose);
-                // 如果不存在，则添加它
-                if (!isItemExist) {
-                    menuList.value.push(newItem);
-                }
-                selectedIndex.value = selectedIndex.value + 1
+                loadingPreview.value = true
+                // const filePreview = canPreviewFile(copyFileType.value)
+                // if (filePreview) {
+                     loadingPreview.value = false
+                    addFileTab(clickRow.value);
+                    onlyView.value = false
+                    // editOnline.value = false
+                    cliCC.value = false
+                // } else {
+                //     const res = await preview(copyRow.value.docId)
+                //     showPreview.value = true
+                //     previewData.value = URL.createObjectURL(res)
+                // }
+                loadingPreview.value = false
             }
             if (row.name === '文字识别') {
                 router.push({
                     path: '/identifyFont',
-                    query: {
-                        fileId: copyFileId.value,
+                      query: {
+                        docId: copyRow.value.docId,
+                        fileId: copyRow.value.fileId,
                         fileType: copyFileType.value
                     }
                 })
@@ -839,7 +840,8 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                     loadingPreview.value = false
-                    addTab(clickRow.value);
+                    // addTab(clickRow.value);
+                    addFileTab(clickRow.value)
                     onlyView.value = true
                     // editOnline.value = false
                     cliCC.value = false
@@ -1650,7 +1652,8 @@ export default {
             thisRole,
             noMenuItem,
             downLoadfile,
-            addTab
+            addTab,
+            addFileTab
         }
     },
     watch: {

src/views/login.vue

@@ -241,9 +241,9 @@ async function handleLogin() {
       // console.log("pass",loginForm.value
       // console.log("sm3",sm3('123456'));
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
-      Cookies.set("pass", sm3(loginForm.value.password), {
-        expires: 30,
-      });
+      // Cookies.set("pass", sm3(loginForm.value.password), {
+      //   expires: 30,
+      // });
       if (loginForm.value.rememberMe) {
         Cookies.set("username", loginForm.value.username, { expires: 30 });
         Cookies.set("password", sm3(loginForm.value.password), {
@@ -258,11 +258,18 @@ async function handleLogin() {
       }
       // 调用action的登录方法
       const query = loginForm.value;
-      if (oldUseName.value != loginForm.value.username || oldUsePass.value != query.password) {
+      if (
+        oldUseName.value != loginForm.value.username ||
+        oldUsePass.value != query.password
+      ) {
         //如果登录的和记录的用户不是同一个, 或者同一个用户但是重新输入了密码，那就需要sm3加密
+          Cookies.set("pass", sm3(loginForm.value.password), {
+          expires: 30,
+        });
         query.password = sm3(query.password);
+      
       }
-        // console.log("query", query);
+      // console.log("query", query);
       userStore
         .login(query)
         .then(async (res) => {
@@ -328,13 +335,14 @@ const submitForm = async (formEl) => {
   // console.log("formEl", formEl);
   await formEl.validate((valid) => {
     if (valid) {
-      updateUserPwd(sm3(formData.value.oldpss), sm3(formData.value.newpass)).then(
-        (response) => {
-          console.log("response", response);
-          ElMessage({ message: "修改成功,请重新登录", type: "success" });
-          showEdit.value = false;
-        }
-      );
+      updateUserPwd(
+        sm3(formData.value.oldpss),
+        sm3(formData.value.newpass)
+      ).then((response) => {
+        console.log("response", response);
+        ElMessage({ message: "修改成功,请重新登录", type: "success" });
+        showEdit.value = false;
+      });
     } else {
       ElMessage({ message: "请输入符合规则的密码", type: "error" });
       userStore.logOut();

src/views/myfile/MyFile.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div class="bigBox">
-            <div class="settingBox" @click="mouseClick">
+            <div  class="settingBox" @click="mouseClick">
                 <!-- 设置盒子顶部搜索 -->
                 <div class="topSearch">
                     <div style="position: relative;">
@@ -53,7 +53,7 @@
                 </div>
             </div>
             <!-- 右侧大盒子 -->
-            <div class="mesBox">
+            <div  class="mesBox">
                 <!-- 功能盒子  -->
                     <!-- table切换 -->
                 <!-- <div class="useBox">
@@ -289,14 +289,14 @@
                 </div>
                
                     </div>
-                <div v-else>
+                <!-- <div v-else>
                     <div>
                         <el-button @click="editOnline = true; historyPrew = false">返回</el-button>
                     </div>
                     <FileEdit :docId="clickRowId" :copyRow="copyRow" :historyPrew="historyPrew"
                         :historycopyRow="historycopyRow" :onlyView="onlyView" @cancleHistoryPrew="cancleHistoryPrew">
                     </FileEdit>
-                </div>
+                </div> -->
             </div>
 
             <!-- 扩容弹窗 -->
@@ -372,7 +372,7 @@
     </div>
     <!-- 图片预览 -->
     <!-- 历史版本 -->
-    <historyList :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
+    <historyList v-if="openForwardFile" :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
         @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data" @changeMsgClose="changeMsgClose"
         :historyTotal="historyTotal">
     </historyList>
@@ -391,7 +391,7 @@ import documents from '../../api/document/document'
 import fileCount from '../../api/fileCount/fileCount'
 import FileTree from './components/FileTree.vue'
 import BreadMenu from './components/BreadMenu.vue'
-import FileEdit from './components/FileEdit.vue'
+// import FileEdit from './components/FileEdit.vue'
 import TransferModal from './modalComponebts/Transfer.vue'
 import CreateFloder from './modalComponebts/CreateFloder.vue'
 import FileCollect from './modalComponebts/FileCollect.vue'
@@ -668,7 +668,7 @@ export default {
             // 创建标签
            
             const addData = {
-                path:route.path,
+                path:route.path+row.dirId,
                 name:row.dirName,
                 row:toRaw(row)
             }
@@ -1495,7 +1495,7 @@ export default {
         const surePass = (pass)=>{
             const passwordCookies = Cookies.get("pass");
             // console.log('pass',pass);
-            // console.log('oldPass',oldPass);
+            // console.log('oldPass',passwordCookies);
             // console.log('clickRow',clickRow);
             showInputPassword.value = false
             if(pass === passwordCookies){
@@ -1514,9 +1514,9 @@ export default {
                  setTimeout(()=>{
                     const passArr = localStorage.getItem('passArr');
                     const passArrObj = JSON.parse(passArr)
-                    console.log('```passArrObj',passArrObj);
+                    // console.log('```passArrObj',passArrObj);
                     const newArr = passArrObj.filter(item=>item != clickRow.value.docId)
-                    console.log('```newArr',newArr);
+                    // console.log('```newArr',newArr);
                     localStorage.setItem('passArr',JSON.stringify(newArr))
                 },1000*30)
                 chooseSet(chooseRow.value,null,chooseNum.value) 
@@ -1559,7 +1559,7 @@ export default {
             // 添加监听，点击其他地方关闭文件夹右键菜单
             window.addEventListener("click", closeRMenu, true);
             window.addEventListener("click", mouseClick, true);
-            console.log('onMounted');
+            // console.log('onMounted');
         })
         onActivated(()=>{
             // console.log('route.query',route.query);
@@ -1748,7 +1748,7 @@ export default {
     },
     components: {
         BreadMenu,
-        FileEdit,
+        // FileEdit,
         ImgPreview,
         FileTree,
         historyList,
@@ -1789,7 +1789,7 @@ p {
 
 .settingBox {
     width: 25vw;
-    height: 92vh;
+    height: 92vh - 32px;
     border: 1px solid black;
     border-radius: 4px;
     /* margin: 5px 5px; */
@@ -1854,7 +1854,7 @@ p {
 
 .mesBox {
     width: 75vw;
-    height: 92vh;
+    height: 92vh - 32px;
     border-radius: 4px;
     background-color: white;
 }

src/views/myfile/components/FileEdit.vue

@@ -127,15 +127,15 @@ export default {
       // let row = JSON.parse(newObj.value)
       // console.log(row, '852');
     });
-    onBeforeRouteUpdate((to,from)=>{
-      console.log('to',to);
-      console.log('from',from);
-     docId = to.query.clickRowId
-      // console.log(docId, "doc");
-      // console.log(copyRow, "row");
-      // edit();
-    edit();
-    })
+    // onBeforeRouteUpdate((to,from)=>{
+    //   console.log('to',to);
+    //   console.log('from',from);
+    //  docId = to.query.clickRowId
+    //   // console.log(docId, "doc");
+    //   // console.log(copyRow, "row");
+    //   // edit();
+    // edit();
+    // })
     return {
       option,
       show,

src/views/myfile/components/inputPassword.vue

@@ -39,6 +39,7 @@ const close = () => {
   emit("closeIptPass");
 };
 const sure = () => {
+  // console.log('password',password.value);
   emit("surePass", sm3(password.value));
   password.value = "";
 };

src/views/publicment/MyFile.vue

@@ -355,7 +355,7 @@
     </div>
     <!-- 图片预览 -->
     <!-- 历史版本 -->
-    <historyList :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
+    <historyList v-if="openForwardFile"  :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
         @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data" @changeMsgClose="changeMsgClose"
         :historyTotal="historyTotal">
     </historyList>