From 46df470bbba226da5224d9adc1c47ecfadf11e1d Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期四, 18 七月 2024 14:21:01 +0800 Subject: [PATCH] chart resize --- src/router/backEnd.ts | 96 +++++++++++------------------------------------ 1 files changed, 23 insertions(+), 73 deletions(-) diff --git a/src/router/backEnd.ts b/src/router/backEnd.ts index 12e2b62..078e7d8 100644 --- a/src/router/backEnd.ts +++ b/src/router/backEnd.ts @@ -1,18 +1,14 @@ -import { RouteRecordRaw } from 'vue-router'; -import { storeToRefs } from 'pinia'; -import pinia from '/@/stores/index'; -import { useUserInfo } from '/@/stores/userInfo'; -import { useRequestOldRoutes } from '/@/stores/requestOldRoutes'; -import { Local, Session } from '/@/utils/storage'; -import { NextLoading } from '/@/utils/loading'; +import type { RouteRecordRaw } from 'vue-router'; +import { parseMenuTree, useMenuApi } from '/@/api/menu/index'; +import { formatFlatteningRoutes, formatTwoStageRoutes, router } from '/@/router/index'; +import { pathMap } from '/@/router/pathMap'; import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route'; -import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index'; +import pinia from '/@/stores/index'; +import { useRequestOldRoutes } from '/@/stores/requestOldRoutes'; import { useRoutesList } from '/@/stores/routesList'; import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes'; -import { parseMenuTree, useMenuApi } from '/@/api/menu/index'; -import { ElMessage } from 'element-plus'; -import { pathMap } from '/@/router/pathMap'; -import { accessTokenKey, clearAccessTokens } from '/@/utils/request'; +import { menuData } from '../api/menu/menuData'; + // 鍚庣鎺у埗璺敱 @@ -38,41 +34,26 @@ */ export async function initBackEndControlRoutes() { // 鐣岄潰 loading 鍔ㄧ敾寮�濮嬫墽琛� - if (window.nextLoading === undefined) NextLoading.start(); + // if (window.nextLoading === undefined) NextLoading.start(); // 鏃� token 鍋滄鎵ц涓嬩竴姝� - if (!Local.get(accessTokenKey)) return false; + // if (!Local.get(accessSessionKey)) return false; // 瑙﹀彂鍒濆鍖栫敤鎴蜂俊鎭� pinia // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP // await useUserInfo().setUserInfos(); // 鑾峰彇璺敱鑿滃崟鏁版嵁 - const res = (await getBackEndControlRoutes()) as any; + const formattedTreeMenu = parseMenuTree(menuData as any, pathMap); + // 鏃犵櫥褰曟潈闄愭椂锛屾坊鍔犲垽鏂� + // https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO + // if (res.data.length <= 0) return Promise.resolve(true); + // 瀛樺偍鎺ュ彛鍘熷璺敱锛堟湭澶勭悊component锛夛紝鏍规嵁闇�姹傞�夋嫨浣跨敤 + useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(formattedTreeMenu))); - if (res?.Code === 0) { - if (res.Data) { - const formattedTreeMenu = parseMenuTree(res.Data, pathMap); - // 鏃犵櫥褰曟潈闄愭椂锛屾坊鍔犲垽鏂� - // https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO - // if (res.data.length <= 0) return Promise.resolve(true); - // 瀛樺偍鎺ュ彛鍘熷璺敱锛堟湭澶勭悊component锛夛紝鏍规嵁闇�姹傞�夋嫨浣跨敤 - useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(formattedTreeMenu))); - - // 澶勭悊璺敱锛坈omponent锛夛紝鏇挎崲 dynamicRoutes锛�/@/router/route锛夌涓�涓《绾� children 鐨勮矾鐢� - dynamicRoutes[0].children = await backEndComponent(formattedTreeMenu); - // 娣诲姞鍔ㄦ�佽矾鐢� - await setAddRoute(); - // 璁剧疆璺敱鍒� pinia routesList 涓紙宸插鐞嗘垚澶氱骇宓屽璺敱锛夊強缂撳瓨澶氱骇宓屽鏁扮粍澶勭悊鍚庣殑涓�缁存暟缁� - await setFilterMenuAndCacheTagsViewRoutes(); - } - if (!res.Data || res.Data?.length === 0) { - ElMessage.error('璇ヨ处鍙锋殏鏃舵病鏈夎彍鍗曪紝璇峰皾璇曞垏鎹㈣处鍙凤紒'); - clearAccessTokens(); - } - } else { - ElMessage.error('鑾峰彇鑿滃崟澶辫触' + (res?.Message ? `锛�${JSON.stringify(res.Message)}` : '') + '璇峰皾璇曞垏鎹㈣处鍙�'); - clearAccessTokens(); - - return Promise.resolve(true); - } + // 澶勭悊璺敱锛坈omponent锛夛紝鏇挎崲 dynamicRoutes锛�/@/router/route锛夌涓�涓《绾� children 鐨勮矾鐢� + dynamicRoutes[0].children = await backEndComponent(formattedTreeMenu); + // 娣诲姞鍔ㄦ�佽矾鐢� + await setAddRoute(); + // 璁剧疆璺敱鍒� pinia routesList 涓紙宸插鐞嗘垚澶氱骇宓屽璺敱锛夊強缂撳瓨澶氱骇宓屽鏁扮粍澶勭悊鍚庣殑涓�缁存暟缁� + await setFilterMenuAndCacheTagsViewRoutes(); } /** @@ -101,7 +82,7 @@ * @returns 杩斿洖鏇挎崲鍚庣殑璺敱鏁扮粍 */ export function setFilterRouteEnd() { - let filterRouteEnd: any = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes)); + const filterRouteEnd: any = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes)); // notFoundAndNoPower 闃叉 404銆�401 涓嶅湪 layout 甯冨眬涓紝涓嶈缃殑璇濓紝404銆�401 鐣岄潰灏嗗叏灞忔樉绀� // 鍏宠仈闂 No match found for location with path 'xxx' filterRouteEnd[0].children = [...filterRouteEnd[0].children, ...notFoundAndNoPower]; @@ -119,37 +100,6 @@ router.addRoute(route); }); } - -/** - * 璇锋眰鍚庣璺敱鑿滃崟鎺ュ彛 - * @description isRequestRoutes 涓� true锛屽垯寮�鍚悗绔帶鍒惰矾鐢� - * @returns 杩斿洖鍚庣璺敱鑿滃崟鏁版嵁 - */ -export async function getBackEndControlRoutes() { - // 妯℃嫙 admin 涓� test - const stores = useUserInfo(); - let userInfo = (await stores.getUserInfo()) as any; - const { - SoftWare: { ID: SoftwareID }, - User: { ID: UserID }, - } = userInfo; - const params = { SoftwareID, UserID }; - return menuApi.getAdminMenu(params); - // const auth = userInfos.value.roles[0]; - // 绠$悊鍛� admin - // if (auth === 'admin') return menuApi.getAdminMenu(); - // 鍏跺畠鐢ㄦ埛 test - // else return menuApi.getTestMenu(); -} - -/** - * 閲嶆柊璇锋眰鍚庣璺敱鑿滃崟鎺ュ彛 - * @description 鐢ㄤ簬鑿滃崟绠$悊鐣岄潰鍒锋柊鑿滃崟锛堟湭杩涜娴嬭瘯锛� - * @description 璺緞锛�/src/views/system/menu/component/addMenu.vue - */ -// export async function setBackEndControlRefreshRoutes() { -// await getBackEndControlRoutes(); -// } /** * 鍚庣璺敱 component 杞崲 -- Gitblit v1.9.3