diff --git a/sgzb-ui/.env.production b/sgzb-ui/.env.production index fa20a86e..70de1124 100644 --- a/sgzb-ui/.env.production +++ b/sgzb-ui/.env.production @@ -5,5 +5,6 @@ VUE_APP_TITLE = 施工装备管理系统 ENV = 'production' # 若依管理系统/生产环境 +# VUE_APP_BASE_API = '/sgzbgl-api' VUE_APP_BASE_API = '/gl/dev-api' diff --git a/sgzb-ui/dist01.rar b/sgzb-ui/dist01.rar deleted file mode 100644 index 8ee8b6d2..00000000 Binary files a/sgzb-ui/dist01.rar and /dev/null differ diff --git a/sgzb-ui/src/layout/components/Navbar.vue b/sgzb-ui/src/layout/components/Navbar.vue index e5d41931..8628bb98 100644 --- a/sgzb-ui/src/layout/components/Navbar.vue +++ b/sgzb-ui/src/layout/components/Navbar.vue @@ -105,9 +105,8 @@ export default { this.$store.dispatch('LogOut').then(() => { // location.href = '/login'; // location.href = '/gl/login'; - - location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' - // next({ path: process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) + // location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' + next({ path: process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) }) }) .catch(() => {}) diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js index 6225c47d..5ae277d8 100644 --- a/sgzb-ui/src/permission.js +++ b/sgzb-ui/src/permission.js @@ -36,8 +36,8 @@ router.beforeEach((to, from, next) => { // next({ path: '/login' }) // next({ path: '/gl/login' }) - next({ path: process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' }) - // next({ path: process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) + // next({ path: process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' }) + next({ path: process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) }) }) } else { diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js index 930f572c..d29bfc19 100644 --- a/sgzb-ui/src/router/index.js +++ b/sgzb-ui/src/router/index.js @@ -206,8 +206,8 @@ export default new Router({ mode: 'history', // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes, - base: process.env.NODE_ENV === 'production' ? '/sgzbgl' : '' - // base: process.env.NODE_ENV === 'production' ? '/gl' : '' + // base: process.env.NODE_ENV === 'production' ? '/sgzbgl' : '' + base: process.env.NODE_ENV === 'production' ? '/gl' : '' }) diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js index bc43bea9..582d0806 100644 --- a/sgzb-ui/src/utils/globalUrl.js +++ b/sgzb-ui/src/utils/globalUrl.js @@ -5,7 +5,7 @@ // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 -const qrUrl = process.env.NODE_ENV === 'production' ? 'https://test-cc.zhgkxt.com/sgzbgl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' +const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' export default { qrUrl, } diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js index 95c04673..c9f60039 100644 --- a/sgzb-ui/src/utils/request.js +++ b/sgzb-ui/src/utils/request.js @@ -90,8 +90,8 @@ service.interceptors.response.use(res => { // location.href = '/login'; // location.href = '/gl/login'; - location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' - // location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' + // location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' + location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) }).catch(() => { isRelogin.show = false; diff --git a/sgzb-ui/src/views/resetPassword.vue b/sgzb-ui/src/views/resetPassword.vue index e24383d5..1bac21fc 100644 --- a/sgzb-ui/src/views/resetPassword.vue +++ b/sgzb-ui/src/views/resetPassword.vue @@ -100,8 +100,8 @@ export default { // location.href = '/login'; // location.href = '/gl/login'; - location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' - // location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login' + // location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' + location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' }) }) } @@ -112,8 +112,8 @@ export default { // location.href = '/login'; // location.href = '/gl/login'; - location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' - // location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login' + // location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' + location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login' }) }, },