anderx 1 месяц назад
Родитель
Сommit
8cbd7b5e2c
2 измененных файлов с 21 добавлено и 20 удалено
  1. 11 11
      src/components/NavMenu.vue
  2. 10 9
      src/views/LoginView.vue

+ 11 - 11
src/components/NavMenu.vue

@@ -27,12 +27,12 @@ onMounted(() => {
   selectedKeys.value = [route.path];
 
   watch(
-    () => route.path,
-    (path: string) => {
-      const currentOpenkeys = getOpenKeys(path);
-      openKeys.value = _.uniq(_.concat(openKeys.value, currentOpenkeys));
-      selectedKeys.value = openKeys.value;
-    }
+      () => route.path,
+      (path: string) => {
+        const currentOpenkeys = getOpenKeys(path);
+        openKeys.value = _.uniq(_.concat(openKeys.value, currentOpenkeys));
+        selectedKeys.value = openKeys.value;
+      }
   );
 });
 
@@ -73,9 +73,9 @@ function logoutConfirm(e: MouseEvent) {
 
 <template>
   <a-menu
-    v-model:openKeys="openKeys"
-    v-model:selectedKeys="selectedKeys"
-    mode="inline"
+      v-model:openKeys="openKeys"
+      v-model:selectedKeys="selectedKeys"
+      mode="inline"
   >
     <a-sub-menu key="/report">
       <template #icon>
@@ -89,7 +89,7 @@ function logoutConfirm(e: MouseEvent) {
         <RouterLink to="/report/template">模板管理</RouterLink>
       </a-menu-item>
     </a-sub-menu>
-    <a-sub-menu key="/search">
+    <!-- <a-sub-menu key="/search">
       <template #icon>
         <FileSearchOutlined />
       </template>
@@ -121,7 +121,7 @@ function logoutConfirm(e: MouseEvent) {
         <star-outlined />
       </template>
       <RouterLink to="/favorite">我的收藏</RouterLink>
-    </a-menu-item>
+    </a-menu-item> -->
     <a-menu-item key="/logout" @click="logoutConfirm">
       <template #icon>
         <logout-outlined />

+ 10 - 9
src/views/LoginView.vue

@@ -2,7 +2,7 @@
 import { reactive, ref } from 'vue';
 import user from "@/services/user.service";
 import { useAuthStore } from '@/stores/auth.store';
-import { routeToSearchPage } from '@/router';
+import { routeToSearchPage, routeToHome } from '@/router';
 
 interface FormState {
   username: string;
@@ -31,7 +31,8 @@ const onFinish = (values: any) => {
   user.login(param).then((resp) => {
     authStore.setCurrentUser(resp.data.data);
     authStore.setToken(resp.data.data.token);
-    routeToSearchPage();
+    // routeToSearchPage();
+    routeToHome();
     loading.value = false;
   }).catch((err) => {
     loading.value = false;
@@ -50,7 +51,7 @@ const onFinishFailed = (errorInfo: any) => {
     <a-row type="flex">
       <a-col class="left" :flex="1">
         <!-- <h1 class="login-title">技淘平台智慧产权大脑</h1> -->
-         <p class="login-banner">
+        <p class="login-banner">
           <img src="@/assets/imgs/login-banner.png" />
         </p>
       </a-col>
@@ -61,12 +62,12 @@ const onFinishFailed = (errorInfo: any) => {
         <h2 style="margin-top: 100px;">用户登录</h2>
         <div class="login-form-wrapper">
           <a-form
-            :model="formState"
-            name="basic"
-            :wrapper-col="{ span: 24 }"
-            autocomplete="off"
-            @finish="onFinish"
-            @finishFailed="onFinishFailed"
+              :model="formState"
+              name="basic"
+              :wrapper-col="{ span: 24 }"
+              autocomplete="off"
+              @finish="onFinish"
+              @finishFailed="onFinishFailed"
           >
             <!-- <div class="kede-input" style="margin-top: 20px; background: transparent;">
               <a-input v-model:value="formState.username" placeholder="请输入用户名" />