222

src/api/system/dept/index.ts

@@ -1,5 +1,5 @@
 import request from '@/config/axios'
-// import { UserVO } from '@/api/system/user'
+import { UserVO } from '@/api/system/user'
 
 export interface DeptVO {
   // id?: number
@@ -11,7 +11,7 @@ export interface DeptVO {
   phone: string
   email: string
   // createTime?: Date
-  // user?: UserVO
+  user?: UserVO
   address: any
   // 导师信息
   // supervisorId?: number

src/utils/dict.ts

@@ -131,6 +131,7 @@ export enum DICT_TYPE {
   SYSTEM_SOCIAL_TYPE = 'system_social_type',
   SYSTEM_STUDENT_ATTENDANCE_TYPE = 'system_student_attendance_type',// 学生考勤类型
   SYSTEM_STUDENT_FACE_TYPE = 'system_student_face_type',// 学生人脸导入类型
+  SYSTEM_STUDENT_GRADUATE_STATUS = 'system_student_graduate_status',// 是否达成毕业条件
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',

src/views/system/dept/DeptForm.vue

@@ -167,7 +167,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '测绘学院', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }

src/views/system/graduateStudent/UserForm.vue

@@ -94,15 +94,8 @@
 
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用户类型" prop="userType">
-            <el-select v-model="formData.userType" placeholder="请选择用户类型">
-              <el-option
-                v-for="option in userTypes"
-                :key="option.value"
-                :label="option.label"
-                :value="option.value"
-                />
-            </el-select>
+          <el-form-item label="工作地点" prop="workPlace">
+            <el-input v-model="formData.workPlace" maxlength="11" placeholder="请输入工作地点" />
           </el-form-item>
         </el-col>
 
@@ -127,16 +120,6 @@
         </el-col>
         
       </el-row>
-
-      <el-row>
-        
-        <el-col :span="12">
-          <el-form-item label="工作地点" prop="workPlace">
-            <el-input v-model="formData.workPlace" maxlength="11" placeholder="请输入工作地点" />
-          </el-form-item>
-        </el-col>
-        
-      </el-row>
       
       <el-row>
         <el-col :span="24">
@@ -216,8 +199,8 @@ const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 const userTypes = ref([
   { label: '本校生', value: "1" },
   { label: '毕业生', value: "2" },
-  { label: '导师', value: "3" },
-  { label: '学院', value: "4" }
+  // { label: '导师', value: "3" },
+  // { label: '学院', value: "4" }
 ]);
 
 //获取所有导师

src/views/system/graduateStudent/index.vue

@@ -186,7 +186,15 @@
                   <Icon icon="ep:edit" />修改
                 </el-button>
 
-                <el-dropdown
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -203,7 +211,7 @@
                       </el-dropdown-item>                      
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
 
               </div>
             </template>

src/views/system/graduateStudentT/index.vue

@@ -151,8 +151,16 @@
                 >
                   <Icon icon="ep:edit" />修改
                 </el-button>
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
 
-                <el-dropdown
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -169,7 +177,7 @@
                       </el-dropdown-item>                      
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
 
               </div>
             </template>

src/views/system/user/index.vue

@@ -168,12 +168,12 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <el-dropdown-item
+                      <!-- <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item>
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

src/views/system/user/student.vue

@@ -166,12 +166,12 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <el-dropdown-item
+                      <!-- <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item>
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

src/views/system/user/teacher.vue

@@ -166,12 +166,12 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <el-dropdown-item
+                      <!-- <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item>
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

src/views/system/workroomCollege/dept/DeptForm.vue

@@ -5,7 +5,7 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="100px"
     >
       <el-form-item label="上级部门" prop="parentId">
         <el-tree-select
@@ -200,7 +200,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '测绘学院', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }

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

@@ -36,7 +36,9 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 const getTree = async () => {
   const res = await DeptApi.getSimpleDeptList()
   deptList.value = []
-  deptList.value.push(...handleTree(res))
+  let dept: Tree = { id: 0, name: '测绘学院', children: [] }
+  dept.children = handleTree(res)
+  deptList.value.push(dept)
 }
 
 /** 基于名字过滤 */

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

@@ -204,8 +204,8 @@ const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 const userTypes = ref([
   { label: '在校生', value: "1" },
   { label: '毕业生', value: "2" },
-  { label: '导师', value: "3" },
-  { label: '学院', value: "4" }
+  // { label: '导师', value: "3" },
+  // { label: '学院', value: "4" }
 ]);
 
 //获取所有导师

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

@@ -168,12 +168,12 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <el-dropdown-item
+                      <!-- <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item>
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

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

@@ -123,7 +123,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
-          <el-table-column label="状态" key="status">
+          <!-- <el-table-column label="状态" key="status">
             <template #default="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -132,6 +132,11 @@
                 @change="handleStatusChange(scope.row)"
               />
             </template>
+          </el-table-column> -->
+          <el-table-column label="导入状态" align="center" prop="isgruaduate">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isgruaduate" />  
+            </template>
           </el-table-column>
           <el-table-column
             label="创建时间"
@@ -140,7 +145,7 @@
             :formatter="dateFormatter"
             width="180"
           />
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="190">
             <template #default="scope">
               <div class="flex items-center justify-center">
                 <el-button
@@ -151,7 +156,15 @@
                 >
                   <Icon icon="ep:edit" />修改
                 </el-button>
-                <el-dropdown
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -182,7 +195,7 @@
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
               </div>
             </template>
           </el-table-column>

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

@@ -115,7 +115,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
-          <el-table-column label="状态" key="status">
+          <!-- <el-table-column label="状态" key="status">
             <template #default="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -124,7 +124,7 @@
                 @change="handleStatusChange(scope.row)"
               />
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             label="创建时间"
             align="center"
@@ -132,7 +132,7 @@
             :formatter="dateFormatter"
             width="180"
           />
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="190">
             <template #default="scope">
               <div class="flex items-center justify-center">
                 <el-button
@@ -143,7 +143,15 @@
                 >
                   <Icon icon="ep:edit" />修改
                 </el-button>
-                <el-dropdown
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -174,7 +182,7 @@
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
               </div>
             </template>
           </el-table-column>

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

@@ -50,7 +50,7 @@
     <el-card class="workspace-info ml-3 w-2/3">
       <template #header>
         <div class="card-header">
-          <span>工作间名称</span>
+          <span>{{ userInfo.name }}</span>
         </div>
       </template>
       <el-form ref="formRef" :model="form" label-width="100px" :rules="rules" style="margin-left: 5%; margin-right: 5%;;">
@@ -100,9 +100,9 @@
         <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 label="工作间简介" prop="description">
           <el-input type="textarea" v-model="form.description"/>
-        </el-form-item> -->
+        </el-form-item>
         <!-- <el-form-item label="成果展示" prop="achievement">
           <el-input type="textarea" v-model="form.achievement"/>
         </el-form-item> -->
@@ -143,7 +143,7 @@ export default defineComponent({
 
       // supervisorNum: '',
       // studentNum: '',
-      // description: '',
+      description: '',
       // achievement: '',
     });
 
@@ -174,6 +174,9 @@ export default defineComponent({
       name: [
         { required: true, message: '请输入工作间名称', trigger: 'blur' }
       ],
+      description: [
+        { required: false, message: '请输入工作间简介', trigger: 'blur' }
+      ],
       // supervisorNum: [
       //   { required: true, message: '请输入导师人数', trigger: 'blur' },
       // ],
@@ -188,7 +191,7 @@ export default defineComponent({
     const userInfo = ref({} as DeptVO);  
     const fetchUserInfo = async () => {
       const users = await getUserDept();
-      console.log(users);
+      console.log(users,'09');
       userInfo.value = users;
     };
 

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

@@ -203,7 +203,7 @@ const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 const userTypes = ref([
   { label: '在校生', value: "1" },
   { label: '毕业生', value: "2" },
-  { label: '导师', value: "3" },
+  // { label: '导师', value: "3" },
 ]);
 
 //获取所有导师

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

@@ -168,12 +168,12 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <el-dropdown-item
+                      <!-- <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item>
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>

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

@@ -110,7 +110,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
-          <el-table-column label="状态" key="status"  align="center" width="90">
+          <!-- <el-table-column label="状态" key="status"  align="center" width="90">
             <template #default="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -119,16 +119,12 @@
                 @change="handleStatusChange(scope.row)"
               />
             </template>
-          </el-table-column>
-
-          <!-- <el-table-column label="成果信息" align="center" width="100">
+          </el-table-column> -->
+          <el-table-column label="导入状态" align="center" prop="isgruaduate">
             <template #default="scope">
-              <el-button type="text" @click="openUserAchievement(scope.row.id)">
-                详情
-              </el-button>
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isgruaduate" />  
             </template>
-          </el-table-column> -->
-
+          </el-table-column>
           <el-table-column
             label="创建时间"
             align="center"
@@ -136,7 +132,7 @@
             :formatter="dateFormatter"
             width="180"
           />
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="190">
             <template #default="scope">
               <div class="flex items-center justify-center">
                 <el-button
@@ -150,7 +146,15 @@
                 <el-button type="text" @click="openUserAchievement(scope.row.id)">
                   成果详情
                 </el-button>
-                <el-dropdown
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -173,15 +177,15 @@
                       >
                         <Icon icon="ep:key" />重置密码
                       </el-dropdown-item>
-                      <!-- <el-dropdown-item
+                      <el-dropdown-item
                         command="handleRole"
                         v-if="checkPermi(['system:permission:assign-user-role'])"
                       >
                         <Icon icon="ep:circle-check" />分配角色
-                      </el-dropdown-item> -->
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
               </div>
             </template>
           </el-table-column>

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

@@ -109,7 +109,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
-          <el-table-column label="状态" key="status">
+          <!-- <el-table-column label="状态" key="status">
             <template #default="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -118,7 +118,7 @@
                 @change="handleStatusChange(scope.row)"
               />
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             label="创建时间"
             align="center"
@@ -126,7 +126,7 @@
             :formatter="dateFormatter"
             width="180"
           />
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="190">
             <template #default="scope">
               <div class="flex items-center justify-center">
                 <el-button
@@ -140,7 +140,15 @@
                 <el-button type="text" @click="openUserAchievement(scope.row.id)">
                   成果详情
                 </el-button>
-                <el-dropdown
+                <el-button
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                  v-hasPermi="['system:user-achievement:delete']"
+                >
+                <Icon icon="ep:delete" /> 删除
+                </el-button>
+                <!-- <el-dropdown
                   @command="(command) => handleCommand(command, scope.row)"
                   v-hasPermi="[
                     'system:user:delete',
@@ -171,7 +179,7 @@
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
               </div>
             </template>
           </el-table-column>