fix: 解决冲突
This commit is contained in:
commit
0be557b435
@ -129,6 +129,18 @@
|
|||||||
<img src="@/assets/images/icon-bigData.png" alt srcset />
|
<img src="@/assets/images/icon-bigData.png" alt srcset />
|
||||||
综合监管大屏
|
综合监管大屏
|
||||||
</p>
|
</p>
|
||||||
|
<p
|
||||||
|
v-show="
|
||||||
|
$route.path.indexOf('projectIndex') != -1 &&
|
||||||
|
$store.state.userInfo.projectKanban == 0
|
||||||
|
"
|
||||||
|
class="header-btn"
|
||||||
|
style="margin-right:10px"
|
||||||
|
@click="toOverviewCommand()"
|
||||||
|
>
|
||||||
|
<img src="@/assets/images/icon-bigData.png" alt srcset />
|
||||||
|
指挥部大屏
|
||||||
|
</p>
|
||||||
<p
|
<p
|
||||||
v-show="
|
v-show="
|
||||||
$route.path.indexOf('projectIndex') != -1 &&
|
$route.path.indexOf('projectIndex') != -1 &&
|
||||||
@ -556,6 +568,39 @@ export default {
|
|||||||
// window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板'])
|
// window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板'])
|
||||||
// }
|
// }
|
||||||
},
|
},
|
||||||
|
toOverviewCommand() {
|
||||||
|
this.$forceUpdate();
|
||||||
|
this.newBigScreen = this.getNewBigScreen;
|
||||||
|
|
||||||
|
if (this.newBigScreen == null || this.newBigScreen == "") {
|
||||||
|
//--------------------原版项目后台跳转数据看板
|
||||||
|
//看看项目看板内有没有菜单
|
||||||
|
let arr = this.$store.state.userInfo.menuAuthority.moduleList;
|
||||||
|
let arr2 = [];
|
||||||
|
arr.forEach((element) => {
|
||||||
|
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() {
|
toOverview3() {
|
||||||
if (COMPANY == "shenbai") {
|
if (COMPANY == "shenbai") {
|
||||||
let routeUrl = this.$router.resolve({
|
let routeUrl = this.$router.resolve({
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user