入住信息权限解决
This commit is contained in:
@@ -3,7 +3,7 @@ import request from '@/utils/request'
|
|||||||
// 查询宿舍学生关联列表
|
// 查询宿舍学生关联列表
|
||||||
export function listStudent(query) {
|
export function listStudent(query) {
|
||||||
return request({
|
return request({
|
||||||
url: '/dormitory/srs-dormitory-student/list',
|
url: '/dormitory/srs-dormitory-student/checkInInformation',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: query
|
params: query
|
||||||
})
|
})
|
||||||
@@ -12,7 +12,7 @@ export function listStudent(query) {
|
|||||||
// 新增宿舍学生关联
|
// 新增宿舍学生关联
|
||||||
export function addStudent(data) {
|
export function addStudent(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/dormitory/srs-dormitory-student/add',
|
url: '/dormitory/srs-dormitory-student/addCheckInInformation',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
})
|
})
|
||||||
@@ -75,3 +75,10 @@ export function listGrade(query = null) {
|
|||||||
params: query
|
params: query
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 查询学院名称
|
||||||
|
export function getDeptName() {
|
||||||
|
return request({
|
||||||
|
url: '/system/dept/name'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -126,7 +126,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 添加信息收集按钮 -->
|
<!-- 添加信息收集按钮 -->
|
||||||
<view class="add" @click="addDormInfo">+</view>
|
<view class="add" @click="addDormInfo" v-if="roleGroup == '学生'">+</view>
|
||||||
|
|
||||||
<!-- 滚动容器 -->
|
<!-- 滚动容器 -->
|
||||||
<scroll-view ref="scrollRef" class="scroll-container" scroll-y @scrolltolower="loadNextPage"
|
<scroll-view ref="scrollRef" class="scroll-container" scroll-y @scrolltolower="loadNextPage"
|
||||||
@@ -172,7 +172,8 @@
|
|||||||
listBuildingByPark,
|
listBuildingByPark,
|
||||||
listFloorByBuilding,
|
listFloorByBuilding,
|
||||||
listAllRoomByFloor,
|
listAllRoomByFloor,
|
||||||
listStudent
|
listStudent,
|
||||||
|
getDeptName
|
||||||
} from "@/api/dms/studentDormInfo/index.js"
|
} from "@/api/dms/studentDormInfo/index.js"
|
||||||
import {
|
import {
|
||||||
getUserProfile
|
getUserProfile
|
||||||
@@ -194,6 +195,7 @@
|
|||||||
checkinTime: null,
|
checkinTime: null,
|
||||||
inStatus: null,
|
inStatus: null,
|
||||||
stuName: null,
|
stuName: null,
|
||||||
|
teacherName: null,
|
||||||
gradeId: null,
|
gradeId: null,
|
||||||
campusId: null,
|
campusId: null,
|
||||||
parkId: null,
|
parkId: null,
|
||||||
@@ -281,14 +283,16 @@
|
|||||||
// 动态设置滚动内容的顶部内边距
|
// 动态设置滚动内容的顶部内边距
|
||||||
setScrollContentPadding() {
|
setScrollContentPadding() {
|
||||||
const scrollContent = document.querySelector('.scroll-content')
|
const scrollContent = document.querySelector('.scroll-content')
|
||||||
|
const scrollContainer = document.querySelector('.scroll-container')
|
||||||
if (scrollContent) {
|
if (scrollContent) {
|
||||||
if (this.roleGroup !== '学生') {
|
if (this.roleGroup !== '学生') {
|
||||||
// 非学生:内边距=搜索区高度 - 60rpx(额外间距)
|
// 非学生:内边距=搜索区高度 - 60rpx(额外间距)
|
||||||
const paddingTop = this.searchAreaHeight - 30 // 10px≈20rpx
|
const paddingTop = this.searchAreaHeight - 30 // 10px≈20rpx
|
||||||
scrollContent.style.paddingTop = `${paddingTop}px`
|
scrollContent.style.paddingTop = `${paddingTop}px`
|
||||||
} else {
|
} else {
|
||||||
// 学生:内边距=20rpx(仅基础间距)
|
// 学生:基础内边距
|
||||||
scrollContent.style.paddingTop = '10px' // 10px≈20rpx
|
scrollContent.style.paddingTop = '5px'
|
||||||
|
scrollContainer.style.top = '10px'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -385,6 +389,11 @@
|
|||||||
this.roleGroup = res.roleGroup
|
this.roleGroup = res.roleGroup
|
||||||
if (res.roleGroup === "学生") {
|
if (res.roleGroup === "学生") {
|
||||||
this.queryParams.stuName = res.data.nickName
|
this.queryParams.stuName = res.data.nickName
|
||||||
|
} else if (res.roleGroup.includes("辅导员")) {
|
||||||
|
this.queryParams.teacherName = res.data.nickName
|
||||||
|
} else if (res.roleGroup.includes("学务")) {
|
||||||
|
let res = await getDeptName()
|
||||||
|
console.log(res);
|
||||||
}
|
}
|
||||||
this.getList()
|
this.getList()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -175,7 +175,7 @@
|
|||||||
try {
|
try {
|
||||||
const res = await getUserProfile()
|
const res = await getUserProfile()
|
||||||
this.user = res
|
this.user = res
|
||||||
this.form.stuNo =
|
this.form.stuNo = this.user.data.userName
|
||||||
console.log('当前用户信息:', res)
|
console.log('当前用户信息:', res)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('获取用户信息失败:', err)
|
console.error('获取用户信息失败:', err)
|
||||||
@@ -377,7 +377,7 @@
|
|||||||
checkinTime: '',
|
checkinTime: '',
|
||||||
photo: ''
|
photo: ''
|
||||||
};
|
};
|
||||||
uni.navigateTo({
|
uni.redirectTo({
|
||||||
url: `/pages/dormitory/studentDormInfo/index`
|
url: `/pages/dormitory/studentDormInfo/index`
|
||||||
})
|
})
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|||||||
Reference in New Issue
Block a user