diff --git a/yanzhu-bigscreen/public/easyplayer/EasyWasmPlayer.js b/yanzhu-bigscreen/public/easyplayer/EasyWasmPlayer.js index e7675f02..3c7b86f4 100644 --- a/yanzhu-bigscreen/public/easyplayer/EasyWasmPlayer.js +++ b/yanzhu-bigscreen/public/easyplayer/EasyWasmPlayer.js @@ -10907,7 +10907,7 @@ var nA, DA, CA, - rA = Mt + "jhbs/easyplayer/libDecoder.wasm"; + rA = Mt + "xdbs/easyplayer/libDecoder.wasm"; function cA() { try { if (Q) diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html index 3531b93b..28759ff2 100644 --- a/yanzhu-bigscreen/public/index.html +++ b/yanzhu-bigscreen/public/index.html @@ -5,7 +5,11 @@ - 产发工程数字管理平台-大屏 + 数字建安施工-大屏 + @@ -70,13 +74,14 @@ top: 0px; left: 0px;" id="divTest">
这是测试环境
访问生产环境
diff --git a/yanzhu-bigscreen/src/components-old/header.vue b/yanzhu-bigscreen/src/components-old/header.vue index 32c37af6..22c974cf 100644 --- a/yanzhu-bigscreen/src/components-old/header.vue +++ b/yanzhu-bigscreen/src/components-old/header.vue @@ -354,7 +354,7 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = '/'; + location.href =window.XDBSAPP; }) }).catch(() => { }); }, diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 2f007941..d65c6396 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -92,7 +92,7 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = '/'; + location.href = window.XDBSAPP; }) }).catch(() => { }); } diff --git a/yanzhu-bigscreen/src/permission.js b/yanzhu-bigscreen/src/permission.js index 0d81befa..40b10425 100644 --- a/yanzhu-bigscreen/src/permission.js +++ b/yanzhu-bigscreen/src/permission.js @@ -42,11 +42,8 @@ router.beforeEach((to, from, next) => { next() } else { //next(`/login?redirect=#/index`) // 否则全部重定向到登录页 - let base="/"; - if(location.host.indexOf("localhost")>=0){ - base="/xd/" - } - location.href=base+"#/login?redirect=/xdbs/#/"; + let base=window.XDAPP; + location.href=base+"#/login?redirect="+window.XDBSAPP+"#/"; NProgress.done() } } diff --git a/yanzhu-bigscreen/src/utils/request.js b/yanzhu-bigscreen/src/utils/request.js index c6b40884..bfff3fc0 100644 --- a/yanzhu-bigscreen/src/utils/request.js +++ b/yanzhu-bigscreen/src/utils/request.js @@ -76,15 +76,16 @@ service.interceptors.response.use(res => { return res.data } if (code === 401) { + debugger if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { isRelogin.show = false; if(location.href.indexOf("localhost")>=0){ - //location.href = `/#/login?redirect=${encodeURIComponent("/jhbs/")}`; - location.href=`http://localhost/#/login?redirect=${encodeURI('http://localhost:3000/jhbs/')}` + //location.href = `/#/login?redirect=${encodeURIComponent("/xdbs/")}`; + location.href=`http://localhost/#/login?redirect=${encodeURI('http://localhost:3000/xdbs/')}` }else{ - location.href = `/#/login?redirect=${encodeURIComponent("/jhbs/")}`; + location.href = window.XDAPP+`#/login?redirect=${encodeURIComponent(window.XDBSAPP)}`; } }).catch(() => { isRelogin.show = false; diff --git a/yanzhu-bigscreen/vue.config.js b/yanzhu-bigscreen/vue.config.js index a990d027..7e48aba3 100644 --- a/yanzhu-bigscreen/vue.config.js +++ b/yanzhu-bigscreen/vue.config.js @@ -71,6 +71,7 @@ module.exports = defineConfig({ vue: "Vue", }; if (process.env.NODE_ENV === "production") { + /* config.plugins.push( new WebpackObfuscator( { @@ -87,6 +88,7 @@ module.exports = defineConfig({ [] // 需要排除混淆的文件 ) ); + */ } }, });