Browse Source

1.增加欢迎页。2.登录跳转修改。

jiaxiaoqiang 11 months ago
parent
commit
2040f2beec

+ 6 - 6
src/layout/components/Sidebar/components/SidebarMixTopMenu.vue

@@ -19,12 +19,12 @@
             v-if="route.meta && route.meta.icon"
             :icon-class="route.meta.icon"
           />
-          <span v-if="route.path === '/'"> 首页 </span>
-          <template v-else>
-            <span v-if="route.meta && route.meta.title" class="ml-1">
-              {{ translateRouteTitle(route.meta.title) }}
-            </span>
-          </template>
+          <!--          <span v-if="route.path === '/'"> 首页 </span>-->
+          <!--          <template>-->
+          <span v-if="route.meta && route.meta.title" class="ml-1">
+            {{ translateRouteTitle(route.meta.title) }}
+          </span>
+          <!--          </template>-->
         </template>
       </el-menu-item>
     </el-menu>

+ 16 - 31
src/router/index.ts

@@ -22,40 +22,25 @@ export const constantRoutes: RouteRecordRaw[] = [
     meta: { hidden: true },
   },
 
-  // {
-  //   path: "/",
-  //   name: "/",
-  //   component: Layout,
-  //   redirect: "/dashboard",
-  //   children: [
-  //     {
-  //       path: "dashboard",
-  //       component: () => import("@/views/dashboard/index.vue"),
-  //       name: "Dashboard", // 用于 keep-alive, 必须与SFC自动推导或者显示声明的组件name一致
-  //       // https://cn.vuejs.org/guide/built-ins/keep-alive.html#include-exclude
-  //       meta: {
-  //         title: "dashboard",
-  //         icon: "homepage",
-  //         affix: true,
-  //         keepAlive: true,
-  //         alwaysShow: false,
-  //       },
-  //     },
-  //     {
-  //       path: "401",
-  //       component: () => import("@/views/error-page/401.vue"),
-  //       meta: { hidden: true },
-  //     },
-  //     {
-  //       path: "404",
-  //       component: () => import("@/views/error-page/404.vue"),
-  //       meta: { hidden: true },
-  //     },
-  //   ],
-  // },
+  {
+    path: "/",
+    name: "/",
+    meta: { hidden: true },
+    component: Layout,
+    // redirect: "/welcome",
+    children: [
+      {
+        path: "welcome",
+        component: () => import("@/views/welcome/index.vue"),
+        name: "Welcome",
+        meta: { hidden: true },
+      },
+    ],
+  },
 
   {
     path: "/:pathMatch(.*)*", // 必备
+    meta: { hidden: true },
     component: () => import("@/views/error-page/404.vue"),
   },
   // 外部链接

src/views/dashboard/index.vue → src/views/dashboard/main/index.vue


+ 2 - 1
src/views/login/index.vue

@@ -221,7 +221,8 @@ function handleLogin() {
             }
           });
 
-          router.push({ path: redirect, query: otherQueryParams });
+          // router.push({ path: redirect, query: otherQueryParams });
+          router.push("/welcome");
         })
         .catch(() => {
           // getCaptcha();

+ 4 - 4
src/views/system/user/components/dept-tree.vue

@@ -25,7 +25,7 @@ import { treeList } from "@/api/system/dept";
 
 const props = defineProps({
   modelValue: {
-    type: [Number],
+    type: [String],
     default: undefined,
   },
 });
@@ -34,7 +34,7 @@ const deptList = ref<OptionType[]>(); // 部门列表
 const deptTreeRef = ref(ElTree); // 部门树
 const deptName = ref(); // 部门名称
 
-const emits = defineEmits(["node-click"]);
+const emits = defineEmits(["node-click", "update:modelValue"]);
 
 const deptId = useVModel(props, "modelValue", emits);
 
@@ -63,8 +63,8 @@ function handleNodeClick(data: { [key: string]: any }) {
 
 onBeforeMount?.(() => {
   treeList().then((response) => {
-    if(response.data){
-      deptId.value = response.data[0].id
+    if (response.data) {
+      deptId.value = response.data[0].id;
       emits("node-click");
     }
     deptList.value = response.data;

+ 11 - 0
src/views/welcome/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>src/views/welcome /index.vue</div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "Welcome",
+});
+</script>
+
+<style scoped lang="scss"></style>