Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

2024-06-17 16:59:50 +08:00
parent 09fa01122c cd1690fb28
commit 1f62153ad4
9 changed files with 499 additions and 275 deletions
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/21961.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/21961.png
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/21962.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/21962.png
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/22496.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/22496.png
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/22546.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/22546.png
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/22553.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/22553.png
--- a/hx-ai-intelligent/public/asset/image/bulbLogo/22554.png
+++ b/hx-ai-intelligent/public/asset/image/bulbLogo/22554.png
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -27,10 +27,10 @@ export const appConfig = {
  themeConfig: {
    bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`,
  },
-  // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
-  //   console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
-  //   next();
-  // },
+  userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
+    console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
+    next();
+  },

  // customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),

--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue