菜单编辑完成

修改基础页面
修改基本参数
25 changed files with 583 additions and 134 deletions
--- a/.env.development
+++ b/.env.development
@ -5,4 +5,5 @@ NODE_ENV='development'

 VITE_APP_TITLE = '恒信高科'
 VITE_APP_PORT = 16666
-VITE_APP_BASE_API = '/dev-api'
+VITE_APP_BASE_API = ''
+VITE_APP_BASE_URL ='http://myvuetest.net'
--- a/.env.production
+++ b/.env.production
@ -2,4 +2,5 @@

 VITE_APP_TITLE = '恒信高科'
 VITE_APP_PORT = 16666
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = ''
+VITE_APP_BASE_URL ='http://myvuetest.net'
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit $1
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run lint:lint-staged
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@ -1,6 +1,6 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { CaptchaResult, LoginData, LoginResult } from './types';
+import request from "@/utils/request";
+import { AxiosPromise } from "axios";
+import { CaptchaResult, LoginData, LoginResult } from "./types";

 /**
 * 登录API
@ -10,30 +10,46 @@ import { CaptchaResult, LoginData, LoginResult } from './types';
 */
 export function loginApi(data: LoginData): AxiosPromise<LoginResult> {
  return request({
-    url: '/api/v1/auth/login',
-    method: 'post',
-    params: data
+    url: "/api/v1/auth/login",
+    method: "post",
+    params: data,
+  });
+}
+export function loginApiIng(data: LoginData): AxiosPromise<LoginResult> {
+  return request({
+    url: "/kpiapi/base/login",
+    method: "post",
+    data: data,
  });
 }

 /**
 * 注销API
 */
+export function logoutApiOld() {
+  return request({
+    url: "/api/v1/auth/logout",
+    method: "delete",
+  });
+}
 export function logoutApi() {
  return request({
-    url: '/api/v1/auth/logout',
-    method: 'delete'
+    url: "/kpiapi/base/signout",
+    method: "post",
  });
 }
-
-
-
 /**
 * 获取验证码
 */
 export function getCaptchaApi(): AxiosPromise<CaptchaResult> {
  return request({
-    url: '/api/v1/auth/captcha',
-    method: 'get'
+    url: "/api/v1/auth/captcha",
+    method: "get",
+  });
+}
+export function getCaptchaApiIng(): AxiosPromise<CaptchaResult> {
+  return request({
+    url: "/kpiapi/base/captcha",
+    method: "post",
  });
 }
--- a/src/api/auth/types.ts
+++ b/src/api/auth/types.ts
@ -20,6 +20,8 @@ export interface LoginData {
   * 验证码
   */
  verifyCode?: string;
+  captcha?: string;
+  captchaId?: string;
 }

 /**
@ -42,6 +44,9 @@ export interface LoginResult {
   * token 类型
   */
  tokenType?: string;
+
+  key?: string;
+  token?: string;
 }

 /**
@ -56,5 +61,12 @@ export interface CaptchaResult {
   * 验证码图片Base64字符串
   */
  verifyCodeBase64: string;
+  /**
+   * 验证码缓存key
+   */
+  captchaid: string;
+  /**
+   * 验证码图片Base64字符串
+   */
+  picPath: string;
 }
-
--- a/src/api/menu/index.ts
+++ b/src/api/menu/index.ts
@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { MenuQuery, MenuVO, MenuForm } from './types';
+import { MenuQuery, MenuVO, MenuForm,menuInfo } from './types';

 /**
 * 获取路由列表
@ -11,62 +11,90 @@ export function listRoutes() {
    method: 'get'
  });
 }
-
+export function listRoutesIng() {
+  return request({
+    url: '/systemapi/menus/get_routers_three',
+    method: 'get'
+  });
+}
 /**
 * 获取菜单树形列表
 *
 * @param queryParams
 */
