11.16

src/api/system/user/index.ts

@@ -104,18 +104,18 @@ export const importUserTemplate = () => {
 }
 
 // 导出教师
-export const exportTeacherList = () => {
-  return request.download({ url: '/system/user/exportTeacher' })
+export const exportTeacherList = (params) => {
+  return request.download({ url: '/system/user/exportTeacher', params })
 }
 
 // 导出在校生
-export const exportStudentList = () => {
-  return request.download({ url: '/system/user/exportStudent' })
+export const exportStudentList = (params) => {
+  return request.download({ url: '/system/user/exportStudent', params })
 }
 
 // 导出毕业生
-export const exportGraduateList = () => {
-  return request.download({ url: '/system/user/exportGraduate' })
+export const exportGraduateList = (params) => {
+  return request.download({ url: '/system/user/exportGraduate', params })
 }
 
 

src/views/Home/Index.vue

@@ -13,7 +13,7 @@
                   {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
                 </div>
                 <div class="mt-10px text-14px text-gray-500">
-                  {{ t('workplace.toady') }}，20℃ - 32℃！
+                  {{ t('workplace.toady') }}，20℃ - 321℃！
                 </div>
               </div>
             </div>
@@ -98,6 +98,7 @@
           </el-row>
         </el-skeleton>
       </el-card>
+
       <el-card shadow="never" class="mt-8px">
         <el-skeleton :loading="loading" animated>
           <el-row :gutter="20" justify="space-between">

src/views/system/graduateStudent/index.vue

@@ -452,7 +452,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UserApi.exportGraduateList()
+    const data = await UserApi.exportGraduateList(queryParams)
     download.excel(data, '用户数据.xls')
   } catch {
   } finally {

src/views/system/studentAttendanceManage/studentAttendance/index.vue

@@ -313,7 +313,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StudentAttendanceApi.exportStudentAttendanceNormalExcel(queryParams)
-    download.excel(data, '学生考勤记录.xls')
+    download.excel(data, '学生正常考勤记录.xls')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/studentAttendanceManage/studentAttendanceError/index.vue

@@ -308,7 +308,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StudentAttendanceApi.exportStudentAttendanceErrorExcel(queryParams)
-    download.excel(data, '学生考勤记录.xls')
+    download.excel(data, '学生未打卡记录.xls')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/studentAttendanceManage/studentAttendanceExcused/index.vue

@@ -308,7 +308,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StudentAttendanceApi.exportStudentAttendanceExcusedExcel(queryParams)
-    download.excel(data, '学生考勤记录.xls')
+    download.excel(data, '学生请假记录.xls')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/studentAttendanceManage/studentFaceManage/StudentFaceForm.vue

@@ -102,16 +102,16 @@ const emit = defineEmits(['success','error'])
     } else {
      // 显示错误提示
      message.error(msg);
-      // 发送错误事件
+ // 发送错误事件
 //       emit('error');
-    }
-  } catch (error) {
-    console.error(error);
-    message.error('提交失败，请稍后重试');
-    emit('error');
-  } finally {
-    formLoading.value = false;
-  }
+ }
+ } catch (error) {
+ console.error(error);
+ message.error('提交失败，请稍后重试');
+ emit('error');
+ } finally {
+  formLoading.value = false;
+ }
 }
 
 /** 重置表单 */

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

@@ -133,6 +133,7 @@
         <el-col :span="12">
           <el-form-item label="学号" prop="userNumber" v-if="formType === 'create-S' || formType === 'update-S'">
             <el-input v-model="formData.userNumber" placeholder="请输入学号" />
+            
           </el-form-item>
           <el-form-item label="工号" prop="userNumber" v-if="formType === 'create-T' || formType === 'update-T'">
             <el-input v-model="formData.userNumber" placeholder="请输入工号" />
@@ -148,6 +149,16 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
+          <el-form-item label="专业" prop="major" v-if="formType === 'create-S' || formType === 'update-S'">
+            <el-input v-model="formData.major" placeholder="请输入专业" />
+          </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>
+        </el-col>
       </el-row>
 
       <!-- <el-row>
@@ -227,6 +238,8 @@ const formData = ref({
   isGraduate: 0,
   parentMobile: '',
   userNumber: '',
+  masterType:'',
+  major:''
 })
 const formRules = reactive<FormRules>({
   username: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
@@ -256,7 +269,7 @@ const formRules = reactive<FormRules>({
       message: '请输入正确的手机号码'
     }
   ],
-  supervisor: [{ required: true, message: '导师不能为空', trigger: 'blur' }],
+  // supervisor: [{ required: true, message: '导师不能为空', trigger: 'blur' }],
   userNumber: [{ required: true, message: '学号不能为空', trigger: 'blur' }],
 })
 
@@ -376,6 +389,8 @@ const resetForm = () => {
     isGraduate: 0,
     parentMobile: '',
     userNumber: '',
+    masterType:'',
+    major:''
   }
   formRef.value?.resetFields()
 }

src/views/system/workroomCollege/user/student.vue

@@ -438,7 +438,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UserApi.exportStudentList()
+    const data = await UserApi.exportStudentList(queryParams)
     download.excel(data, '用户数据.xls')
   } catch {
   } finally {

src/views/system/workroomCollege/user/teacher.vue

@@ -372,7 +372,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UserApi.exportTeacherList()
+    const data = await UserApi.exportTeacherList(queryParams)
     download.excel(data, '用户数据.xls')
   } catch {
   } finally {

src/views/system/workroomCollege/userAchievement/index.vue

@@ -200,13 +200,13 @@
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievement'
 import UserAchievementForm from './UserAchievementForm.vue'
 import * as UserApi from '@/api/system/user'
 import { useRoute } from 'vue-router'
-import { DICT_TYPE } from '@/utils/dict'
 
 /** 成果 列表 */
 defineOptions({ name: 'UserAchievement' })
@@ -296,4 +296,4 @@ onMounted(() => {
   getList()
   getDeptUser()
 })
-</script>
+</script>

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

@@ -138,7 +138,19 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+      <el-row>
+        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
+          <el-form-item label="专业" prop="major" v-if="formType === 'create-S' || formType === 'update-S'">
+            <el-input v-model="formData.major" placeholder="请输入专业" />
+          </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>
+        </el-col>
+      </el-row>
+
       <el-row>
         <el-col :span="24">
           <!-- <el-form-item label="备注">
@@ -192,6 +204,8 @@ const formData = ref({
   supervisorId:'',
   isGraduate: 0,
   userNumber: '',
+    masterType:'',
+    major:''
 })
 const formRules = reactive<FormRules>({
   username: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
@@ -329,6 +343,8 @@ const resetForm = () => {
     supervisorId:'',
     isGraduate: 0,
     userNumber: '',
+    masterType:'',
+    major:''
   }
   formRef.value?.resetFields()
 }

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

@@ -247,7 +247,7 @@
   <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 // import { checkPermi } from '@/utils/permission'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
@@ -356,7 +356,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UserApi.exportStudentList()
+    const data = await UserApi.exportStudentList(queryParams)
     download.excel(data, '用户数据.xls')
   } catch {
   } finally {

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

@@ -308,7 +308,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UserApi.exportTeacherList()
+    const data = await UserApi.exportTeacherList(queryParams)
     download.excel(data, '用户数据.xls')
   } catch {
   } finally {