diff --git a/dist.zip b/dist.zip index 796fa68a..50bda6c3 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/components/closePage.vue b/src/components/closePage.vue index 6fae3f44..b9bf0f5a 100644 --- a/src/components/closePage.vue +++ b/src/components/closePage.vue @@ -31,12 +31,18 @@ export default { // console.log('路径',res) // }) - if ( this.styleType != 3 && this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1 ) { + if ( this.styleType != 3 && this.$route.path.indexOf('/project/dataBoard') != -1 || + this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || + this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || + this.$route.path.indexOf('/project/warningManage') != -1 ) { console.log(window.location.href.split('#/')[0] + '#/projectIndex') window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' //注释 } else if (this.styleType == 3){ this.$router.push({ path:'/projectV3/taskList' }) + }else if(this.$route.path.indexOf('/companyAdmin/heNanBigScreen') != -1 ){ + this.$router.push({ path:'/firm/projectManage' }) }else { + console.log('========') window.history.back() } } diff --git a/src/store/index.js b/src/store/index.js index f03d839a..5e5112f8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -49,9 +49,9 @@ export default new Vuex.Store({ FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 - // UPLOADURL: 'http://124.71.178.44:100/upload/image', - // FILEURL: 'http://124.71.178.44:100/image/', - + // UPLOADURL: 'http://139.9.66.234:6324/upload/image', + // FILEURL: 'http://139.9.66.234:6324/image/', + /* 2022-06-06 广西本地的*/ // BASEURL:'http://192.168.34.174:6023/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', diff --git a/src/views/companyAdmin/HeNan/index.vue b/src/views/companyAdmin/HeNan/index.vue index 6dd14283..0395c026 100644 --- a/src/views/companyAdmin/HeNan/index.vue +++ b/src/views/companyAdmin/HeNan/index.vue @@ -2805,10 +2805,11 @@ export default { return await $.getJSON(url); }, toOverview2() { - let routeUrl = this.$router.resolve({ - path: "/project/dataBoard/index", - }); - window.open(routeUrl.href, "_self"); + this.$router.push({ path:'/project/dataBoard/digitalSite' }) + // let routeUrl = this.$router.resolve({ + // path: "/project/dataBoard/digitalSite", + // }); + // window.open(routeUrl.href, "_self"); }, getSafeyHatSession() { getSafeyHatSessionApi().then((res) => {