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

src/views/system/studentSelection/studentSelectionProject/index.vue

@@ -205,7 +205,7 @@
           </el-button>
 
           <el-button type="text"
-                     v-if="userInfo?.userType === '4' || userInfo?.userType === '1'"
+                     v-if="userInfo?.userType === '4'"
                      @click="openCampusSupervisorSetting(scope.row.id)"
                      v-hasPermi="['system:supervisor-selection-setting:query']"
           >

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

@@ -1,7 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <div class="flex" v-loading="loading"   v-show="user.value.dept">
-=======
   <!-- <el-card class="workspace-info card-border mb-2">
     <div class="workspace-name">
       <div class="card-header">
@@ -9,8 +6,7 @@
       </div>
     </div>
   </el-card> -->
-  <div class="flex" v-loading="loading" v-show="userInfo.name != null && userInfo.name != undefined">
->>>>>>> aabfd8529fb999ebbfe300732b102ff0050b3628
+  <div class="flex" v-loading="loading">
     <el-card class="workspace-info w-full" shadow="always" style="padding-bottom: 40px;">
         <template #header>
           <div class="card-header" style="display: flex; align-items: center; justify-content: space-between;">
@@ -92,11 +88,7 @@
         @success="handleSuccess"
       />
   </div>
-<<<<<<< HEAD
-  <div v-show="user.value.dept">
-=======
-  <div v-show="userInfo.name != null && userInfo.name != undefined">
->>>>>>> aabfd8529fb999ebbfe300732b102ff0050b3628
+  <div>
     <div style="margin-top: 15px;">
       <teacher :id="form.id" />
     </div>
@@ -104,16 +96,7 @@
       <student :id="form.id" />
     </div>
   </div>
-<<<<<<< HEAD
-  <div v-show="!user.value.dept">
-    <el-empty description="暂无工作间" />
-  </div>
- 
-=======
-  <div class="flex" v-show="!(userInfo.name != null && userInfo.name != undefined)">
-     暂无工作间！
-  </div>
->>>>>>> aabfd8529fb999ebbfe300732b102ff0050b3628
+
 </template>
 
 <script lang="ts">
@@ -207,8 +190,9 @@ export default defineComponent({
         loading.value = true; // 开始加载状态
         const users = await getUserDept();
         console.log(users,'userDeptInfo');
-        userInfo.value = {...users};
-
+        userInfo.value = {...users,
+          // name: users.user[0].nickname // 提取 nickname
+        };
       }finally{
           loading.value = false; // 关闭加载状态
       }