905-

src/layout/indexCommon.vue

@@ -847,6 +847,7 @@ const upFileData = (query)=>{
   iFrameData.value = JSON.parse(JSON.stringify(arr))
   // console.log('iFrameData',iFrameData.value);
 }
+// 删除文件夹
 const delFolderDataFn = (row)=>{
   // console.log('delFolderDataFn',row);
   // console.log('router.currentRoute.value.path',router.currentRoute.value.params.dirId);
@@ -864,6 +865,7 @@ const delFolderDataFn = (row)=>{
   editableTabs.value = newArr
   // console.log('editableTabs',editableTabs.value);
 }
+// 删除文件
 const delFileFn = (id)=>{
  const has =  iFrameData.value.find(item =>item.docId == id);
   if(has){
@@ -871,6 +873,12 @@ const delFileFn = (id)=>{
     return true
   }
 }
+//删除菜单
+const delMenuFn = (name)=>{
+  const arr = toRaw(editableTabs.value);
+  const newArr = arr.filter(item=>item.label != name)
+  editableTabs.value = JSON.parse(JSON.stringify(newArr));
+}
 provide("addTab", addTab);
 provide("addFolderAdd", addFolderAdd);
 provide("addFileTab", addFileTab);
@@ -879,6 +887,7 @@ provide("upFileData", upFileData);
 provide("clickPath", clickPath);
 provide("delFolderDataFn", delFolderDataFn);
 provide("delFileFn", delFileFn);
+provide("delMenuFn", delMenuFn);
 // TODO 删除tab事件
 const closeTab = (item, index, e) => {
   e.preventDefault();

src/views/department/MyFile.vue

@@ -94,7 +94,7 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 0)"
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">

src/views/login.vue

@@ -181,6 +181,7 @@ watch(
 
 async function handleLogin() {
   proxy.$refs.loginRef.validate((valid) => {
+    const usePass = JSON.parse(JSON.stringify(loginForm.value.password))
     if (valid) {
       // console.log('loginvalid',valid);
       loading.value = true;
@@ -192,7 +193,7 @@ async function handleLogin() {
       // });
       if (loginForm.value.rememberMe) {
         Cookies.set("username", loginForm.value.username, { expires: 30 });
-        Cookies.set("password", sm3(loginForm.value.password), {
+        Cookies.set("password", sm3(usePass), {
           expires: 30,
         });
         Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
@@ -203,24 +204,30 @@ async function handleLogin() {
         Cookies.remove("rememberMe");
       }
       // 调用action的登录方法
-      const query = loginForm.value;
+      // const query = loginForm.value;
+      const query = {
+        username: loginForm.value.username,
+        password: JSON.parse(JSON.stringify(loginForm.value.password)),
+        rememberMe: loginForm.value.rememberMe,
+        code: loginForm.value.code,
+        uuid: loginForm.value.uuid,
+      };
       if (
         oldUseName.value != loginForm.value.username ||
         oldUsePass.value != query.password
       ) {
         //如果登录的和记录的用户不是同一个, 或者同一个用户但是重新输入了密码，那就需要sm3加密
-          Cookies.set("pass", sm3(loginForm.value.password), {
+          Cookies.set("pass", sm3(usePass), {
           expires: 30,
         });
         query.password = sm3(query.password);
       
       }
-      // console.log("query", query);
       userStore
         .login(query)
         .then(async (res) => {
           const infoRes = await getInfo();
-          console.log("infoRes", infoRes);
+          // console.log("infoRes", infoRes);
           // console.log('loginres',res);
           if (infoRes.repass) {
             // Cookies.remove('Admin-Token')
@@ -229,7 +236,7 @@ async function handleLogin() {
             loading.value = false;
             // userStore.logOut();
           } else {
-            console.log('redirect',redirect.value);
+            // console.log('redirect',redirect.value);
             // router.push({ path: redirect.value || "/home" });
             router.push({ path: "/home" });
           }

src/views/publicment/MyFile.vue

@@ -92,7 +92,7 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 0)"
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">

src/views/system/user/profile/userInfo.vue

@@ -40,6 +40,7 @@ import {
 } from "vue";
 import { updateUserProfile,getUserProfile } from "@/api/system/user";
 import { encode, decode } from '@/utils/sm2util'
+const delMenuFn = inject("delMenuFn");
 const props = defineProps({
   user: {
     type: Object
@@ -77,6 +78,7 @@ function submit() {
 /** 关闭按钮 */
 function close() {
   // proxy.$tab.closePage();
+  delMenuFn('个人中心')
   clickPath(null,{label: "首页",path: "/home"})
 };
 const phoneNumChange = (num)=>{