diff --git a/ng/3/nginx.conf b/ng/3/nginx.conf index 87d7177b..9cc07ce8 100644 --- a/ng/3/nginx.conf +++ b/ng/3/nginx.conf @@ -107,12 +107,12 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - location /efcode20-sup-web/ { - proxy_pass http://10.76.108.15:12004/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } +# location /efcode20-sup-web/ { +# proxy_pass http://10.76.108.15:12004/; +# proxy_set_header Host $http_host; +# proxy_set_header X-Real-IP $remote_addr; +# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +# } #location ~* /(uploads|images)/.*\.(php|php2|php3|php4|php5|phpm|phpml|phtml|phtm|phps|pht|asp|aspx|asa|cer|cdx|ashx|exe|sh|bash|jsp|jspx|jspa|html|web.config|cfm|cgi|war|ashx|htaccess|py|pl)$ { #deny all; # 拦截.html和.htm文件，并返回403禁止访问 #return 403; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-zrb-cust b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-zrb-cust index 80bb7d9c..c1aada7a 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-zrb-cust +++ b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-zrb-cust @@ -1,6 +1,6 @@ VITE_APP_PROXY_TARGET = 'http://localhost:17000/sup-ep' # 页面标题 -VITE_APP_TITLE = zdxt-Vue-Plus多租户管理系统 +VITE_APP_TITLE = 执法监督码•执法监督 VITE_APP_LOGO_TITLE = 执法监督码•执法监督 # 开发环境配置 diff --git a/zdxt-web-client/zdxt-admin-plus-ui/.env.production b/zdxt-web-client/zdxt-admin-plus-ui/.env.production index dfe732f3..2ebaaf20 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/.env.production +++ b/zdxt-web-client/zdxt-admin-plus-ui/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = zdxt-Vue-Plus多租户管理系统 +VITE_APP_TITLE = 执法监督码•执法监督 VITE_APP_LOGO_TITLE = 执法监督码•执法监督 # 生产环境配置 diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/types.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/types.ts index 617286c6..09b68e4d 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/types.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/types.ts @@ -33,6 +33,7 @@ export interface LoginData { */ export interface LoginResult { access_token: string; + v1_system_credential?: string; } /** diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts index c1e16e6a..6e24c624 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts @@ -10,6 +10,7 @@ import InnerLink from '@/layout/components/InnerLink/index.vue'; import { ref, computed } from 'vue'; import { createCustomNameComponent } from '@/utils/createCustomNameComponent'; import { isHttp } from '@/utils/validate'; +import { useUserStore } from '@/store/modules/user'; // 匹配views里面所有的.vue文件 const modules = import.meta.glob('./../../views/**/*.vue'); @@ -27,12 +28,26 @@ export interface SystemCodeOption { export const CATCH_ALL_ROUTE_NAME = 'CatchAll404'; export const systemCodeOptions: SystemCodeOption[] = [ - { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://localhost:85/loginByUserId?userId=1&secretKey=zdxt2024emergencyPlatForm' }, + { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://localhost:85/loginByUserId' }, { label: '执法监督码', value: 'supervisionCode', icon: 'Document' }, { label: '后台管理', value: 'authService', icon: 'Setting' } ]; export const usePermissionStore = defineStore('permission', () => { + /** + * 根据基础 iframeUrl 动态拼接登录凭据参数 + */ + const buildIframeUrl = (baseUrl: string): string => { + if (!baseUrl) return ''; + const userStore = useUserStore(); + const params = new URLSearchParams(); + if (userStore.v1SystemCredential) { + params.set('v1_system_credential', userStore.v1SystemCredential); + } + const separator = baseUrl.includes('?') ? '&' : '?'; + return baseUrl + separator + params.toString(); + }; + const routes = ref([]); const addRoutes = ref([]); const defaultRoutes = ref([]); @@ -49,7 +64,7 @@ export const usePermissionStore = defineStore('permission', () => { /** 当前是否处于 iframe 全屏模式 */ const iframeMode = ref(!!(savedOption?.iframeUrl || savedOption?.fullscreenRoute)); /** 当前 iframe 地址 */ - const iframeUrl = ref(savedOption?.iframeUrl || ''); + const iframeUrl = ref(savedOption?.iframeUrl ? buildIframeUrl(savedOption.iframeUrl) : ''); /** 当前全屏 Vue 路由地址 */ const fullscreenRoute = ref(savedOption?.fullscreenRoute || ''); @@ -161,7 +176,7 @@ export const usePermissionStore = defineStore('permission', () => { // 判断是否为全屏模式（iframe 或 Vue 路由） if (option?.iframeUrl || option?.fullscreenRoute) { iframeMode.value = true; - iframeUrl.value = option.iframeUrl || ''; + iframeUrl.value = option.iframeUrl ? buildIframeUrl(option.iframeUrl) : ''; fullscreenRoute.value = option.fullscreenRoute || ''; setSidebarRouters([]); if (option.fullscreenRoute) { @@ -217,7 +232,7 @@ export const usePermissionStore = defineStore('permission', () => { sessionStorage.setItem(SYSTEM_CODE_KEY, 'planindex'); const defaultOption = systemCodeOptions.find((o) => o.value === 'planindex'); iframeMode.value = defaultOption?.iframeUrl ? true : false; - iframeUrl.value = defaultOption?.iframeUrl || ''; + iframeUrl.value = defaultOption?.iframeUrl ? buildIframeUrl(defaultOption.iframeUrl) : ''; }; /** 根据后端返回的路由数据，动态过滤可见的系统分类选项（首页始终显示） */ diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/user.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/user.ts index 65148873..0d139d85 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/user.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/user.ts @@ -16,6 +16,7 @@ export const useUserStore = defineStore('user', () => { const avatar = ref(''); const roles = ref>([]); // 用户角色编码集合 → 判断路由权限 const permissions = ref>([]); // 用户权限编码集合 → 判断按钮权限 + const v1SystemCredential = ref(''); /** * 登录 @@ -28,6 +29,7 @@ export const useUserStore = defineStore('user', () => { const data = res.data; setToken(data.access_token); token.value = data.access_token; + v1SystemCredential.value = data.v1_system_credential || ''; // 重置用户状态和路由缓存，确保切换账号后重新加载菜单 roles.value = []; permissions.value = []; @@ -89,6 +91,7 @@ export const useUserStore = defineStore('user', () => { avatar, roles, permissions, + v1SystemCredential, login, getInfo, logout, diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue index fe577c5e..d1ba9ec6 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue @@ -3,7 +3,6 @@