admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
Vce 2024-04-14 22:53:26 +08:00
parent 5ffa187cf6
commit e1a107321f
2 changed files with 112 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/login/login.vue
View File

@ -140,7 +140,7 @@
uni.setStorageSync('account', e.detail.value.account);
uni.setStorageSync('password', e.detail.value.password);
uni.setStorageSync('userInfo', JSON.stringify(res.result));
if (res.result.accountType == 5 || res.result.accountType == 6) {
if (res.result.accountType == 5 || res.result.accountType == 6 || res.result.accountType == 10) {
if (res.result.styleType == 1) {
uni.redirectTo({
url: '/pages/projectEnd/projectIndex/projectIndex'

159
pages/projectEnd/projectIndex/projectIndex.vue
View File

@ -1,7 +1,9 @@
<template>
<view class="fullHeight projectIndexPage" style="background-color: white">
<scroll-view class="" :class="accountType == 5 || accountType == 6 ? 'smallHeight' : ''" scroll-y>
<headers :showBack="accountType == 5 || accountType == 6 ? false : true" :themeType="'white'">
<scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
scroll-y>
<headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
:themeType="'white'">
<view class="headerName">
{{ projectDetail.projectName }}
</view>
@ -130,7 +132,7 @@
<view class="position"> 巡检点位置：{{ qrCode.position }} </view>
</view>
</uni-popup>
<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6"></footers>
<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
</view>
</template>
@ -208,6 +210,7 @@
},
onLoad() {
var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
let that = this;
console.log('userInfo===========', userInfo)
this.userInfo = userInfo
this.accountType = userInfo.accountType
@ -217,18 +220,48 @@
console.log('上面的', arr)
this.systemInfo = uni.getStorageSync('systemInfo')
this.getSystemLogoConfig()
this.getAllModule(arr)
if (this.accountType == 5 || this.accountType == 6) {
this.searchsn = userInfo.sn
this.getProjectDetail()
this.getAllModule(arr)
} else if(this.accountType == 10){
this.sendRequest({
url: 'xmgl/company/getTenantOrgTreeList',
data: {
userId: userInfo.userId,
},
method: 'POST',
success(res) {
console.log(res,'777888')
if(res && res.result && res.result.length > 0){
let responseData = res.result;
that.selectedDefaultProject(responseData[0])
}
}
})
} else {
this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'))
this.loadWeather()
this.getAllModule(arr)
}
this.viewVersionInfo()
},
onReady() {},
methods: {
// 默认选中第一个组织的第一个项目
selectedDefaultProject(obj) {
if (obj.list && obj.list.length > 0) {
obj.list.map((item) => {
this.selectedDefaultProject(item);
});
} else {
this.searchsn = obj.sn
console.log(obj.sn,888999)
this.getProjectDetail()
this.getAllModule([])
uni.setStorageSync('userInfo',JSON.stringify({...this.userInfo,sn: obj.sn}))
}
},
viewVersionInfo() {
console.log('进入页面调用');
//fix 避开检查更新 罗劲章
@ -262,7 +295,7 @@
console.log('获取当前app应用版本号', that.versionNo);
console.log('获取平台版本号', res2.result.versionNo);
let jxjAppVersionNo = res2.result.versionNo
if (res2.result && jxjAppVersionNo !== that.versionNo) {
uni.showModal({
title: '版本更新',
@ -626,52 +659,82 @@
getAllModule(half) {
console.log('half====', half)
var that = this
this.sendRequest({
url: 'xmgl/baseModule/list',
data: {
styleType: this.styType
},
method: 'POST',
success(res) {
var all = res.result
all.forEach((element, index) => {
all[index].operation = false
half.forEach((element2) => {
if (element2.moduleId == element.moduleId) {
all[index].operation = true
all[index].menuList = element2.menuList
}
let newAll = all[index].menuList
if (this.accountType == 10) {
this.sendRequest({
url: 'xmgl/baseModule/getModuleAndMenuList',
data: {
projectSn: this.searchsn,
userId: this.userInfo.userId,
moduleType: 2,
},
method: 'POST',
success(res) {
if (res.success) {
var all = res.result.moduleList;
console.log("all", all);
all.forEach((element, index) => {
all[index].operation = false;
res.result.menuList.forEach((element2) => {
console.log(element2, 77888)
if (element2.moduleId == element.moduleId) {
all[index].operation = true;
}
});
});
console.log("all111", all);
that.list = all;
}
}
})
} else {
this.sendRequest({
url: 'xmgl/baseModule/list',
data: {
moduleType: 2,
styleType: this.styType
},
method: 'POST',
success(res) {
var all = res.result
all.forEach((element, index) => {
all[index].operation = false
half.forEach((element2) => {
if (element2.moduleId == element.moduleId) {
all[index].operation = true
all[index].menuList = element2.menuList
}
let newAll = all[index].menuList
})
})
})
that.list = all
// this.list=newAppShow
that.list = all
// this.list=newAppShow
//添加报警提示模块
console.log('用户列表', that.list)
// that.list.push({
// operation:true,
// appName: "报警提示",
// appShow: 1,
// bigModuleIcon: "log_active2",
// disableModuleIcon: null,
// labelName: "报警提示",
// labelSortNum: "7",
// menuList: null,
// moduleDesc: "",
// moduleEquipment: 0,
// moduleIcon: "log_active",
// moduleIcon2: "log",
// moduleId: "41",
// moduleName: "报警提示",
// modulePath: "",
// moduleType: 2,
// plugin: "constructionLog",
// styleType: 1
// });
}
})
//添加报警提示模块
console.log('用户列表', that.list)
// that.list.push({
// operation:true,
// appName: "报警提示",
// appShow: 1,
// bigModuleIcon: "log_active2",
// disableModuleIcon: null,
// labelName: "报警提示",
// labelSortNum: "7",
// menuList: null,
// moduleDesc: "",
// moduleEquipment: 0,
// moduleIcon: "log_active",
// moduleIcon2: "log",
// moduleId: "41",
// moduleName: "报警提示",
// modulePath: "",
// moduleType: 2,
// plugin: "constructionLog",
// styleType: 1
// });
}
})
}
}
}
}