-export function listMenus(queryParams: MenuQuery): AxiosPromise<MenuVO[]> {
+export function listMenusOld(queryParams: MenuQuery): AxiosPromise<MenuVO[]> {
  return request({
    url: '/api/v1/menus',
    method: 'get',
    params: queryParams
  });
 }
-
+export function listMenus(queryParams: MenuQuery): AxiosPromise<MenuVO[]> {
+  return request({
+    url: '/systemapi/menus/get_menus_three',
+    method: 'get',
+    params: queryParams
+  });
+}
 /**
 * 获取菜单下拉树形列表
 */
-export function listMenuOptions(): AxiosPromise<OptionType[]> {
+export function listMenuOptionsOld(): AxiosPromise<OptionType[]> {
  return request({
    url: '/api/v1/menus/options',
    method: 'get'
  });
 }
-
+export function listMenuOptions(): AxiosPromise<OptionType[]> {
+  return request({
+    url: '/systemapi/menus/menu_options',
+    method: 'get'
+  });
+}
 /**
 * 获取菜单表单数据
 *
 * @param id
 */
-export function getMenuForm(id: number): AxiosPromise<MenuForm> {
+export function getMenuFormOld(id: number): AxiosPromise<MenuForm> {
  return request({
    url: '/api/v1/menus/' + id + '/form',
    method: 'get'
  });
 }
-
+export function getMenuForm(data: menuInfo): AxiosPromise<MenuForm> {
+  return request({
+    url: '/systemapi/menus/get_one_menu_cont',
+    method: 'post',
+		data:data
+  });
+}
 /**
 * 添加菜单
 *
 * @param data
 */
-export function addMenu(data: MenuForm) {
+export function addMenuOld(data: MenuForm) {
  return request({
    url: '/api/v1/menus',
    method: 'post',
    data: data
  });
 }
-
+export function addMenu(data: MenuForm) {
+  return request({
+    url: '/systemapi/menus/add_new_menu',
+    method: 'post',
+    data: data
+  });
+}
 /**
 * 修改菜单
 *
 * @param id
 * @param data
 */
-export function updateMenu(id: string, data: MenuForm) {
+export function updateMenuOld(id: string, data: MenuForm) {
  return request({
    url: '/api/v1/menus/' + id,
    method: 'put',
@ -74,14 +102,30 @@ export function updateMenu(id: string, data: MenuForm) {
  });
 }

+export function updateMenu(data: MenuForm) {
+  return request({
+    url: '/systemapi/menus/edit_menus_cont',
+    method: 'post',
+    data: data
+  });
+}
+
 /**
 * 删除菜单
 *
 * @param id 菜单ID
 */
-export function deleteMenu(id: number) {
+export function deleteMenuOld(id: number) {
  return request({
    url: '/api/v1/menus/' + id,
    method: 'delete'
  });
 }
+
+export function deleteMenu(data: menuInfo) {
+  return request({
+    url: '/systemapi/menus/delt_menus_cont',
+    method: 'post',
+		data:data
+  });
+}
--- a/src/api/menu/types.ts
+++ b/src/api/menu/types.ts
@ -113,3 +113,10 @@ export interface MenuForm {
   */
  perm?: string;
 }
+
+/**
+ * 查看菜单内容
+ */
+export interface menuInfo {
+	id:string;
+}
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@ -11,6 +11,12 @@ export function getUserInfo(): AxiosPromise<UserInfo> {
    method: 'get'
  });
 }
+export function getUserInfoIng(): AxiosPromise<UserInfo> {
+  return request({
+    url: '/systemapi/user/get_user_cont',
+    method: 'get'
+  });
+}

 /**
 * 获取用户分页列表
--- a/src/assets/logo-1.png
+++ b/src/assets/logo-1.png
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@ -16,7 +16,7 @@ export default {
  navbar: {
    dashboard: 'Dashboard',
    logout: 'Logout',
-    document: 'Document',
-    gitee: 'Gitee'
+    meinfo: 'Personal Data',
+    editpassword: 'Change Password'
  }
 };
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@ -16,7 +16,7 @@ export default {
  navbar: {
    dashboard: '首页',
    logout: '注销',
-    document: '项目文档',
-    gitee: '码云'
+    meinfo: '个人资料',
+    editpassword: '修改密码'
  }
 };
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -88,14 +88,11 @@ function logout() {
            <router-link to="/">
              <el-dropdown-item>{{ $t("navbar.dashboard") }}</el-dropdown-item>
            </router-link>
-            <a target="_blank" href="https://github.com/hxrui">
-              <el-dropdown-item>Github</el-dropdown-item>
-            </a>
            <a target="_blank" href="https://gitee.com/haoxr">
-              <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
+              <el-dropdown-item>{{ $t("navbar.editpassword") }}</el-dropdown-item>
            </a>
            <a target="_blank" href="https://www.cnblogs.com/haoxianrui/">
-              <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
+              <el-dropdown-item>{{ $t("navbar.meinfo") }}</el-dropdown-item>
            </a>
            <el-dropdown-item divided @click="logout">
              {{ $t("navbar.logout") }}
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@ -22,7 +22,7 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);
        class="h-full w-full flex items-center justify-center"
        to="/"
      >
-        <img v-if="settingsStore.sidebarLogo" :src="logo" class="w-5 h-5" />
+        <img v-if="settingsStore.sidebarLogo" :src="logo" class="w-11 h-11" />
        <span v-else class="ml-3 text-white text-sm font-bold"
          >恒信高科应用平台</span
        >
@ -34,7 +34,7 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);
        class="h-full w-full flex items-center justify-center"
        to="/"
      >
-        <img v-if="settingsStore.sidebarLogo" :src="logo" class="w-5 h-5" />
+        <img v-if="settingsStore.sidebarLogo" :src="logo" class="w-11 h-11" />
        <span class="ml-3 text-white text-sm font-bold"
          >恒信高科应用平台</span
        >
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@ -14,6 +14,11 @@ const permissionStore = usePermissionStore();
 const appStore = useAppStore();
 const currRoute = useRoute();
 const { sidebarLogo } = storeToRefs(settingsStore);
+
+
+// console.log("世界路由------>",permissionStore.routes)
+
+
 </script>

 <template>
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@ -2,7 +2,7 @@ import { RouteRecordRaw } from "vue-router";
 import { defineStore } from "pinia";
 import { constantRoutes } from "@/router";
 import { store } from "@/store";
-import { listRoutes } from "@/api/menu";
+import { listRoutes,listRoutesIng } from "@/api/menu";

 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
@ -44,6 +44,7 @@ const filterAsyncRoutes = (routes: RouteRecordRaw[], roles: string[]) => {

    // 判断用户(角色)是否有该路由的访问权限
    if (hasPermission(roles, tmpRoute)) {
+			// console.log("判断用户(角色)是否有该路由的访问权限----->",roles, tmpRoute)
      if (tmpRoute.component?.toString() == "Layout") {
        tmpRoute.component = Layout;
        console.log();
@ -63,7 +64,7 @@ const filterAsyncRoutes = (routes: RouteRecordRaw[], roles: string[]) => {
      asyncRoutes.push(tmpRoute);
    }
  });
-
+	// console.log("判断用户(角色)是否有该路由的访问权限---111-->",asyncRoutes)
  return asyncRoutes;
 };

@ -74,6 +75,7 @@ export const usePermissionStore = defineStore("permission", () => {

  // actions
  function setRoutes(newRoutes: RouteRecordRaw[]) {
+		// console.log('setRoutes--->',newRoutes)
    routes.value = constantRoutes.concat(newRoutes);
  }
  /**
@ -85,16 +87,27 @@ export const usePermissionStore = defineStore("permission", () => {
  function generateRoutes(roles: string[]) {
    return new Promise<RouteRecordRaw[]>((resolve, reject) => {
      // 接口获取所有路由
-      listRoutes()
-        .then(({ data: asyncRoutes }) => {
-          // 根据角色获取有访问权限的路由
-          const accessedRoutes = filterAsyncRoutes(asyncRoutes, roles);
-          setRoutes(accessedRoutes);
-          resolve(accessedRoutes);
-        })
-        .catch((error) => {
-          reject(error);
-        });
+      // listRoutes()
+      //   .then(({ data: asyncRoutes }) => {
+      //     // 根据角色获取有访问权限的路由
+      //     const accessedRoutes = filterAsyncRoutes(asyncRoutes, roles);
+      //     setRoutes(accessedRoutes);
+      //     resolve(accessedRoutes);
+      //   })
+      //   .catch((error) => {
+      //     reject(error);
+      //   });
+			listRoutesIng()
+				.then(({ data: asyncRoutes }) => {
+					// 根据角色获取有访问权限的路由
+					const accessedRoutes = filterAsyncRoutes(asyncRoutes, roles);
+					// console.log('根据角色获取有访问权限的路由',accessedRoutes,asyncRoutes, roles)
+					setRoutes(accessedRoutes);
+					resolve(accessedRoutes);
+				})
+				.catch((error) => {
+					reject(error);
+				});
    });
  }
  return { routes, setRoutes, generateRoutes };
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -1,7 +1,7 @@
 import { defineStore } from "pinia";

-import { loginApi, logoutApi } from "@/api/auth";
-import { getUserInfo } from "@/api/user";
+import { loginApi, logoutApi, loginApiIng } from "@/api/auth";
+import { getUserInfo,getUserInfoIng } from "@/api/user";
 import { resetRouter } from "@/router";
 import { store } from "@/store";

@ -12,12 +12,13 @@ import { useStorage } from "@vueuse/core";

 export const useUserStore = defineStore("user", () => {
  // state
-  const token = useStorage("accessToken", "");
+  const tokenIng = useStorage("accessToken", "");
  const nickname = ref("");
  const avatar = ref("");
  const roles = ref<Array<string>>([]); // 用户角色编码集合 → 判断路由权限
  const perms = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
-
+  const userKey = useStorage("userKey", "");
+  const userToken = useStorage("userToken", "");
  /**
   * 登录调用
   *
@ -26,10 +27,13 @@ export const useUserStore = defineStore("user", () => {
   */
  function login(loginData: LoginData) {
    return new Promise<void>((resolve, reject) => {
-      loginApi(loginData)
+      loginApiIng(loginData)
        .then((response) => {
-          const { tokenType, accessToken } = response.data;
-          token.value = tokenType + " " + accessToken; // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
+          console.log("登录调用--->", response.data);
+          const { tokenType, accessToken, key, token } = response.data;
+          tokenIng.value = key + " " + token; // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
+          userKey.value = key;
+          userToken.value = token;
          resolve();
        })
        .catch((error) => {
@ -41,24 +45,44 @@ export const useUserStore = defineStore("user", () => {
  // 获取信息(用户昵称、头像、角色集合、权限集合)
  function getInfo() {
    return new Promise<UserInfo>((resolve, reject) => {
-      getUserInfo()
-        .then(({ data }) => {
-          if (!data) {
-            return reject("Verification failed, please Login again.");
-          }
-          if (!data.roles || data.roles.length <= 0) {
-            reject("getUserInfo: roles must be a non-null array!");
-          }
-          nickname.value = data.nickname;
-          avatar.value = data.avatar;
-          roles.value = data.roles;
-          perms.value = data.perms;
-          resolve(data);
-        })
-        .catch((error) => {
-          reject(error);
-        });
+      // getUserInfo()
+      //   .then(({ data }) => {
+      //     if (!data) {
+      //       return reject("Verification failed, please Login again.");
+      //     }
+      //     if (!data.roles || data.roles.length <= 0) {
+      //       reject("getUserInfo: roles must be a non-null array!");
+      //     }
+      //     nickname.value = data.nickname;
+      //     avatar.value = data.avatar;
+      //     roles.value = data.roles;
+      //     perms.value = data.perms;
+      //     resolve(data);
+      //   })
+      //   .catch((error) => {
+      //     reject(error);
+      //   });
+				getUserInfoIng()
+					.then(({data})=>{
+						if (!data) {
+							return reject("验证失败，请重新登录。");
+						}
+						if (!data.roles || data.roles.length <= 0) {
+							reject("获取用户信息：角色必须是非null数组！");
+						}
+						nickname.value = data.nickname;
+						avatar.value = data.avatar;
+						roles.value = data.roles;
+						perms.value = data.perms;
+						resolve(data);
+					})
+					.catch((error) => {
+						reject(error);
+					});
+
+
    });
+		
  }

  // 注销
@ -79,14 +103,18 @@ export const useUserStore = defineStore("user", () => {

  // 重置
  function resetToken() {
-    token.value = "";
+    tokenIng.value = "";
    nickname.value = "";
+		userKey.value = "";
+		userToken.value = "";
    avatar.value = "";
    roles.value = [];
    perms.value = [];
  }
  return {
-    token,
+    tokenIng,
+    userKey,
+    userToken,
    nickname,
    avatar,
    roles,
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@ -1,8 +1,11 @@
-// Generated by 'unplugin-auto-import'
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-auto-import
 export {}
 declare global {
  const EffectScope: typeof import('vue')['EffectScope']
-  const ElForm: typeof import('element-plus/es')['ElForm']
+	const ElForm: typeof import('element-plus/es')['ElForm']
  const ElMessage: typeof import('element-plus/es')['ElMessage']
  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
  const ElTree: typeof import('element-plus/es')['ElTree']
@ -20,7 +23,9 @@ declare global {
  const createGlobalState: typeof import('@vueuse/core')['createGlobalState']
  const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
  const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
+  const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
  const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
+  const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
  const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
  const customRef: typeof import('vue')['customRef']
  const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
@ -76,7 +81,6 @@ declare global {
  const refThrottled: typeof import('@vueuse/core')['refThrottled']
  const refWithControl: typeof import('@vueuse/core')['refWithControl']
  const resolveComponent: typeof import('vue')['resolveComponent']
-  const resolveDirective: typeof import('vue')['resolveDirective']
  const resolveRef: typeof import('@vueuse/core')['resolveRef']
  const resolveUnref: typeof import('@vueuse/core')['resolveUnref']
  const shallowReactive: typeof import('vue')['shallowReactive']
@ -91,6 +95,7 @@ declare global {
  const toReactive: typeof import('@vueuse/core')['toReactive']
  const toRef: typeof import('vue')['toRef']
  const toRefs: typeof import('vue')['toRefs']
+  const toValue: typeof import('vue')['toValue']
  const triggerRef: typeof import('vue')['triggerRef']
  const tryOnBeforeMount: typeof import('@vueuse/core')['tryOnBeforeMount']
  const tryOnBeforeUnmount: typeof import('@vueuse/core')['tryOnBeforeUnmount']
@ -101,11 +106,14 @@ declare global {
  const unrefElement: typeof import('@vueuse/core')['unrefElement']
  const until: typeof import('@vueuse/core')['until']
  const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
+  const useAnimate: typeof import('@vueuse/core')['useAnimate']
+  const useArrayDifference: typeof import('@vueuse/core')['useArrayDifference']
  const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
  const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
  const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
  const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
  const useArrayFindLast: typeof import('@vueuse/core')['useArrayFindLast']
+  const useArrayIncludes: typeof import('@vueuse/core')['useArrayIncludes']
  const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
  const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
  const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']
@ -191,6 +199,8 @@ declare global {
  const useOnline: typeof import('@vueuse/core')['useOnline']
  const usePageLeave: typeof import('@vueuse/core')['usePageLeave']
  const useParallax: typeof import('@vueuse/core')['useParallax']
+  const useParentElement: typeof import('@vueuse/core')['useParentElement']
+  const usePerformanceObserver: typeof import('@vueuse/core')['usePerformanceObserver']
  const usePermission: typeof import('@vueuse/core')['usePermission']
  const usePointer: typeof import('@vueuse/core')['usePointer']
  const usePointerLock: typeof import('@vueuse/core')['usePointerLock']
@ -256,8 +266,10 @@ declare global {
  const watchArray: typeof import('@vueuse/core')['watchArray']
  const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
  const watchDebounced: typeof import('@vueuse/core')['watchDebounced']
+  const watchDeep: typeof import('@vueuse/core')['watchDeep']
  const watchEffect: typeof import('vue')['watchEffect']
  const watchIgnorable: typeof import('@vueuse/core')['watchIgnorable']
+  const watchImmediate: typeof import('@vueuse/core')['watchImmediate']
  const watchOnce: typeof import('@vueuse/core')['watchOnce']
  const watchPausable: typeof import('@vueuse/core')['watchPausable']
  const watchPostEffect: typeof import('vue')['watchPostEffect']
@ -267,15 +279,16 @@ declare global {
  const watchWithFilter: typeof import('@vueuse/core')['watchWithFilter']
  const whenever: typeof import('@vueuse/core')['whenever']
 }
+// for type re-export
+declare global {
+  // @ts-ignore
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+}
 // for vue template auto import
 import { UnwrapRef } from 'vue'
 declare module 'vue' {
  interface ComponentCustomProperties {
    readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
-    readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
-    readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
-    readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
-    readonly ElTree: UnwrapRef<typeof import('element-plus/es')['ElTree']>
    readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
    readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
    readonly computed: UnwrapRef<typeof import('vue')['computed']>
@ -290,7 +303,283 @@ declare module 'vue' {
    readonly createGlobalState: UnwrapRef<typeof import('@vueuse/core')['createGlobalState']>
    readonly createInjectionState: UnwrapRef<typeof import('@vueuse/core')['createInjectionState']>
    readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
+    readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
+    readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
+    readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
+    readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
+    readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+    readonly debouncedRef: UnwrapRef<typeof import('@vueuse/core')['debouncedRef']>
+    readonly debouncedWatch: UnwrapRef<typeof import('@vueuse/core')['debouncedWatch']>
+    readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
+    readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
+    readonly eagerComputed: UnwrapRef<typeof import('@vueuse/core')['eagerComputed']>
+    readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
+    readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
+    readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
+    readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly h: UnwrapRef<typeof import('vue')['h']>
+    readonly ignorableWatch: UnwrapRef<typeof import('@vueuse/core')['ignorableWatch']>
+    readonly inject: UnwrapRef<typeof import('vue')['inject']>
+    readonly isDefined: UnwrapRef<typeof import('@vueuse/core')['isDefined']>
+    readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
+    readonly isReactive: UnwrapRef<typeof import('vue')['isReactive']>
+    readonly isReadonly: UnwrapRef<typeof import('vue')['isReadonly']>
+    readonly isRef: UnwrapRef<typeof import('vue')['isRef']>
+    readonly makeDestructurable: UnwrapRef<typeof import('@vueuse/core')['makeDestructurable']>
+    readonly markRaw: UnwrapRef<typeof import('vue')['markRaw']>
+    readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
+    readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
+    readonly onBeforeMount: UnwrapRef<typeof import('vue')['onBeforeMount']>
+    readonly onBeforeUnmount: UnwrapRef<typeof import('vue')['onBeforeUnmount']>
+    readonly onBeforeUpdate: UnwrapRef<typeof import('vue')['onBeforeUpdate']>
+    readonly onClickOutside: UnwrapRef<typeof import('@vueuse/core')['onClickOutside']>
+    readonly onDeactivated: UnwrapRef<typeof import('vue')['onDeactivated']>
+    readonly onErrorCaptured: UnwrapRef<typeof import('vue')['onErrorCaptured']>
+    readonly onKeyStroke: UnwrapRef<typeof import('@vueuse/core')['onKeyStroke']>
+    readonly onLongPress: UnwrapRef<typeof import('@vueuse/core')['onLongPress']>
+    readonly onMounted: UnwrapRef<typeof import('vue')['onMounted']>
+    readonly onRenderTracked: UnwrapRef<typeof import('vue')['onRenderTracked']>
+    readonly onRenderTriggered: UnwrapRef<typeof import('vue')['onRenderTriggered']>
+    readonly onScopeDispose: UnwrapRef<typeof import('vue')['onScopeDispose']>
+    readonly onServerPrefetch: UnwrapRef<typeof import('vue')['onServerPrefetch']>
+    readonly onStartTyping: UnwrapRef<typeof import('@vueuse/core')['onStartTyping']>
+    readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
+    readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
+    readonly pausableWatch: UnwrapRef<typeof import('@vueuse/core')['pausableWatch']>
+    readonly provide: UnwrapRef<typeof import('vue')['provide']>
+    readonly reactify: UnwrapRef<typeof import('@vueuse/core')['reactify']>
+    readonly reactifyObject: UnwrapRef<typeof import('@vueuse/core')['reactifyObject']>
+    readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
+    readonly reactiveComputed: UnwrapRef<typeof import('@vueuse/core')['reactiveComputed']>
+    readonly reactiveOmit: UnwrapRef<typeof import('@vueuse/core')['reactiveOmit']>
+    readonly reactivePick: UnwrapRef<typeof import('@vueuse/core')['reactivePick']>
+    readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
+    readonly ref: UnwrapRef<typeof import('vue')['ref']>
+    readonly refAutoReset: UnwrapRef<typeof import('@vueuse/core')['refAutoReset']>
+    readonly refDebounced: UnwrapRef<typeof import('@vueuse/core')['refDebounced']>
+    readonly refDefault: UnwrapRef<typeof import('@vueuse/core')['refDefault']>
+    readonly refThrottled: UnwrapRef<typeof import('@vueuse/core')['refThrottled']>
+    readonly refWithControl: UnwrapRef<typeof import('@vueuse/core')['refWithControl']>
+    readonly resolveComponent: UnwrapRef<typeof import('vue')['resolveComponent']>
+    readonly resolveRef: UnwrapRef<typeof import('@vueuse/core')['resolveRef']>
+    readonly resolveUnref: UnwrapRef<typeof import('@vueuse/core')['resolveUnref']>
+    readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
+    readonly shallowReadonly: UnwrapRef<typeof import('vue')['shallowReadonly']>
+    readonly shallowRef: UnwrapRef<typeof import('vue')['shallowRef']>
+    readonly syncRef: UnwrapRef<typeof import('@vueuse/core')['syncRef']>
+    readonly syncRefs: UnwrapRef<typeof import('@vueuse/core')['syncRefs']>
+    readonly templateRef: UnwrapRef<typeof import('@vueuse/core')['templateRef']>
+    readonly throttledRef: UnwrapRef<typeof import('@vueuse/core')['throttledRef']>
+    readonly throttledWatch: UnwrapRef<typeof import('@vueuse/core')['throttledWatch']>
+    readonly toRaw: UnwrapRef<typeof import('vue')['toRaw']>
+    readonly toReactive: UnwrapRef<typeof import('@vueuse/core')['toReactive']>
+    readonly toRef: UnwrapRef<typeof import('vue')['toRef']>
+    readonly toRefs: UnwrapRef<typeof import('vue')['toRefs']>
+    readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
+    readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
+    readonly tryOnBeforeMount: UnwrapRef<typeof import('@vueuse/core')['tryOnBeforeMount']>
+    readonly tryOnBeforeUnmount: UnwrapRef<typeof import('@vueuse/core')['tryOnBeforeUnmount']>
+    readonly tryOnMounted: UnwrapRef<typeof import('@vueuse/core')['tryOnMounted']>
+    readonly tryOnScopeDispose: UnwrapRef<typeof import('@vueuse/core')['tryOnScopeDispose']>
+    readonly tryOnUnmounted: UnwrapRef<typeof import('@vueuse/core')['tryOnUnmounted']>
+    readonly unref: UnwrapRef<typeof import('vue')['unref']>
+    readonly unrefElement: UnwrapRef<typeof import('@vueuse/core')['unrefElement']>
+    readonly until: UnwrapRef<typeof import('@vueuse/core')['until']>
+    readonly useActiveElement: UnwrapRef<typeof import('@vueuse/core')['useActiveElement']>
+    readonly useAnimate: UnwrapRef<typeof import('@vueuse/core')['useAnimate']>
+    readonly useArrayDifference: UnwrapRef<typeof import('@vueuse/core')['useArrayDifference']>
+    readonly useArrayEvery: UnwrapRef<typeof import('@vueuse/core')['useArrayEvery']>
+    readonly useArrayFilter: UnwrapRef<typeof import('@vueuse/core')['useArrayFilter']>
+    readonly useArrayFind: UnwrapRef<typeof import('@vueuse/core')['useArrayFind']>
+    readonly useArrayFindIndex: UnwrapRef<typeof import('@vueuse/core')['useArrayFindIndex']>
+    readonly useArrayFindLast: UnwrapRef<typeof import('@vueuse/core')['useArrayFindLast']>
+    readonly useArrayIncludes: UnwrapRef<typeof import('@vueuse/core')['useArrayIncludes']>
+    readonly useArrayJoin: UnwrapRef<typeof import('@vueuse/core')['useArrayJoin']>
+    readonly useArrayMap: UnwrapRef<typeof import('@vueuse/core')['useArrayMap']>
+    readonly useArrayReduce: UnwrapRef<typeof import('@vueuse/core')['useArrayReduce']>
+    readonly useArraySome: UnwrapRef<typeof import('@vueuse/core')['useArraySome']>
+    readonly useArrayUnique: UnwrapRef<typeof import('@vueuse/core')['useArrayUnique']>
+    readonly useAsyncQueue: UnwrapRef<typeof import('@vueuse/core')['useAsyncQueue']>
+    readonly useAsyncState: UnwrapRef<typeof import('@vueuse/core')['useAsyncState']>
+    readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
+    readonly useBase64: UnwrapRef<typeof import('@vueuse/core')['useBase64']>
+    readonly useBattery: UnwrapRef<typeof import('@vueuse/core')['useBattery']>
+    readonly useBluetooth: UnwrapRef<typeof import('@vueuse/core')['useBluetooth']>
+    readonly useBreakpoints: UnwrapRef<typeof import('@vueuse/core')['useBreakpoints']>
+    readonly useBroadcastChannel: UnwrapRef<typeof import('@vueuse/core')['useBroadcastChannel']>
+    readonly useBrowserLocation: UnwrapRef<typeof import('@vueuse/core')['useBrowserLocation']>
+    readonly useCached: UnwrapRef<typeof import('@vueuse/core')['useCached']>
+    readonly useClipboard: UnwrapRef<typeof import('@vueuse/core')['useClipboard']>
+    readonly useCloned: UnwrapRef<typeof import('@vueuse/core')['useCloned']>
+    readonly useColorMode: UnwrapRef<typeof import('@vueuse/core')['useColorMode']>
+    readonly useConfirmDialog: UnwrapRef<typeof import('@vueuse/core')['useConfirmDialog']>
+    readonly useCounter: UnwrapRef<typeof import('@vueuse/core')['useCounter']>
+    readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
+    readonly useCssVar: UnwrapRef<typeof import('@vueuse/core')['useCssVar']>
+    readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
+    readonly useCurrentElement: UnwrapRef<typeof import('@vueuse/core')['useCurrentElement']>
+    readonly useCycleList: UnwrapRef<typeof import('@vueuse/core')['useCycleList']>
+    readonly useDark: UnwrapRef<typeof import('@vueuse/core')['useDark']>
+    readonly useDateFormat: UnwrapRef<typeof import('@vueuse/core')['useDateFormat']>
+    readonly useDebounce: UnwrapRef<typeof import('@vueuse/core')['useDebounce']>
+    readonly useDebounceFn: UnwrapRef<typeof import('@vueuse/core')['useDebounceFn']>
+    readonly useDebouncedRefHistory: UnwrapRef<typeof import('@vueuse/core')['useDebouncedRefHistory']>
+    readonly useDeviceMotion: UnwrapRef<typeof import('@vueuse/core')['useDeviceMotion']>
+    readonly useDeviceOrientation: UnwrapRef<typeof import('@vueuse/core')['useDeviceOrientation']>
+    readonly useDevicePixelRatio: UnwrapRef<typeof import('@vueuse/core')['useDevicePixelRatio']>
+    readonly useDevicesList: UnwrapRef<typeof import('@vueuse/core')['useDevicesList']>
+    readonly useDisplayMedia: UnwrapRef<typeof import('@vueuse/core')['useDisplayMedia']>
+    readonly useDocumentVisibility: UnwrapRef<typeof import('@vueuse/core')['useDocumentVisibility']>
+    readonly useDraggable: UnwrapRef<typeof import('@vueuse/core')['useDraggable']>
+    readonly useDropZone: UnwrapRef<typeof import('@vueuse/core')['useDropZone']>
+    readonly useElementBounding: UnwrapRef<typeof import('@vueuse/core')['useElementBounding']>
+    readonly useElementByPoint: UnwrapRef<typeof import('@vueuse/core')['useElementByPoint']>
+    readonly useElementHover: UnwrapRef<typeof import('@vueuse/core')['useElementHover']>
+    readonly useElementSize: UnwrapRef<typeof import('@vueuse/core')['useElementSize']>
+    readonly useElementVisibility: UnwrapRef<typeof import('@vueuse/core')['useElementVisibility']>
+    readonly useEventBus: UnwrapRef<typeof import('@vueuse/core')['useEventBus']>
+    readonly useEventListener: UnwrapRef<typeof import('@vueuse/core')['useEventListener']>
+    readonly useEventSource: UnwrapRef<typeof import('@vueuse/core')['useEventSource']>
+    readonly useEyeDropper: UnwrapRef<typeof import('@vueuse/core')['useEyeDropper']>
+    readonly useFavicon: UnwrapRef<typeof import('@vueuse/core')['useFavicon']>
+    readonly useFetch: UnwrapRef<typeof import('@vueuse/core')['useFetch']>
+    readonly useFileDialog: UnwrapRef<typeof import('@vueuse/core')['useFileDialog']>
+    readonly useFileSystemAccess: UnwrapRef<typeof import('@vueuse/core')['useFileSystemAccess']>
+    readonly useFocus: UnwrapRef<typeof import('@vueuse/core')['useFocus']>
+    readonly useFocusWithin: UnwrapRef<typeof import('@vueuse/core')['useFocusWithin']>
+    readonly useFps: UnwrapRef<typeof import('@vueuse/core')['useFps']>
+    readonly useFullscreen: UnwrapRef<typeof import('@vueuse/core')['useFullscreen']>
+    readonly useGamepad: UnwrapRef<typeof import('@vueuse/core')['useGamepad']>
+    readonly useGeolocation: UnwrapRef<typeof import('@vueuse/core')['useGeolocation']>
+    readonly useIdle: UnwrapRef<typeof import('@vueuse/core')['useIdle']>
+    readonly useImage: UnwrapRef<typeof import('@vueuse/core')['useImage']>
+    readonly useInfiniteScroll: UnwrapRef<typeof import('@vueuse/core')['useInfiniteScroll']>
+    readonly useIntersectionObserver: UnwrapRef<typeof import('@vueuse/core')['useIntersectionObserver']>
+    readonly useInterval: UnwrapRef<typeof import('@vueuse/core')['useInterval']>
+    readonly useIntervalFn: UnwrapRef<typeof import('@vueuse/core')['useIntervalFn']>
+    readonly useKeyModifier: UnwrapRef<typeof import('@vueuse/core')['useKeyModifier']>
+    readonly useLastChanged: UnwrapRef<typeof import('@vueuse/core')['useLastChanged']>
+    readonly useLocalStorage: UnwrapRef<typeof import('@vueuse/core')['useLocalStorage']>
+    readonly useMagicKeys: UnwrapRef<typeof import('@vueuse/core')['useMagicKeys']>
+    readonly useManualRefHistory: UnwrapRef<typeof import('@vueuse/core')['useManualRefHistory']>
+    readonly useMediaControls: UnwrapRef<typeof import('@vueuse/core')['useMediaControls']>
+    readonly useMediaQuery: UnwrapRef<typeof import('@vueuse/core')['useMediaQuery']>
+    readonly useMemoize: UnwrapRef<typeof import('@vueuse/core')['useMemoize']>
+    readonly useMemory: UnwrapRef<typeof import('@vueuse/core')['useMemory']>
+    readonly useMounted: UnwrapRef<typeof import('@vueuse/core')['useMounted']>
+    readonly useMouse: UnwrapRef<typeof import('@vueuse/core')['useMouse']>
+    readonly useMouseInElement: UnwrapRef<typeof import('@vueuse/core')['useMouseInElement']>
+    readonly useMousePressed: UnwrapRef<typeof import('@vueuse/core')['useMousePressed']>
+    readonly useMutationObserver: UnwrapRef<typeof import('@vueuse/core')['useMutationObserver']>
+    readonly useNavigatorLanguage: UnwrapRef<typeof import('@vueuse/core')['useNavigatorLanguage']>
+    readonly useNetwork: UnwrapRef<typeof import('@vueuse/core')['useNetwork']>
+    readonly useNow: UnwrapRef<typeof import('@vueuse/core')['useNow']>
+    readonly useObjectUrl: UnwrapRef<typeof import('@vueuse/core')['useObjectUrl']>
+    readonly useOffsetPagination: UnwrapRef<typeof import('@vueuse/core')['useOffsetPagination']>
+    readonly useOnline: UnwrapRef<typeof import('@vueuse/core')['useOnline']>
+    readonly usePageLeave: UnwrapRef<typeof import('@vueuse/core')['usePageLeave']>
+    readonly useParallax: UnwrapRef<typeof import('@vueuse/core')['useParallax']>
+    readonly useParentElement: UnwrapRef<typeof import('@vueuse/core')['useParentElement']>
+    readonly usePerformanceObserver: UnwrapRef<typeof import('@vueuse/core')['usePerformanceObserver']>
+    readonly usePermission: UnwrapRef<typeof import('@vueuse/core')['usePermission']>
+    readonly usePointer: UnwrapRef<typeof import('@vueuse/core')['usePointer']>
+    readonly usePointerLock: UnwrapRef<typeof import('@vueuse/core')['usePointerLock']>
+    readonly usePointerSwipe: UnwrapRef<typeof import('@vueuse/core')['usePointerSwipe']>
+    readonly usePreferredColorScheme: UnwrapRef<typeof import('@vueuse/core')['usePreferredColorScheme']>
+    readonly usePreferredContrast: UnwrapRef<typeof import('@vueuse/core')['usePreferredContrast']>
+    readonly usePreferredDark: UnwrapRef<typeof import('@vueuse/core')['usePreferredDark']>
+    readonly usePreferredLanguages: UnwrapRef<typeof import('@vueuse/core')['usePreferredLanguages']>
+    readonly usePreferredReducedMotion: UnwrapRef<typeof import('@vueuse/core')['usePreferredReducedMotion']>
+    readonly usePrevious: UnwrapRef<typeof import('@vueuse/core')['usePrevious']>
+    readonly useRafFn: UnwrapRef<typeof import('@vueuse/core')['useRafFn']>
+    readonly useRefHistory: UnwrapRef<typeof import('@vueuse/core')['useRefHistory']>
+    readonly useResizeObserver: UnwrapRef<typeof import('@vueuse/core')['useResizeObserver']>
+    readonly useScreenOrientation: UnwrapRef<typeof import('@vueuse/core')['useScreenOrientation']>
+    readonly useScreenSafeArea: UnwrapRef<typeof import('@vueuse/core')['useScreenSafeArea']>
+    readonly useScriptTag: UnwrapRef<typeof import('@vueuse/core')['useScriptTag']>
+    readonly useScroll: UnwrapRef<typeof import('@vueuse/core')['useScroll']>
+    readonly useScrollLock: UnwrapRef<typeof import('@vueuse/core')['useScrollLock']>
+    readonly useSessionStorage: UnwrapRef<typeof import('@vueuse/core')['useSessionStorage']>
+    readonly useShare: UnwrapRef<typeof import('@vueuse/core')['useShare']>
+    readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
+    readonly useSorted: UnwrapRef<typeof import('@vueuse/core')['useSorted']>
+    readonly useSpeechRecognition: UnwrapRef<typeof import('@vueuse/core')['useSpeechRecognition']>
+    readonly useSpeechSynthesis: UnwrapRef<typeof import('@vueuse/core')['useSpeechSynthesis']>
+    readonly useStepper: UnwrapRef<typeof import('@vueuse/core')['useStepper']>
+    readonly useStorage: UnwrapRef<typeof import('@vueuse/core')['useStorage']>
+    readonly useStorageAsync: UnwrapRef<typeof import('@vueuse/core')['useStorageAsync']>
+    readonly useStyleTag: UnwrapRef<typeof import('@vueuse/core')['useStyleTag']>
+    readonly useSupported: UnwrapRef<typeof import('@vueuse/core')['useSupported']>
+    readonly useSwipe: UnwrapRef<typeof import('@vueuse/core')['useSwipe']>
+    readonly useTemplateRefsList: UnwrapRef<typeof import('@vueuse/core')['useTemplateRefsList']>
+    readonly useTextDirection: UnwrapRef<typeof import('@vueuse/core')['useTextDirection']>
+    readonly useTextSelection: UnwrapRef<typeof import('@vueuse/core')['useTextSelection']>
+    readonly useTextareaAutosize: UnwrapRef<typeof import('@vueuse/core')['useTextareaAutosize']>
+    readonly useThrottle: UnwrapRef<typeof import('@vueuse/core')['useThrottle']>
+    readonly useThrottleFn: UnwrapRef<typeof import('@vueuse/core')['useThrottleFn']>
+    readonly useThrottledRefHistory: UnwrapRef<typeof import('@vueuse/core')['useThrottledRefHistory']>
+    readonly useTimeAgo: UnwrapRef<typeof import('@vueuse/core')['useTimeAgo']>
+    readonly useTimeout: UnwrapRef<typeof import('@vueuse/core')['useTimeout']>
+    readonly useTimeoutFn: UnwrapRef<typeof import('@vueuse/core')['useTimeoutFn']>
+    readonly useTimeoutPoll: UnwrapRef<typeof import('@vueuse/core')['useTimeoutPoll']>
+    readonly useTimestamp: UnwrapRef<typeof import('@vueuse/core')['useTimestamp']>
+    readonly useTitle: UnwrapRef<typeof import('@vueuse/core')['useTitle']>
+    readonly useToNumber: UnwrapRef<typeof import('@vueuse/core')['useToNumber']>
+    readonly useToString: UnwrapRef<typeof import('@vueuse/core')['useToString']>
+    readonly useToggle: UnwrapRef<typeof import('@vueuse/core')['useToggle']>
+    readonly useTransition: UnwrapRef<typeof import('@vueuse/core')['useTransition']>
+    readonly useUrlSearchParams: UnwrapRef<typeof import('@vueuse/core')['useUrlSearchParams']>
+    readonly useUserMedia: UnwrapRef<typeof import('@vueuse/core')['useUserMedia']>
+    readonly useVModel: UnwrapRef<typeof import('@vueuse/core')['useVModel']>
+    readonly useVModels: UnwrapRef<typeof import('@vueuse/core')['useVModels']>
+    readonly useVibrate: UnwrapRef<typeof import('@vueuse/core')['useVibrate']>
+    readonly useVirtualList: UnwrapRef<typeof import('@vueuse/core')['useVirtualList']>
+    readonly useWakeLock: UnwrapRef<typeof import('@vueuse/core')['useWakeLock']>
+    readonly useWebNotification: UnwrapRef<typeof import('@vueuse/core')['useWebNotification']>
+    readonly useWebSocket: UnwrapRef<typeof import('@vueuse/core')['useWebSocket']>
+    readonly useWebWorker: UnwrapRef<typeof import('@vueuse/core')['useWebWorker']>
+    readonly useWebWorkerFn: UnwrapRef<typeof import('@vueuse/core')['useWebWorkerFn']>
+    readonly useWindowFocus: UnwrapRef<typeof import('@vueuse/core')['useWindowFocus']>
+    readonly useWindowScroll: UnwrapRef<typeof import('@vueuse/core')['useWindowScroll']>
+    readonly useWindowSize: UnwrapRef<typeof import('@vueuse/core')['useWindowSize']>
+    readonly watch: UnwrapRef<typeof import('vue')['watch']>
+    readonly watchArray: UnwrapRef<typeof import('@vueuse/core')['watchArray']>
+    readonly watchAtMost: UnwrapRef<typeof import('@vueuse/core')['watchAtMost']>
+    readonly watchDebounced: UnwrapRef<typeof import('@vueuse/core')['watchDebounced']>
+    readonly watchDeep: UnwrapRef<typeof import('@vueuse/core')['watchDeep']>
+    readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
+    readonly watchIgnorable: UnwrapRef<typeof import('@vueuse/core')['watchIgnorable']>
+    readonly watchImmediate: UnwrapRef<typeof import('@vueuse/core')['watchImmediate']>
+    readonly watchOnce: UnwrapRef<typeof import('@vueuse/core')['watchOnce']>
+    readonly watchPausable: UnwrapRef<typeof import('@vueuse/core')['watchPausable']>
+    readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
+    readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
+    readonly watchThrottled: UnwrapRef<typeof import('@vueuse/core')['watchThrottled']>
+    readonly watchTriggerable: UnwrapRef<typeof import('@vueuse/core')['watchTriggerable']>
+    readonly watchWithFilter: UnwrapRef<typeof import('@vueuse/core')['watchWithFilter']>
+    readonly whenever: UnwrapRef<typeof import('@vueuse/core')['whenever']>
+  }
+}
+declare module '@vue/runtime-core' {
+  interface ComponentCustomProperties {
+    readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+    readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
+    readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
+    readonly computed: UnwrapRef<typeof import('vue')['computed']>
+    readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']>
+    readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']>
+    readonly computedInject: UnwrapRef<typeof import('@vueuse/core')['computedInject']>
+    readonly computedWithControl: UnwrapRef<typeof import('@vueuse/core')['computedWithControl']>
+    readonly controlledComputed: UnwrapRef<typeof import('@vueuse/core')['controlledComputed']>
+    readonly controlledRef: UnwrapRef<typeof import('@vueuse/core')['controlledRef']>
+    readonly createApp: UnwrapRef<typeof import('vue')['createApp']>
+    readonly createEventHook: UnwrapRef<typeof import('@vueuse/core')['createEventHook']>
+    readonly createGlobalState: UnwrapRef<typeof import('@vueuse/core')['createGlobalState']>
+    readonly createInjectionState: UnwrapRef<typeof import('@vueuse/core')['createInjectionState']>
+    readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
+    readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
    readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
+    readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
    readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
    readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
    readonly debouncedRef: UnwrapRef<typeof import('@vueuse/core')['debouncedRef']>
@ -346,7 +635,6 @@ declare module 'vue' {
    readonly refThrottled: UnwrapRef<typeof import('@vueuse/core')['refThrottled']>
    readonly refWithControl: UnwrapRef<typeof import('@vueuse/core')['refWithControl']>
    readonly resolveComponent: UnwrapRef<typeof import('vue')['resolveComponent']>
-    readonly resolveDirective: UnwrapRef<typeof import('vue')['resolveDirective']>
    readonly resolveRef: UnwrapRef<typeof import('@vueuse/core')['resolveRef']>
    readonly resolveUnref: UnwrapRef<typeof import('@vueuse/core')['resolveUnref']>
    readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
@ -361,6 +649,7 @@ declare module 'vue' {
    readonly toReactive: UnwrapRef<typeof import('@vueuse/core')['toReactive']>
    readonly toRef: UnwrapRef<typeof import('vue')['toRef']>
    readonly toRefs: UnwrapRef<typeof import('vue')['toRefs']>
+    readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
    readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
    readonly tryOnBeforeMount: UnwrapRef<typeof import('@vueuse/core')['tryOnBeforeMount']>
    readonly tryOnBeforeUnmount: UnwrapRef<typeof import('@vueuse/core')['tryOnBeforeUnmount']>
@ -371,11 +660,14 @@ declare module 'vue' {
    readonly unrefElement: UnwrapRef<typeof import('@vueuse/core')['unrefElement']>
    readonly until: UnwrapRef<typeof import('@vueuse/core')['until']>
    readonly useActiveElement: UnwrapRef<typeof import('@vueuse/core')['useActiveElement']>
+    readonly useAnimate: UnwrapRef<typeof import('@vueuse/core')['useAnimate']>
+    readonly useArrayDifference: UnwrapRef<typeof import('@vueuse/core')['useArrayDifference']>
    readonly useArrayEvery: UnwrapRef<typeof import('@vueuse/core')['useArrayEvery']>
    readonly useArrayFilter: UnwrapRef<typeof import('@vueuse/core')['useArrayFilter']>
    readonly useArrayFind: UnwrapRef<typeof import('@vueuse/core')['useArrayFind']>
    readonly useArrayFindIndex: UnwrapRef<typeof import('@vueuse/core')['useArrayFindIndex']>
    readonly useArrayFindLast: UnwrapRef<typeof import('@vueuse/core')['useArrayFindLast']>
+    readonly useArrayIncludes: UnwrapRef<typeof import('@vueuse/core')['useArrayIncludes']>
    readonly useArrayJoin: UnwrapRef<typeof import('@vueuse/core')['useArrayJoin']>
    readonly useArrayMap: UnwrapRef<typeof import('@vueuse/core')['useArrayMap']>
    readonly useArrayReduce: UnwrapRef<typeof import('@vueuse/core')['useArrayReduce']>
@ -461,6 +753,8 @@ declare module 'vue' {
    readonly useOnline: UnwrapRef<typeof import('@vueuse/core')['useOnline']>
    readonly usePageLeave: UnwrapRef<typeof import('@vueuse/core')['usePageLeave']>
    readonly useParallax: UnwrapRef<typeof import('@vueuse/core')['useParallax']>
+    readonly useParentElement: UnwrapRef<typeof import('@vueuse/core')['useParentElement']>
+    readonly usePerformanceObserver: UnwrapRef<typeof import('@vueuse/core')['usePerformanceObserver']>
    readonly usePermission: UnwrapRef<typeof import('@vueuse/core')['usePermission']>
    readonly usePointer: UnwrapRef<typeof import('@vueuse/core')['usePointer']>
    readonly usePointerLock: UnwrapRef<typeof import('@vueuse/core')['usePointerLock']>
@ -526,8 +820,10 @@ declare module 'vue' {
    readonly watchArray: UnwrapRef<typeof import('@vueuse/core')['watchArray']>
    readonly watchAtMost: UnwrapRef<typeof import('@vueuse/core')['watchAtMost']>
    readonly watchDebounced: UnwrapRef<typeof import('@vueuse/core')['watchDebounced']>
+    readonly watchDeep: UnwrapRef<typeof import('@vueuse/core')['watchDeep']>
    readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
    readonly watchIgnorable: UnwrapRef<typeof import('@vueuse/core')['watchIgnorable']>
+    readonly watchImmediate: UnwrapRef<typeof import('@vueuse/core')['watchImmediate']>
    readonly watchOnce: UnwrapRef<typeof import('@vueuse/core')['watchOnce']>
    readonly watchPausable: UnwrapRef<typeof import('@vueuse/core')['watchPausable']>
    readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@ -1,5 +1,7 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 import '@vue/runtime-core'

@ -68,7 +70,6 @@ declare module '@vue/runtime-core' {
    RightPanel: typeof import('./../components/RightPanel/index.vue')['default']
    RouterLink: typeof import('vue-router')['RouterLink']
    RouterView: typeof import('vue-router')['RouterView']
-    Screenfull: typeof import('./../components/Screenfull/index.vue')['default']
    SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default']
    SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default']
    SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -1,19 +1,25 @@
-import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import { useUserStoreHook } from '@/store/modules/user';
+import axios, { InternalAxiosRequestConfig, AxiosResponse } from "axios";
+import { useUserStoreHook } from "@/store/modules/user";

 // 创建 axios 实例
 const service = axios.create({
  baseURL: import.meta.env.VITE_APP_BASE_API,
  timeout: 50000,
-  headers: { 'Content-Type': 'application/json;charset=utf-8' }
+  headers: { "Content-Type": "application/json;charset=utf-8" },
 });

 // 请求拦截器
 service.interceptors.request.use(
  (config: InternalAxiosRequestConfig) => {
    const userStore = useUserStoreHook();
-    if (userStore.token) {
-      config.headers.Authorization = userStore.token;
+    if (userStore.tokenIng) {
+      config.headers.Authorization = userStore.tokenIng;
+    }
+    if (userStore.userKey) {
+      config.headers["user-key"] = userStore.userKey;
+    }
+    if (userStore.userToken) {
+      config.headers["user-token"] = userStore.userToken;
    }
    return config;
  },
@ -26,31 +32,51 @@ service.interceptors.request.use(
 service.interceptors.response.use(
  (response: AxiosResponse) => {
    const { code, msg } = response.data;
-    if (code === '00000') {
+		// console.log("响应拦截器111",code, msg)
+    if (code === 0) {
      return response.data;
    }
+		if (code === 7 || code === 300 || code === 301 || code === 302){
+			ElMessageBox.confirm("身份令牌已失效！请重新登录！", "提示", {
+				confirmButtonText: "确定",
+				type: "warning",
+			}).then(() => {
+				localStorage.clear();
+				window.location.href = "/";
+			});
+			return response.data;
+		}
    // 响应数据为二进制流处理(Excel导出)
    if (response.data instanceof ArrayBuffer) {
      return response;
    }
-
-    ElMessage.error(msg || '系统出错');
-    return Promise.reject(new Error(msg || 'Error'));
+		
+    ElMessage.error(msg || "系统出错!");
+    return Promise.reject(new Error(msg || "Error"));
  },
  (error: any) => {
    if (error.response.data) {
      const { code, msg } = error.response.data;
+			console.log("响应拦截器",code, msg)
      // token 过期,重新登录
-      if (code === 'A0230') {
-        ElMessageBox.confirm('当前页面已失效，请重新登录', '提示', {
-          confirmButtonText: '确定',
-          type: 'warning'
+      if (code === "A0230") {
+        ElMessageBox.confirm("当前页面已失效，请重新登录", "提示", {
+          confirmButtonText: "确定",
+          type: "warning",
+        }).then(() => {
+          localStorage.clear();
+          window.location.href = "/";
+        });
+      }else if(code === 7 || code === 300 || code === 301 || code === 302){
+				ElMessageBox.confirm("身份令牌已失效！请重新登录！", "提示", {
+          confirmButtonText: "确定",
+          type: "warning",
        }).then(() => {
          localStorage.clear();
-          window.location.href = '/';
+          window.location.href = "/";
        });
-      } else {
-        ElMessage.error(msg || '系统出错');
+			} else {
+        ElMessage.error(msg || "系统出错!!");
      }
    }
    return Promise.reject(error.message);
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -54,12 +54,12 @@
      </el-tooltip>

      <!-- 验证码 -->
-      <el-form-item prop="verifyCode">
+      <el-form-item prop="captcha">
        <span class="p-2 text-white">
          <svg-icon icon-class="verify_code" />
        </span>
        <el-input
-          v-model="loginData.verifyCode"
+          v-model="loginData.captcha"
          auto-complete="off"
          :placeholder="$t('login.verifyCode')"
          class="w-[60%]"
@ -99,7 +99,7 @@ import { useUserStore } from "@/store/modules/user";

 // API依赖
 import { LocationQuery, LocationQueryValue, useRoute } from "vue-router";
-import { getCaptchaApi } from "@/api/auth";
+import { getCaptchaApi, getCaptchaApiIng } from "@/api/auth";
 import { LoginData } from "@/api/auth/types";

 const userStore = useUserStore();
@ -128,7 +128,7 @@ const captchaBase64 = ref();
 const loginFormRef = ref(ElForm);

 const loginData = ref<LoginData>({
-  username: "admin",
+  username: "300450",
  password: "123456",
 });

@ -143,7 +143,7 @@ const loginRules = {
 */
 function passwordValidator(rule: any, value: any, callback: any) {
  if (value.length < 6) {
-    callback(new Error("The password can not be less than 6 digits"));
+    callback(new Error("密码不能少于6位"));
  } else {
    callback();
  }
@ -161,10 +161,11 @@ function checkCapslock(e: any) {
 * 获取验证码
 */
 function getCaptcha() {
-  getCaptchaApi().then(({ data }) => {
-    const { verifyCodeBase64, verifyCodeKey } = data;
-    loginData.value.verifyCodeKey = verifyCodeKey;
-    captchaBase64.value = verifyCodeBase64;
+  getCaptchaApiIng().then(({ data }) => {
+    const { verifyCodeBase64, verifyCodeKey, captchaid, picPath } = data;
+    loginData.value.verifyCodeKey = captchaid;
+    loginData.value.captchaId = captchaid;
+    captchaBase64.value = picPath;
  });
 }

@ -233,6 +234,7 @@ onMounted(() => {
        width: 120px;
        height: 48px;
        cursor: pointer;
+        background-color: #fff;
      }
    }
  }
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -36,7 +36,7 @@ const menuOptions = ref<OptionType[]>([]);
 const formData = reactive<MenuForm>({
  parentId: 0,
  visible: 1,
-  sort: 1,
+  sort: 50,
  type: MenuTypeEnum.MENU,
 });

@ -105,7 +105,7 @@ function openDialog(parentId?: number, menuId?: number) {
      dialog.visible = true;
      if (menuId) {
        dialog.title = "编辑菜单";
-        getMenuForm(menuId).then(({ data }) => {
+        getMenuForm({id:menuId.toString()}).then(({ data }) => {
          Object.assign(formData, data);
          menuCacheData.type = data.type;
          menuCacheData.path = data.path ?? "";
@ -136,8 +136,9 @@ function submitForm() {
  menuFormRef.value.validate((isValid: boolean) => {
    if (isValid) {
      const menuId = formData.id;
+			console.log("菜单提交",formData,menuId,formData.id)
      if (menuId) {
-        updateMenu(menuId, formData).then(() => {
+        updateMenu(formData).then(() => {
          ElMessage.success("修改成功");
          closeDialog();
          handleQuery();
@ -168,7 +169,7 @@ function handleDelete(menuId: number) {
    type: "warning",
  })
    .then(() => {
-      deleteMenu(menuId).then(() => {
+      deleteMenu({id:menuId.toString()}).then(() => {
        ElMessage.success("删除成功");
        handleQuery();
      });
@ -194,7 +195,7 @@ function resetForm() {
  formData.id = undefined;
  formData.parentId = 0;
  formData.visible = 1;
-  formData.sort = 1;
+  formData.sort = 50;
  formData.perm = undefined;
 }

@ -269,17 +270,17 @@ onMounted(() => {
        <el-table-column label="类型" align="center" width="80">
          <template #default="scope">
            <el-tag
-              v-if="scope.row.type === MenuTypeEnum.CATALOG"
+              v-if="scope.row.class === MenuTypeEnum.CATALOG"
              type="warning"
              >目录</el-tag
            >
-            <el-tag v-if="scope.row.type === MenuTypeEnum.MENU" type="success"
+            <el-tag v-if="scope.row.class === MenuTypeEnum.MENU" type="success"
              >菜单</el-tag
            >
-            <el-tag v-if="scope.row.type === MenuTypeEnum.BUTTON" type="danger"
+            <el-tag v-if="scope.row.class === MenuTypeEnum.BUTTON" type="danger"
              >按钮</el-tag
            >
-            <el-tag v-if="scope.row.type === MenuTypeEnum.EXTLINK" type="info"
+            <el-tag v-if="scope.row.class === MenuTypeEnum.EXTLINK" type="info"
              >外链</el-tag
            >
          </template>
@ -434,13 +435,13 @@ onMounted(() => {
        </el-form-item>

        <!-- 权限标识 -->
-        <el-form-item
+        <!-- <el-form-item
          v-if="formData.type == 'BUTTON'"
          label="权限标识"
          prop="perm"
        >
          <el-input v-model="formData.perm" placeholder="sys:user:add" />
-        </el-form-item>
+        </el-form-item> -->

        <el-form-item
          v-if="formData.type !== 'BUTTON'"
@ -461,7 +462,7 @@ onMounted(() => {
        <el-form-item v-if="formData.type !== 'BUTTON'" label="状态">
          <el-radio-group v-model="formData.visible">
            <el-radio :label="1">显示</el-radio>
-            <el-radio :label="0">隐藏</el-radio>
+            <el-radio :label="2">隐藏</el-radio>
          </el-radio-group>
        </el-form-item>

--- a/vite.config.ts
+++ b/vite.config.ts
@ -43,7 +43,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
      proxy: {
        // 反向代理解决跨域
        [env.VITE_APP_BASE_API]: {
-          target: "http://vapi.youlai.tech", // 线上接口地址
+          target: env.VITE_APP_BASE_URL,
+          // target: "http://vapi.youlai.tech", // 线上接口地址
          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
          changeOrigin: true,
          rewrite: (path) =>
Author	SHA1	Message	Date
超级管理员	1cca8cb3f9	菜单编辑完成	3 years ago
超级管理员	4cdb5577f7	修改基础页面	3 years ago
超级管理员	9c73ea0f00	修改基本参数	3 years ago
超级管理员	3b4b91439b	修改基本参数	3 years ago