大屏菜单修改为可配置
This commit is contained in:
parent
5f716b82df
commit
fcf8473070
@ -522,7 +522,8 @@ export default {
|
||||
console.log("当前跳转链接", this.newBigScreen);
|
||||
//-------------------- 跳转新版七参数
|
||||
this.jumpToken = localStorage.getItem("jumpToken");
|
||||
window.open(this.newBigScreen + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self");
|
||||
let userId = this.$store.state.userInfo.userId;
|
||||
window.open(this.newBigScreen + "?userId=" + userId + '&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过去
|
||||
}
|
||||
// if (this.newBigScreen != null) {
|
||||
|
||||
@ -1105,6 +1105,14 @@
|
||||
:label="i.moduleId"
|
||||
>{{ i.moduleName }}</el-checkbox
|
||||
>
|
||||
<div class="CheckboxTitle">新项目看板模块</div>
|
||||
<el-checkbox
|
||||
v-if="i.moduleType === 8"
|
||||
v-for="i in checkArr"
|
||||
:key="i.moduleId"
|
||||
:label="i.moduleId"
|
||||
>{{ i.moduleName }}</el-checkbox
|
||||
>
|
||||
</el-checkbox-group>
|
||||
<div class="dialog-footer">
|
||||
<el-button
|
||||
|
||||
@ -1077,6 +1077,7 @@ export default {
|
||||
});
|
||||
},
|
||||
parseLoginData(data, isOutside) {
|
||||
// debugger;
|
||||
if (this.projectType == "zjsj") {
|
||||
this.$store.commit("setProjectSn", data.sn);
|
||||
}
|
||||
|
||||
@ -211,6 +211,10 @@
|
||||
<el-checkbox v-if="i.moduleType === 7" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
|
||||
i.moduleName
|
||||
}}</el-checkbox>
|
||||
<div class="CheckboxTitle">新项目看板模块</div>
|
||||
<el-checkbox v-if="i.moduleType === 8" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
|
||||
i.moduleName
|
||||
}}</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -553,7 +557,7 @@ export default {
|
||||
})
|
||||
this.brHtm = brHtm
|
||||
// console.log('查看要换行的位置',brHtm)
|
||||
// console.log('列表查询所有模块信息',this.companyArr)
|
||||
console.log('列表查询所有模块信息',this.companyArr)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -383,7 +383,7 @@ export default {
|
||||
getProjectMenu() {
|
||||
getProjectModuleGroupMenuListApi({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
moduleTypes: "2,4,7",
|
||||
moduleTypes: "2,4,7,8",
|
||||
}).then((res) => {
|
||||
var DATA = res.result;
|
||||
// DATA.forEach((element,i) => {
|
||||
|
||||
@ -358,7 +358,7 @@ export default {
|
||||
getProjectMenu() {
|
||||
getProjectModuleGroupMenuListApi({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
moduleTypes:'2,4,7',
|
||||
moduleTypes:'2,4,7,8',
|
||||
}).then(res => {
|
||||
var DATA = res.result;
|
||||
// DATA.forEach((element,i) => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user