diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/package.json b/zdxt-web-client/zdxt-efcode-enforcement-app/package.json index 5ec624a7..bbb1abd6 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/package.json +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/package.json @@ -7,6 +7,7 @@ "vite": "vite --mode enforcement-dev", "vite-server-app:enforcement-dev": "vite --mode enforcement-dev", "vite-server-app:enforcement-test": "vite --mode enforcement-test", + "vite-server-app:enforcement-dev-zrb": "vite --mode enforcement-dev-zrb", "vite-test": "vite --mode enforcement-test", "build-app:enforcement-dev": "vite build --mode enforcement-dev --outDir dist/enforcement-dev", "build-app:enforcement-test": "vite build --mode enforcement-test --outDir dist/enforcement-test", diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/common/globalRouter.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/common/globalRouter.js index 16e0101f..41314ca4 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/common/globalRouter.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/common/globalRouter.js @@ -20,7 +20,7 @@ const $globalRouter = createRouter({ // 企业端u // history: createWebHashHistory(), // 执法端 - history: createWebHistory(), + history: createWebHistory(import.meta.env.BASE_URL), routes, }); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js index 2f56d848..6eb2f0e1 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js @@ -25,9 +25,9 @@ const loadPluginModules = async () => { // 基本配置 const baseCfg = (viteEnv = {}) => { - const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET } = viteEnv; + const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET, VITE_CONTEXT_PATH } = viteEnv; return { - base: './', + base: VITE_CONTEXT_PATH || './', envDir: "vite-env", resolve: { alias: { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev index 8dff8283..2e22e4c0 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev @@ -5,5 +5,6 @@ VITE_BASE_URL = '/api' #VITE_PROXY_TARGET = 'http://139.186.148.21:8080' VITE_API_URL = 'http://localhost:8080' VITE_PROXY_TARGET = 'http://localhost:8080' +VITE_CONTEXT_PATH = '/efcode20-enf-app/' VITE_DEFAULT_LOGIN = '/enforcement/login' VITE_APP_ENV = 'dev' diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-zrb b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-zrb new file mode 100644 index 00000000..7cb09115 --- /dev/null +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-zrb @@ -0,0 +1,7 @@ +# 执法端测试环境 +VITE_PORT = 12002 +VITE_BASE_URL = '/api/enf-ep' +VITE_CONTEXT_PATH = '/efcode20-enf-app/' +VITE_PROXY_TARGET = 'http://localhost:17000' +VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword' +VITE_APP_ENV = 'dev' diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-prod b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-prod index 2e8965f7..aa45348f 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-prod +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-prod @@ -2,5 +2,6 @@ VITE_PORT = 12002 VITE_BASE_URL = 'http://localhost:17000/enf-ep' VITE_PROXY_TARGET = 'http://localhost:17000' +VITE_CONTEXT_PATH = '/efcode20-enf-app/' VITE_DEFAULT_LOGIN = '/enforce/login' VITE_APP_ENV = 'prod' diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-test b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-test index 6d6175dd..b9890aee 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-test +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-test @@ -3,5 +3,6 @@ VITE_PORT = 12002 VITE_BASE_URL = '/api' VITE_API_URL = 'http://139.186.148.21:8080' VITE_PROXY_TARGET = 'http://139.186.148.21:8080' +VITE_CONTEXT_PATH = '/efcode20-enf-app/' VITE_DEFAULT_LOGIN = '/enforcement/login' VITE_APP_ENV = 'dev' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev index 61ae73a6..8f9c483a 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev @@ -5,5 +5,6 @@ VITE_PROXY_TARGET = 'http://139.186.148.21:8080' VITE_BASE_URL = 'http://139.186.148.21:8080' # 附件/图片等静态资源的后端地址(直接访问,不走 /api 代理) VITE_FILE_URL = 'http://139.186.148.21:8080' +VITE_CONTEXT_PATH = '/efcode20-ent-app/' VITE_DEFAULT_LOGIN = '/enterprise/enterpriseHome' VITE_APP_ENV = 'dev'