xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #250

Merged
xiaomeng merged 13 commits from pc-master into portal 2025-06-11 01:58:21 +00:00
Conversation 0 Commits 13 Files Changed 12 +18 -14
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71e996f589 - Show all commits

30
src/views/page/largeScreen1.vue
View File

@ -901,6 +901,7 @@ export default {
popContentList2: [], popContentList2: [],
listNumber:[{id:1,num:6}, listNumber:[{id:1,num:6},
{id:2,num:35}, {id:2,num:35},
{id:4,num:6},
{id:5,num:5}, {id:5,num:5},
{id:7,num:7}, {id:7,num:7},
{id:8,num:6}, {id:8,num:6},
@ -1268,6 +1269,7 @@ export default {
this.autoPlay = true; this.autoPlay = true;
localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay)); localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
var num=this.listNumber.find(item => item.id == that.limitUserId) var num=this.listNumber.find(item => item.id == that.limitUserId)
clearInterval(this.timer2) && this.timer2;
var maxNum=num?num:0 var maxNum=num?num:0
this.timer2 = setInterval(() => { this.timer2 = setInterval(() => {
that.popContentCurrent++; that.popContentCurrent++;
@ -1310,11 +1312,23 @@ export default {
this.dataInit(userInfo.userid); this.dataInit(userInfo.userid);
},
// 获取用户id权限
get_user_getjurisdiction(userId) {
let that = this; let that = this;
this.api.user_getjurisdiction(userId).then((res) => {
if (res.data.code == 200) {
this.limitUserId = (res.data.data.filter(el => el.id == 1 || el.id == 2 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11 || el.id == 12|| el.id == 13))[0].id;
setTimeout(() => {
this.drag_boxHandler(this.limitUserId);
}, 0);
this.autoPlay = JSON.parse(localStorage.getItem("autoPlay")); this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
if (this.autoPlay == false) { if (this.autoPlay) {
clearInterval(that.timer2) && this.timer2; clearInterval(this.timer2) && this.timer2;
} else { console.log(this.limitUserId);
var num=this.listNumber.find(item => item.id == that.limitUserId) var num=this.listNumber.find(item => item.id == that.limitUserId)
var maxNum=num?num:0 var maxNum=num?num:0
this.timer2 = setInterval(() => { this.timer2 = setInterval(() => {
@ -1325,16 +1339,6 @@ export default {
}, 3000); }, 3000);
} }
},
// 获取用户id权限
get_user_getjurisdiction(userId) {
this.api.user_getjurisdiction(userId).then((res) => {
if (res.data.code == 200) {
this.limitUserId = (res.data.data.filter(el => el.id == 1 || el.id == 2 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11 || el.id == 12|| el.id == 13))[0].id;
setTimeout(() => {
this.drag_boxHandler(this.limitUserId);
}, 0);
// if (this.limitUserId == 1) { // if (this.limitUserId == 1) {
// this.drag_boxHandler(); // this.drag_boxHandler();
// } else if (this.limitUserId == 2) { // } else if (this.limitUserId == 2) {