Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate-ui

src/api/system/dept/index.ts

@@ -68,4 +68,4 @@ export const deleteDept = async (id: number) => {
 // 获取毕业达成率
 export const getGraduationSource = async () => {
   return await request.get({ url: '/system/dept/getGraduationSource' })
-}
+}

src/api/system/user/index.ts

@@ -37,13 +37,16 @@ export const getTeacherPage = (params: PageParam) => {
 export const getTeacherPageForTeacher = (params: PageParam) => {
   return request.get({ url: '/system/user/getTeacherPageForTeacher', params })
 }
+
 // 查询学生管理列表
 export const getStudentPage = (params: PageParam) => {
   return request.get({ url: '/system/user/page1', params })
 }
+
 export const getUserPageForTeacher = (params: PageParam) => {
   return request.get({ url: '/system/user/pageForTeacher', params })
 }
+
 // 查询毕业生列表
 export const getGraduateStudentPage = (params: PageParam) => {
   return request.get({ url: '/system/user/graduateStudentPage', params })

src/views/system/workroomTeacher/dept/index.vue

@@ -187,7 +187,7 @@ export default defineComponent({
 // const users = ref()
 // const getSupervisor= async () => {
 //   try {
-//     const response = await UserApi.getSupervisor()
+//     const response = await UserApi.getSupervisor()y
 //     users.value = response
 //   } catch (error) {
 //     console.error('Error fetching user data:', error)

src/views/system/workroomTeacher/dept/student.vue

@@ -19,7 +19,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="年级" align="center" prop="grade" width="120" />
-          <el-table-column label="学号" align="center" prop="studentId" width="150" />
+          <el-table-column label="学号" align="center" prop="userNumber" width="150" />
           <el-table-column label="专业" align="center" prop="major" width="120" />
           <!-- <el-table-column
             label="工作间"

src/views/system/workroomTeacher/user/UserForm.vue

@@ -175,8 +175,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
-          <el-form-item label="学位类型" prop="masterType" v-if="formType === 'create-S' || formType === 'update-S'">
-            <el-input v-model="formData.masterType" placeholder="请输入学位类型" />
+          <el-form-item label="硕士类型" prop="masterType" v-if="formType === 'create-S' || formType === 'update-S'">
+            <el-select v-model="formData.masterType" placeholder="请选择硕士类型">
+              <el-option
+                v-for="option in masterTypeOptions"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -325,8 +332,8 @@ const majorOptions = [
 
 // 获取所有学位类型
 const masterTypeOptions = [
-  { value: '学硕' },
-  { value: '专硕' },
+  { value: 1, label:"学硕" },
+  { value: 2 , label:"专硕"},
 ]