Explorar o código

fix:删除原有登录页面路由,将其改为管理员页面

廖彦舟 hai 1 ano
pai
achega
52378ba83c

+ 18 - 12
src/router/index.ts

@@ -20,19 +20,20 @@ const router = createRouter({
       path: "/",
       redirect: () => {
         window.location.href = "https://p-nju.seec.seecoder.cn/login?from=https://air-nju.seec.seecoder.cn";
+        // window.location.href = "http://localhost:8000/login?from=http://localhost:4000";
         // {本地门户首页地址}?from={本地eai首页地址}
         return "/"; // 占位返回值,实际不会执行
     },
     },
-    {
-      path: "/",
-      redirect: "/login"
-    },
-    {
-      path: '/login',
-      name: 'login',
-      component: () => import('../views/LoginPage/LoginPage.vue')
-    },
+    // {
+    //   path: "/",
+    //   redirect: "/login"
+    // },
+    // {
+    //   path: '/login',
+    //   name: 'login',
+    //   component: () => import('../views/LoginPage/LoginPage.vue')
+    // },
     {
       path: '/register',
       name: 'register',
@@ -149,6 +150,11 @@ const router = createRouter({
       name: 'adminLogin',
       component: () => import("../views/AdminPage/LoginPage/AdminLoginPage.vue"),
     },
+    // {
+    //   path: "/admin/login",
+    //   name: 'adminLogin',
+    //   component: () => import("../views/LoginPage/LoginPage.vue"),
+    // },
     {
       path: "/manager",
       name: "manager",
@@ -189,7 +195,7 @@ const router = createRouter({
  */
   router.beforeEach(async (to) => {
     const store = useStore();
-    const publicPaths = ['/login', '/register', '/passwordChange', '/admin/login'];
+    const publicPaths = [ '/register', '/passwordChange', '/admin/login'];
     // 1. 检查URL中的token
     const urlToken = new URLSearchParams(window.location.search).get('token');
     if (urlToken) {
@@ -224,11 +230,11 @@ const router = createRouter({
     if (publicPaths.includes(to.path)) return true;
 
     if (!store.user?.role) {
-      return '/login';
+      return '/';
     }
 
     if (to.meta?.roles && !to.meta.roles.includes(store.user.role)) {
-      return '/login';
+      return '/home';
     }
 
     return true;

+ 5 - 4
src/views/CorrectPage/CorrectPage.vue

@@ -42,7 +42,7 @@
           <template #default="scope">
             <!-- <a :href="scope.row.recordFileUrl" target="_blank">{{ scope.row.recordFileUrl }}</a> -->
             <span>{{ scope.row.recordFileUrl }}</span>
-          </template> 
+          </template>
         </el-table-column>
         <el-table-column prop="createdAt" label="时间">
           <template #default="scope">
@@ -124,7 +124,8 @@ async function fetchData() {
       })
     }).catch((_err: any) => {
       console.log(_err)
-      router.push("/login")
+      // router.push("/login");
+      router.go(-1);
     })
 }
 
@@ -162,10 +163,10 @@ onMounted(() => {
 export default {
   methods: {
     goBack() {
-      // 使用Vue Router的$router.go(-1)来返回上一个页面  
+      // 使用Vue Router的$router.go(-1)来返回上一个页面
       this.$router.go(-1);
     },
   },
   name: "CorrectPage"
 }
-</script>
+</script>

+ 21 - 21
src/views/LoginPage/component/PasswordChange.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="login-style">
       <div class="box-vessel">
-  
+
         <div class="vessel-title">重置密码</div>
 
         <el-form label-position="right" label-width="0" :rules="rules" :model="passwordChangeDTO" ref="formRef" :size="formSize">
@@ -31,26 +31,26 @@
                 </template>
               </el-input>
             </el-form-item>
-  
+
           <div style="display: flex; justify-content: center; align-items: center;">
             <el-button @click="changePassword(formRef)" class="login-button">重置密码</el-button>
           </div>
-  
+
           <!-- 返回登录页面,下划线灰色小字 -->
           <div style="display: flex; justify-content: center; align-items: center; margin-top: 10px;">
             <router-link to="/login" style="color: #8e8e8e; text-decoration: underline;">记得密码? 前往登录</router-link>
           </div>
-  
+
         </el-form>
-  
+
       </div>
-  
+
     </div>
-  
-  
-  
+
+
+
   </template>
-  
+
   <script lang="ts" setup>
   import "./index.scss";
   import { reactive, ref } from "vue";
@@ -60,21 +60,21 @@
   import { useCountdown } from '@/hooks/useCountdown';
 
   const { start, isStart, countdown } = useCountdown();
-  
+
   const apis = useApis()
 
-  type passwordChangeDTO = {
+  type PasswordChangeDTO = {
     officialEmail: "",
     password1: "",
     password2: "",
     verifyCode: ""
   }
-  let passwordChangeDTO = reactive<passwordChangeDTO>({} as passwordChangeDTO)
-  
+  let passwordChangeDTO = reactive<PasswordChangeDTO>({} as PasswordChangeDTO)
+
 
   const formSize = ref<ComponentSize>('default')
   const formRef = ref<FormInstance>()
-  const rules = reactive<FormRules<passwordChangeDTO>>({
+  const rules = reactive<FormRules<PasswordChangeDTO>>({
     officialEmail: [
       {
         required: true,
@@ -106,7 +106,7 @@
   })
 
 
-  
+
   const changePassword = async (formEl: FormInstance | undefined) => {
     if (!formEl) return
     await formEl.validate((valid, fields) => {
@@ -114,7 +114,7 @@
         if(passwordChangeDTO.password1 != passwordChangeDTO.password2) {
           ElMessage({message: '两次输入密码不一致', type: 'error'})
           return
-        } 
+        }
         let data = {
           officialEmail: passwordChangeDTO.officialEmail,
           password: passwordChangeDTO.password1,
@@ -136,10 +136,10 @@
       }
     })
   }
-  
+
   const sendPasswordChangeVerifyCode = () => {
     start();
-    
+
     apis.sendPasswordChangeVerifyCode(passwordChangeDTO.officialEmail)
     .then((res: any) => {
       if (res.data.code === 200) {
@@ -155,9 +155,9 @@
     .finally(() => {});
   }
   </script>
-  
+
   <script lang="ts">
   export default {
     name: "PasswordChange"
   }
-  </script>
+  </script>