diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js index bba08826..dd6f5097 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js @@ -5,7 +5,7 @@ const baseUrl = "/app-enf"; // region 认证模块 export const enforcementLogin = (params, success, error) => _post(baseUrl + "/login/szyptLogin", params, success, error); -// export const enforcementLogin = (params, success, error) => _post(baseUrl + "/login/do", params, success, error); +export const enforcementLoginByPassword = (params, success, error) => _post(baseUrl + "/login/do", params, success, error); // endregion // region 企业模块 diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js index 5e945cc4..54c21aeb 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js @@ -9,6 +9,14 @@ const routes = [ isKeepAlive: false, }, }, + { + path: "/enforcement/loginByPassword", + name: "enforcementLoginByPassword", + component: () => import("@/views/enforcement/loginByPassword.vue"), + meta: { + isKeepAlive: false, + }, + }, // 执法端首页 { path: "/enforcement/enforcementHome", diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue new file mode 100644 index 00000000..b625ab65 --- /dev/null +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -0,0 +1,163 @@ + + + + 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 0a68ac40..2f56d848 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,7 +25,7 @@ const loadPluginModules = async () => { // 基本配置 const baseCfg = (viteEnv = {}) => { - const { VITE_BASE_URL, VITE_PORT } = viteEnv; + const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET } = viteEnv; return { base: './', envDir: "vite-env", @@ -43,12 +43,10 @@ const baseCfg = (viteEnv = {}) => { cors: true, proxy: { '/api': { - // target: 'http://localhost:17000', - target: 'http://139.186.148.21:8080', + target: VITE_PROXY_TARGET || 'http://localhost:17000', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }, - } }, build: { 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 3ff75452..730a32d8 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 @@ -1,5 +1,6 @@ # 执法端开发环境 VITE_PORT = 12002 VITE_BASE_URL = '/api/enf-ep' -VITE_DEFAULT_LOGIN = '/enforcement/login' +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 ff4cbce9..2e8965f7 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 @@ -1,5 +1,6 @@ # 执法端生产环境 VITE_PORT = 12002 VITE_BASE_URL = 'http://localhost:17000/enf-ep' +VITE_PROXY_TARGET = 'http://localhost:17000' 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 c5cb41ba..954962aa 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 @@ -1,5 +1,6 @@ # 执法端测试环境 VITE_PORT = 12002 VITE_BASE_URL = '/api' +VITE_PROXY_TARGET = 'http://139.186.148.21:8080' VITE_DEFAULT_LOGIN = '/enforcement/login' VITE_APP_ENV = 'test'