From 6501f775d66520f61aec9ed2e411635f473dc24a Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Thu, 19 Mar 2026 14:05:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 6 +++--- .../packages/core/layouts/screen/index.vue | 3 ++- web-vue/packages/core/router/constant.ts | 1 - web-vue/packages/core/router/routes/index.ts | 12 ++++++++++- .../core/router/routes/modules/screen.ts | 20 +++++++------------ web/src/main/resources/config/application.yml | 6 +++--- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 24af974..c9fe6b1 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -58,9 +58,9 @@ jdbc: # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: root - password: 123456 + url: jdbc:mysql://127.0.0.1:13306/my_app?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: dream + password: info_dream testSql: SELECT 1 # # Oracle 数据库配置 diff --git a/web-vue/packages/core/layouts/screen/index.vue b/web-vue/packages/core/layouts/screen/index.vue index 02409e3..794007b 100644 --- a/web-vue/packages/core/layouts/screen/index.vue +++ b/web-vue/packages/core/layouts/screen/index.vue @@ -1,8 +1,9 @@ \ No newline at end of file + diff --git a/web-vue/packages/core/router/constant.ts b/web-vue/packages/core/router/constant.ts index 9663539..8e17765 100644 --- a/web-vue/packages/core/router/constant.ts +++ b/web-vue/packages/core/router/constant.ts @@ -6,7 +6,6 @@ export const PAGE_NOT_FOUND_NAME = 'PageNotFound'; * @description: default layout */ export const LAYOUT = () => import('@jeesite/core/layouts/default/index.vue'); -export const SCREEN_LAYOUT = () => import('@jeesite/core/layouts/screen/index.vue'); export const IFRAME_BLANK = () => import('@jeesite/core/layouts/iframe/FrameBlank.vue'); export const IFRAME_SIMPLE = () => import('@jeesite/core/layouts/iframe/FrameSimple.vue'); export const EXCEPTION_COMPONENT = () => import('@jeesite/core/layouts/views/exception/Exception.vue'); diff --git a/web-vue/packages/core/router/routes/index.ts b/web-vue/packages/core/router/routes/index.ts index f0d80b1..8dc6547 100644 --- a/web-vue/packages/core/router/routes/index.ts +++ b/web-vue/packages/core/router/routes/index.ts @@ -46,5 +46,15 @@ const ModPwdRoute: AppRouteModule = { }, }; +const BigScreenRoute: AppRouteRecordRaw = { + path: '/bigScreen', + name: 'BigScreen', + component: () => import('@jeesite/core/layouts/screen/index.vue'), + meta: { + title: t('routes.dashboard.bigScreen'), + ignoreAuth: false, + }, +}; + // Basic routing without permission -export const basicRoutes = [LoginRoute, ModPwdRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE]; +export const basicRoutes = [LoginRoute, ModPwdRoute, RootRoute, BigScreenRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE]; diff --git a/web-vue/packages/core/router/routes/modules/screen.ts b/web-vue/packages/core/router/routes/modules/screen.ts index 83af061..4b8d002 100644 --- a/web-vue/packages/core/router/routes/modules/screen.ts +++ b/web-vue/packages/core/router/routes/modules/screen.ts @@ -1,30 +1,24 @@ -import type { AppRouteModule } from '@jeesite/core/router/types'; - -import { SCREEN_LAYOUT } from '@jeesite/core/router/constant'; +import type { AppRouteRecordRaw } from '@jeesite/core/router/types'; import { t } from '@jeesite/core/hooks/web/useI18n'; +import { SCREEN_LAYOUT } from '@jeesite/core/layouts/screen/index.vue'; -const screen: AppRouteModule = { +export const BigScreenRoute: AppRouteRecordRaw = { path: '/bigScreen', name: 'BigScreen', component: SCREEN_LAYOUT, - redirect: '/screen/analysis', + redirect: '/bigScreen/Analysis', meta: { - orderNo: 10, - icon: 'i-ant-design:home-outlined', title: t('routes.dashboard.bigScreen'), + ignoreAuth: false, // 需要登录权限 }, children: [ { - path: 'bigScreen', - name: 'BigScreen', + path: 'screenAnalysis', + name: 'ScreenAnalysis', component: () => import('@jeesite/core/layouts/views/screen/analysis/index.vue'), meta: { - icon: 'i-ant-design:home-outlined', - tabIcon: 'i-ant-design:home-outlined', title: t('routes.dashboard.bigScreen'), }, }, ], }; - -export default screen; diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index a27340b..1bde02c 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -58,9 +58,9 @@ jdbc: # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: root - password: 123456 + url: jdbc:mysql://127.0.0.1:13306/my_app?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: dream + password: info_dream testSql: SELECT 1 # # Oracle 数据库配置