1

src/api/system/dept/index.ts

@@ -1,20 +1,24 @@
 import request from '@/config/axios'
-import { UserVO } from '@/api/system/user'
+// import { UserVO } from '@/api/system/user'
 
 export interface DeptVO {
-  id?: number
+  // id?: number
   name: string
-  parentId: number
-  status: number
-  sort: number
-  leaderUserId: number
+  // parentId?: number
+  // status?: number
+  // sort?: number
+  leaderUserId?: any
   phone: string
   email: string
-  createTime: Date
-  user: UserVO
+  // createTime?: Date
+  // user?: UserVO
+  address: any
   // 导师信息
-  supervisorId: number
-  supervisor: string
+  // supervisorId?: number
+  // supervisor?: string
+  supervisorNum?:number
+  studentNum?:number
+  // userAchievements?:any
 }
 
 // 查询部门（精简)列表
@@ -49,6 +53,8 @@ export const updateDept = async (params: DeptVO) => {
   return await request.put({ url: '/system/dept/update', data: params })
 }
 
+
+
 // 删除部门
 export const deleteDept = async (id: number) => {
   return await request.delete({ url: '/system/dept/delete?id=' + id })

src/api/system/face/index.ts

@@ -0,0 +1,15 @@
+import request from '@/config/axios'
+
+export interface FaceVO {
+
+}
+
+// 查询人脸列表
+export const getFaceList = async () => {
+  return await request.get({ url: '/system/face/face-list' })
+}
+
+// 导入数据
+export const importdata = async () => {
+  return await request.get({ url: 'md/acs/import-data' })
+}

src/api/system/user/index.ts

@@ -132,3 +132,8 @@ export const updateUserStatus = (id: number, status: number) => {
 export const getSimpleUserList = (): Promise<UserVO[]> => {
   return request.get({ url: '/system/user/simple-list' })
 }
+
+// 下载模板批量
+export const getAttendanceTemplate = async () => {
+  return request.download({ url: '/system/user/get-import-attendanceTemplate' })
+}

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

@@ -0,0 +1,131 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="学生id" prop="studentId">
+        <el-input v-model="formData.studentId" placeholder="请输入学生id" />
+      </el-form-item>
+      <el-form-item label="工作间id" prop="deptId">
+        <el-input v-model="formData.deptId" placeholder="请输入工作间id" />
+      </el-form-item>
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="formData.date"
+          type="date"
+          value-format="x"
+          placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item label="打卡时间" prop="clockInTime">
+        <el-date-picker
+          v-model="formData.clockInTime"
+          type="date"
+          value-format="x"
+          placeholder="选择打卡时间"
+        />
+      </el-form-item>
+      <el-form-item label="打卡状态 0正常，1迟到、2早退、3缺勤、4请假" prop="clockInStatus">
+        <el-radio-group v-model="formData.clockInStatus">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注原因" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注原因" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { StudentAttendanceApi, StudentAttendanceVO } from '@/api/system/studentAttendance'
+
+/** 学生考勤记录 表单 */
+defineOptions({ name: 'StudentAttendanceForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  studentId: undefined,
+  deptId: undefined,
+  date: undefined,
+  clockInTime: undefined,
+  clockInStatus: undefined,
+  remark: undefined,
+})
+const formRules = reactive({
+  studentId: [{ required: true, message: '学生id不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '工作间id不能为空', trigger: 'blur' }],
+  date: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StudentAttendanceApi.getStudentAttendance(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StudentAttendanceVO
+    if (formType.value === 'create') {
+      await StudentAttendanceApi.createStudentAttendance(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StudentAttendanceApi.updateStudentAttendance(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    studentId: undefined,
+    deptId: undefined,
+    date: undefined,
+    clockInTime: undefined,
+    clockInStatus: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

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

@@ -0,0 +1,284 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="用户昵称" prop="studentName">
+            <el-input
+              placeholder="请输入用户昵称 "
+              v-model="queryParams.studentName"
+              clearable
+               @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker
+              v-model="queryParams.createTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="datetimerange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              class="!w-240px"
+            />
+          </el-form-item>
+
+      <el-form-item label="打卡状态 " prop="clockInStatus">
+        <el-select
+          v-model="queryParams.clockInStatus"
+          placeholder="请选择打卡状态 "
+          clearable
+          class="!w-240px"
+        >
+          <el-option :label="'正常'" :value="0" />
+          <el-option :label="'迟到'" :value="1" />
+          <el-option :label="'早退'" :value="2" />
+          <el-option :label="'缺勤'" :value="3" />
+          <el-option :label="'请假'" :value="4" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:student-attendance:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:student-attendance:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="Id" align="center" prop="id" />
+      <!-- <el-table-column label="学生id" align="center" prop="studentId" /> -->
+      <el-table-column label="学生名称" align="center" prop="studentName" />
+      <!-- <el-table-column label="工作间id" align="center" prop="deptId" /> -->
+      <!-- <el-table-column label="日期" align="center" prop="date" /> -->
+      <el-table-column
+        label="打卡时间"
+        align="center"
+        prop="clockInTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="打卡状态 " align="center" prop="clockInStatus" >
+        <template #default="rowData">
+          <span :class="getStatusClass(rowData.row.clockInStatus)">
+            {{
+              rowData.row.clockInStatus == 0
+               ? '正常'
+                : rowData.row.clockInStatus ==1
+               ? '迟到'
+                : rowData.row.clockInStatus == 2
+               ? '早退'
+                : rowData.row.clockInStatus == 3
+               ? '缺勤'
+                : rowData.row.clockInStatus == 4
+               ? '请假'
+                : '未知类型'
+            }}
+          </span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      /> -->
+      <el-table-column label="备注原因" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:student-attendance:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:student-attendance:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StudentAttendanceForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { StudentAttendanceApi, StudentAttendanceVO } from '@/api/system/studentAttendance'
+import StudentAttendanceForm from './StudentAttendanceForm.vue'
+
+/** 学生考勤记录 列表 */
+defineOptions({ name: 'studentFaceManage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StudentAttendanceVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  studentId: undefined,
+  studentName: undefined,
+  deptId: undefined,
+  date: [],
+  clockInTime: [],
+  clockInTimeRange: [],
+  clockInStatus: undefined,
+  createTime: [],
+  remark: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StudentAttendanceApi.getStudentAttendancePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StudentAttendanceApi.deleteStudentAttendance(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StudentAttendanceApi.exportStudentAttendance(queryParams)
+    download.excel(data, '学生考勤记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 状态颜色显示
+const getStatusClass = (status) => {
+  switch (status) {
+    case "0":
+      return 'status-normal';
+    case "1":
+      return 'status-late';
+    case "2":
+      return 'status-early';
+    case "3":
+      return 'status-absent';
+    case "4":
+      return 'status-leave';
+    default:
+      return 'status-unknown';
+  }
+};
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+.status-normal {
+  color: green;
+}
+
+.status-late {
+  color: orange;
+}
+
+.status-early {
+  color: blue;
+}
+
+.status-absent {
+  color: red;
+}
+
+.status-leave {
+  color: purple;
+}
+
+.status-unknown {
+  color: gray;
+}
+</style>

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

@@ -0,0 +1,137 @@
+<template>
+  <Dialog v-model="dialogVisible" title="用户批量导入" width="400">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="importUrl + '?updateSupport=' + updateSupport"
+      :auto-upload="false"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      
+      :on-error="submitFormError"
+      
+      :on-success="submitFormSuccess"
+      accept=".xlsx, .xls .zip"
+      drag
+    >
+      <Icon icon="ep:upload" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip text-center">
+          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport" />
+            是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入 xlsx, xls, zip 格式文件。</span>
+          <el-link
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            type="primary"
+            @click="importTemplate"
+          >
+            下载模板
+          </el-link>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as faceApi from '@/api/system/face'
+import * as UserApi from '@/api/system/user'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+
+defineOptions({ name: 'SystemUserImportForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const updateSupport = ref(0) // 是否更新已经存在的用户数据
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  updateSupport.value = 0
+  fileList.value = []
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    formLoading.value = false
+    return
+  }
+  // 拼接提示语
+  const data = response.data
+  let text = '上传成功数量：' + data.createUsernames.length + ';'
+  for (let username of data.createUsernames) {
+    text += '< ' + username + ' >'
+  }
+  text += '更新成功数量：' + data.updateUsernames.length + ';'
+  for (const username of data.updateUsernames) {
+    text += '< ' + username + ' >'
+  }
+  text += '更新失败数量：' + Object.keys(data.failureUsernames).length + ';'
+  for (const username in data.failureUsernames) {
+    text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
+  }
+  message.alert(text)
+  formLoading.value = false
+  dialogVisible.value = false
+  // 发送操作成功的事件
+  emits('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = async (): Promise<void> => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  await nextTick()
+  uploadRef.value?.clearFiles()
+}
+
+
+
+/** 下载模板操作 */
+const importTemplate = async () => {
+  const res = await UserApi.getAttendanceTemplate()
+  console.log(res,'111');
+  download.excel(res, '用户导入模版.xls')
+}
+</script>

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

@@ -89,6 +89,14 @@
             >
               <Icon icon="ep:download" />导出
             </el-button>
+            <el-button
+              type="warning"
+              plain
+              @click="handleImportzip"
+              v-hasPermi="['system:user:import']"
+            >
+              <Icon icon="ep:upload" /> 批量导入
+            </el-button>
           </el-form-item>
         </el-form>
       </ContentWrap>
@@ -193,6 +201,8 @@
   <UserForm ref="formRef" @success="getList" />
   <!-- 用户导入对话框 -->
   <UserImportForm ref="importFormRef" @success="getList" />
+  <!-- 批量导入对话框 -->
+  <UserImportFormzip ref="importFormzipRef" @success="getList" />
   <!-- 分配角色 -->
   <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
 </template>
@@ -205,6 +215,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import * as UserApi from '@/api/system/user'
 import UserForm from './UserForm.vue'
 import UserImportForm from './UserImportForm.vue'
+import UserImportFormzip from './UserImportFormzip.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
 
@@ -269,6 +280,12 @@ const handleImport = () => {
   importFormRef.value.open()
 }
 
+/** 批量导入 */
+const importFormzipRef = ref()
+const handleImportzip = () => {
+  importFormzipRef.value.open()
+}
+
 /** 修改用户状态 */
 const handleStatusChange = async (row: UserApi.UserVO) => {
   try {

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

@@ -1,23 +1,66 @@
 <template>
-  <el-card class="workspace-info card-border mb-2">
+  <!-- <el-card class="workspace-info card-border mb-2">
     <div class="workspace-name">
       <div class="card-header">
         <span>{{ form.name }}</span>
       </div>
     </div>
-  </el-card>
+  </el-card> -->
   <div class="flex">
-    <el-card class="workspace-info w-1/2">
+    <el-card class="workspace-info w-1/3">
       <template #header>
         <div class="card-header">
-          <span>{{ t(form.title1) }}</span>
+          <span>工作间信息</span>
         </div>
       </template>
-      <el-form ref="formRef" :model="form" label-width="100px" :rules="rules">
-        <!-- <el-form-item label="负责人名称" prop="nickname">
-          <el-input v-model="form1.nickname"/>
-        </el-form-item> -->
-        <el-form-item label="负责人名称" prop="supervisorId">
+      <ul class="user-info">
+        <li class="info-item">
+          <Icon class="mr-5px" icon="ep:user" />
+          <span class="info-label">负责人名称：</span>
+          <span class="pull-right">{{ userInfo.name }}</span>
+        </li>
+        <li class="info-item">
+          <Icon class="mr-5px" icon="fontisto:email" />
+          <span class="info-label">负责人邮箱：</span>
+          <span class="pull-right">{{ userInfo.email }}</span>
+        </li>   
+        <li class="info-item">
+          <Icon class="mr-5px" icon="ep:phone" />
+          <span class="info-label">手机号码：</span>
+          <span class="pull-right">{{ userInfo.phone }}</span>
+        </li>
+        <li class="info-item">
+          <Icon class="mr-5px" icon="fontisto:email" />
+          <span class="info-label">导师人数：</span>
+          <span class="pull-right">{{ userInfo.supervisorNum }}</span>
+        </li>   
+        <li class="info-item">
+          <Icon class="mr-5px" icon="ep:user" />
+          <span class="info-label">学生人数：</span>
+          <span class="pull-right">{{ userInfo.studentNum }}</span>
+        </li>   
+        <!-- <li class="info-item" v-for="(url, index) in userAchievements" :key="index">
+          <Icon class="mr-5px" icon="fontisto:email" />
+          <span class="info-label">成果展示：</span>
+          <span class="pull-right">{{ userInfo.achievement }}</span>
+          <img :src="url" alt="成就展示图片" class="user-image" />
+        </li> -->
+      </ul>
+    </el-card>
+    <el-card class="workspace-info ml-3 w-2/3">
+      <template #header>
+        <div class="card-header">
+          <span>工作间名称</span>
+        </div>
+      </template>
+      <el-form ref="formRef" :model="form" label-width="100px" :rules="rules" style="margin-left: 5%; margin-right: 5%;;">
+        <el-form-item>
+          <template #label>
+            <span style="font-weight: bold;">负责人信息</span>
+          </template>
+          <span style="font-weight: bold;">------</span>
+        </el-form-item>
+        <el-form-item label="负责人名称" prop="supervisor">
             <el-select
               v-model="form.supervisor"
               @change="handleSupervisorChange"
@@ -39,57 +82,43 @@
         <el-form-item label="负责人邮箱" prop="email">
           <el-input v-model="form.email"/>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-button type="primary" @click="submit">保存</el-button>
-          <el-button type="danger" @click="init">重置</el-button>
-        </el-form-item> -->
-      </el-form>
-    </el-card>
-    <el-card class="workspace-info ml-3 w-1/2">
-      <template #header>
-        <div class="card-header">
-          <span>{{ t(form.title2) }}</span>
-        </div>
-      </template>
-      <el-form ref="formRef" :model="form" label-width="100px" :rules="rules">
+        <el-form-item>
+          <template #label>
+            <span style="font-weight: bold;">工作间信息</span>
+          </template>
+          <span style="font-weight: bold;">------</span>
+        </el-form-item>
         <el-form-item label="工作间地址" prop="address">
           <el-input v-model="form.address"/>
         </el-form-item>
         <el-form-item label="工作间名称" prop="name">
           <el-input v-model="form.name"/>
         </el-form-item>
-        <el-form-item label="导师人数" prop="supervisorNum">
+        <!-- <el-form-item label="导师人数" prop="supervisorNum">
           <el-input v-model.number="form.supervisorNum"/>
         </el-form-item>
         <el-form-item label="学生人数" prop="studentNum">
           <el-input v-model.number="form.studentNum"/>
-        </el-form-item>
-        <el-form-item label="工作间简介" prop="description">
+        </el-form-item> -->
+        <!-- <el-form-item label="工作间简介" prop="description">
           <el-input type="textarea" v-model="form.description"/>
-        </el-form-item>
-        <el-form-item label="成果展示" prop="achievement">
+        </el-form-item> -->
+        <!-- <el-form-item label="成果展示" prop="achievement">
           <el-input type="textarea" v-model="form.achievement"/>
-        </el-form-item>
-        <!-- <el-form-item>
-          <el-button type="primary" @click="submit">保存</el-button>
-          <el-button type="danger" @click="init">重置</el-button>
         </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="submit">保存</el-button>
+          <!-- <el-button type="danger" @click="init">重置</el-button> -->
+        </el-form-item>
       </el-form>
     </el-card>
   </div>
-  <el-card class="card-border w-full mt-2">
-      <el-form ref="formRef" :model="form" :rules="rules" style="display: flex; justify-content: center;">
-      <el-form-item>
-        <el-button type="primary" @click="submit">保存</el-button>
-        <el-button type="danger" @click="init" >重置</el-button>
-      </el-form-item>
-    </el-form>
-  </el-card>
 </template>
 
 <script lang="ts">
 import { defineComponent, reactive, ref, onMounted } from 'vue';
 import type { FormRules } from 'element-plus';
+// import type { FormExpose } from '@/components/Form'
 import { useI18n } from 'vue-i18n';
 import { useMessage } from '@/hooks/web/useMessage';
 import { updateDept, DeptVO, getUserDept } from '@/api/system/dept/index';
@@ -102,28 +131,25 @@ export default defineComponent({
     const formRef = ref();
 
     const form = reactive({
-      title: '',
-      title1: '负责人信息',
-      title2: '工作间信息',
-
-      nickname: '',
+      supervisor: '',  
       phone: '',
       email: '',
-      supervisorId: '',
-      supervisor: '',
-
+      address: '',
       name: '',
-      supervisorNum: '',
-      studentNum: '',
-      description: '',
-      achievement: '',
-      address: ''
+      leaderUserId: '',
+      nickname: '', 
+      // supervisor: '',
+
+      // supervisorNum: '',
+      // studentNum: '',
+      // description: '',
+      // achievement: '',
     });
 
     // 表单校验规则
     const rules = reactive<FormRules>({
-      nickname: [
-        { required: true, message: '请输入负责人名称', trigger: 'blur' }
+      supervisor: [
+        { required: true, message: '请选择导师名称', trigger: 'blur' }
       ],
       phone: [
         { required: true, message: '请输入负责人电话', trigger: 'blur' },
@@ -147,23 +173,15 @@ export default defineComponent({
       name: [
         { required: true, message: '请输入工作间名称', trigger: 'blur' }
       ],
-      supervisorNum: [
-        { required: true, message: '请输入导师人数', trigger: 'blur' },
-      ],
-      studentNum: [
-        { required: true, message: '请输入学生人数', trigger: 'blur' }
-      ]
+      // supervisorNum: [
+      //   { required: true, message: '请输入导师人数', trigger: 'blur' },
+      // ],
+      // studentNum: [
+      //   { required: true, message: '请输入学生人数', trigger: 'blur' }
+      // ]
     });
+
    
-    // const userInfo = reactive({
-    //   email: 'aoteman@126.com',
-    //   roles: ['超级管理员', '普通角色'],
-    //   department: '董事长,项目经理',
-    //   phone: '18818260277',
-    //   name: 'admin',
-    //   position: '基本资料',
-    //   creationDate: '2020-01-05 17:03:47'
-    // });
 
     // 将 userInfo 定义放入 setup 中
     const userInfo = ref({} as DeptVO);  
@@ -179,19 +197,24 @@ export default defineComponent({
       try {
         const response = await UserApi.getSupervisor()
         supervisors.value = response
+        console.log('导师列表:', supervisors.value);
+        
       } catch (error) {
         console.error('Error fetching user data:', error)
       }
     }
 
+    // const formData = unref(formRef)?.formModel as DeptVO
+    // console.log('提交的数据:', formData);
+
     //传supervisorId给formData.supervisorId
     const handleSupervisorChange = (value: number) => {
-      const formData = unref(formRef)?.formModel as DeptVO
-        console.log('提交的数据:', formData);
-      const selectedUser = supervisors.value.find(user => user.id === value);
-      if (selectedUser) {
-        formData.supervisorId = selectedUser.id;
-        formData.supervisor = selectedUser.nickname;
+      // const formData = unref(formRef)?.formModel as DeptVO
+        console.log(form);
+      const selectedsupervisor = supervisors.value.find(supervisor => supervisor.id === value);
+      if (selectedsupervisor) {
+        form.leaderUserId = selectedsupervisor.id;
+        // form.supervisorId = selectedUser.nickname;
       }
     }
 
@@ -199,23 +222,28 @@ export default defineComponent({
     const submit = async () => {
       try {
         await formRef.value?.validate();
-        const formData = unref(formRef)?.formModel as DeptVO
-        console.log('提交的数据:', formData);
-        await updateDept(formData);
-        message.success(t('common.updateSuccess'));
+        console.log('提交的数据:', form);
+        await updateDept(form).then((res) => {
+          console.log('更新成功:', res);
+        });
+        message.success('成功');
       } catch (error) {
-        message.error(t('common.validateError'));
+        console.error('提交错误:', error);
+        message.error('错误');
       }
     };
 
+
     // 表单重置
     const init = async () => {
       const res = await getUserDept();
       console.log('获取的数据:', res);
-      form.nickname = res.user.nickname || '';
-      form.phone = res.user.mobile || '';
-      form.email = res.user.email || '';
-      form.name = res.name || '';
+      form.address = res.address;
+      form.supervisor = res.user.nickname;
+      form.phone = res.user.mobile;
+      form.email = res.user.email;
+      form.name = res.name;
+      form.leaderUserId = res.user.id;
       userInfo.value = res.user; 
     };
 
@@ -235,7 +263,6 @@ export default defineComponent({
       formRef,
       supervisors,
       handleSupervisorChange,
-      // users,
       getSupervisor,
     };
   }
@@ -244,6 +271,11 @@ export default defineComponent({
 </script>
 
 <style scoped>
+
+.label-bold {
+  font-weight: bold; /* 设置字体加粗 */
+}
+
 .workspace-name {
   height: 20px;
 }
@@ -255,6 +287,9 @@ export default defineComponent({
 }
 
 .user-info {
+  margin-left: 5%;
+  margin-right: 5%;
+  margin-top: 60px;
   padding-right: 0;
   padding-left: 0;
   border-right: 0;
@@ -283,4 +318,6 @@ export default defineComponent({
 .personal-info {
   margin-top: 20px;
 }
+
+
 </style>