diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 9194fc40..801356d1 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
- axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+ // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
- // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
+ axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
diff --git a/src/components/header.vue b/src/components/header.vue
index 0377b336..cd81b197 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -129,6 +129,18 @@
综合监管大屏
+
+ 指挥部大屏
+
{ + if (element.moduleType == 4) { + arr2.push(element); + return; + } + }); + // 如果数组为空表示该用户没有权限访问 + if (!arr2.length) { + return this.$message.warning("暂无权限"); + } + let routeUrl = this.$router.resolve({ + path: arr2[0].modulePath, + }); + window.location.href = routeUrl.href; + window._paq.push(["trackEvent", "点击", "数据看板", "进入数据看板"]); + } else { + console.log("当前跳转链接", this.newBigScreen); + //-------------------- 跳转新版七参数 + this.jumpToken = localStorage.getItem("jumpToken"); + // window.open(this.newBigScreen + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self"); + window.open('http://47.93.215.234:55544/#/login' + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self"); //跳转指挥部大屏 + // window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作,携带token过去 + } + }, toOverview3() { if (COMPANY == "shenbai") { let routeUrl = this.$router.resolve({