From bba0a5cefe404b2dce5d3c3cf4d781295c2293d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Fri, 31 Oct 2025 15:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dms/studentDormInfo/index.js                | 11 +++++++++--
 pages/dormitory/studentDormInfo/index.vue       | 17 +++++++++++++----
 .../studentDormInfo/informationCollection.vue   |  4 ++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/api/dms/studentDormInfo/index.js b/api/dms/studentDormInfo/index.js
index f7df997..c1615db 100644
--- a/api/dms/studentDormInfo/index.js
+++ b/api/dms/studentDormInfo/index.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询宿舍学生关联列表
 export function listStudent(query) {
   return request({
-    url: '/dormitory/srs-dormitory-student/list',
+    url: '/dormitory/srs-dormitory-student/checkInInformation',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listStudent(query) {
 // 新增宿舍学生关联
 export function addStudent(data) {
   return request({
-    url: '/dormitory/srs-dormitory-student/add',
+    url: '/dormitory/srs-dormitory-student/addCheckInInformation',
     method: 'post',
     data: data
   })
@@ -75,3 +75,10 @@ export function listGrade(query = null) {
     params: query
   })
 }
+
+// 查询学院名称
+export function getDeptName() {
+  return request({
+    url: '/system/dept/name'
+  })
+}
diff --git a/pages/dormitory/studentDormInfo/index.vue b/pages/dormitory/studentDormInfo/index.vue
index 4c97977..e45ad61 100644
--- a/pages/dormitory/studentDormInfo/index.vue
+++ b/pages/dormitory/studentDormInfo/index.vue
@@ -126,7 +126,7 @@
 		</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"
@@ -172,7 +172,8 @@
 		listBuildingByPark,
 		listFloorByBuilding,
 		listAllRoomByFloor,
-		listStudent
+		listStudent,
+		getDeptName
 	} from "@/api/dms/studentDormInfo/index.js"
 	import {
 		getUserProfile
@@ -194,6 +195,7 @@
 					checkinTime: null,
 					inStatus: null,
 					stuName: null,
+					teacherName: null,
 					gradeId: null,
 					campusId: null,
 					parkId: null,
@@ -281,14 +283,16 @@
 			// 动态设置滚动内容的顶部内边距
 			setScrollContentPadding() {
 				const scrollContent = document.querySelector('.scroll-content')
+				const scrollContainer = document.querySelector('.scroll-container')
 				if (scrollContent) {
 					if (this.roleGroup !== '学生') {
 						// 非学生：内边距=搜索区高度 - 60rpx（额外间距）
 						const paddingTop = this.searchAreaHeight - 30 // 10px≈20rpx
 						scrollContent.style.paddingTop = `${paddingTop}px`
 					} else {
-						// 学生：内边距=20rpx（仅基础间距）
-						scrollContent.style.paddingTop = '10px' // 10px≈20rpx
+						// 学生：基础内边距
+						scrollContent.style.paddingTop = '5px' 
+						scrollContainer.style.top = '10px'
 					}
 				}
 			},
@@ -385,6 +389,11 @@
 					this.roleGroup = res.roleGroup
 					if (res.roleGroup === "学生") {
 						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()
 				} catch (err) {
diff --git a/pages/dormitory/studentDormInfo/informationCollection.vue b/pages/dormitory/studentDormInfo/informationCollection.vue
index 20f5afa..d23154d 100644
--- a/pages/dormitory/studentDormInfo/informationCollection.vue
+++ b/pages/dormitory/studentDormInfo/informationCollection.vue
@@ -175,7 +175,7 @@
 				try {
 					const res = await getUserProfile()
 					this.user = res
-					this.form.stuNo =
+					this.form.stuNo = this.user.data.userName
 						console.log('当前用户信息:', res)
 				} catch (err) {
 					console.error('获取用户信息失败:', err)
@@ -377,7 +377,7 @@
 							checkinTime: '',
 							photo: ''
 						};
-						uni.navigateTo({
+						uni.redirectTo({
 							url: `/pages/dormitory/studentDormInfo/index`
 						})
 					}, 1000);