Pārlūkot izejas kodu

首页工作间丢失
去掉富文本

47 3 dienas atpakaļ
vecāks
revīzija
f451f46ed3

+ 1 - 1
src/views/Home/Index.vue

@@ -791,7 +791,7 @@ getAllApi()
   opacity: 0.6;
   font-size: 15px;
   margin-top: 20px;
-  //margin-left: 18px;
+  margin-left: 18px;
 
 }
 

+ 26 - 26
src/views/system/Home/Index.vue

@@ -51,30 +51,30 @@ class="pr-5px  mt-10px"
               <div class="px-25px text-center" style="margin: auto;">
                 <div class="mb-5px text-20px text-white fw-550">打卡人数</div>
                 <CountTo
-class="text-28px" :start-val="0" :end-val="totalSate.normalNum"
-                         :duration="2600"/>
+                  class="text-28px" :start-val="0" :end-val="totalSate.normalNum"
+                  :duration="2600"/>
               </div>
               <el-divider direction="vertical" border-style="dashed"/>
               <div class="px-8px text-center " style="margin: auto;">
                 <div class="mb-5px text-20px text-white fw-550">未打卡人数</div>
                 <CountTo
-class="text-28px" :start-val="0" :end-val="totalSate.errorNum"
-                         :duration="2600"/>
+                  class="text-28px" :start-val="0" :end-val="totalSate.errorNum"
+                  :duration="2600"/>
               </div>
               <el-divider direction="vertical" border-style="dashed"/>
               <div class="px-8px text-center" style="margin: auto;">
                 <div class=" text-20px text-white fw-550">请假人数</div>
                 <CountTo
-class="text-28px" :start-val="0" :end-val="totalSate.excuseNum"
-                         :duration="2600"/>
+                  class="text-28px" :start-val="0" :end-val="totalSate.excuseNum"
+                  :duration="2600"/>
               </div>
             </div>
           </el-card>
           <el-row :gutter="8">
             <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
               <el-card
-class="mb-27px h-465px mt-40px mr-15px ="
-                       style="min-width: 250px ;background-color: rgb(255,255,255);border: 4px solid rgba(109,181,255,0.42);border-radius:15px">
+                class="mb-27px h-465px mt-40px mr-15px ="
+                style="min-width: 250px ;background-color: rgb(255,255,255);border: 4px solid rgba(109,181,255,0.42);border-radius:15px">
                 <template #header >
                   <div class="h-7 flex justify-between fw-800 text-22px ">
                     <span style="color: rgba(4,53,103,0.89)">实时打卡状态</span>
@@ -103,30 +103,30 @@ class="mb-27px h-465px mt-40px mr-15px ="
                   </div>
                 </div>
                 <vue3ScrollSeamless
-class="scroll-wrap text-color " :classOptions="classOptions"
-                                    :dataList="list">
+                  class="scroll-wrap text-color " :classOptions="classOptions"
+                  :dataList="list">
                   <div v-if="list.length > 0">
                     <el-row
-v-for="(item, i) of list" :key="i" class="shouye"
-                            style="margin-bottom: 5px; display: flex; justify-content: center;background :rgba(147,208,255,0.18);padding: 5px">
+                      v-for="(item, i) of list" :key="i" class="shouye"
+                      style="margin-bottom: 5px; display: flex; justify-content: center;background :rgba(147,208,255,0.18);padding: 5px">
                       <el-col
-:span="6" class="center"
-                              style="display: flex; justify-content: center; align-items: center; padding: 6px;">
+                        :span="6" class="center"
+                        style="display: flex; justify-content: center; align-items: center; padding: 6px;">
                         <div style="font-weight: 900">{{ item.studentName }}</div>
                       </el-col>
                       <el-col
-:span="6" class="center"
-                              style="display: flex; justify-content: center; align-items: center; padding: 6px;">
+                        :span="6" class="center"
+                        style="display: flex; justify-content: center; align-items: center; padding: 6px;">
                         <div>{{ item.userNumber }}</div>
                       </el-col>
                       <el-col
-:span="6" class="center"
-                              style="display: flex; justify-content: center; align-items: center; padding: 6px;">
-                        <div>{{ item.daptName }}</div>
+                        :span="6" class="center"
+                        style="display: flex; justify-content: center; align-items: center; padding: 6px;">
+                        <div>{{ item.deptName }}</div>
                       </el-col>
                       <el-col
-:span="6" class="center"
-                              style="display: flex; justify-content: center; align-items: center; padding: 6px;">
+                        :span="6" class="center"
+                        style="display: flex; justify-content: center; align-items: center; padding: 6px;">
                         <div>{{ formatDate(item.clockInTime) }}</div>
                       </el-col>
                     </el-row>
@@ -137,8 +137,8 @@ v-for="(item, i) of list" :key="i" class="shouye"
                   </div> -->
                 </vue3ScrollSeamless>
                 <div
-v-if="list.length == 0"
-                     style="width: 100%; height: 100px; display: flex; justify-content: center; align-items: center; margin-top: -230px;">
+                  v-if="list.length == 0"
+                  style="width: 100%; height: 100px; display: flex; justify-content: center; align-items: center; margin-top: -230px;">
                   <el-empty description="暂无数据"/>
                 </div>
                 <!--                </div>-->
@@ -146,8 +146,8 @@ v-if="list.length == 0"
             </el-col>
             <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
               <el-card
-class=" h-465px mb-10px mt-40px mr-15px "
-                       style="min-width: 250px ;background-color: rgb(255,255,255);border: 4px solid rgba(109,181,255,0.42);border-radius:15px">
+                class=" h-465px mb-10px mt-40px mr-15px "
+                style="min-width: 250px ;background-color: rgb(255,255,255);border: 4px solid rgba(109,181,255,0.42);border-radius:15px">
                 <!-- 移除 el-card 的边框 -->
                 <template #header>
                   <div class="h-7 flex justify-between fw-800 text-22px">
@@ -608,7 +608,7 @@ const class2Options = reactive({
 const list = reactive([]);
 const getStudentAttendance = async () => {
   const data = await StudentAttendanceApi.getDayStudentAttendance()
-  // console.log("打卡列表", data);
+  console.log("打卡列表", data);
   list.splice(0, list.length, ...data);
 }
 const classOptions = reactive({

+ 1 - 1
src/views/system/studentSelectSupervisorRecord/record.vue

@@ -171,7 +171,7 @@
                 type="primary"
                 @click="openForm('update',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.studentId)"
                 v-hasPermi="['system:student-select-supervisor-record:update']"
-                v-if="userInfo.userType==='4'"
+                v-if="userInfo.userType==='4' && scope.row.selectType === 1 || userInfo.userType==='4' && scope.row.selectType === 2"
               >
                 志愿编辑
               </el-button>

+ 15 - 6
src/views/system/userDetail/teacher.vue

@@ -52,11 +52,12 @@
         <el-col :span="24" v-if="userInfo.userType==='3'&& formType==='update' || userInfo.userType==='5' && formType==='update'">
           <el-form-item label="个人简历上传" prop="introduction">
             <!-- <upload-file v-model="formData.introduction" /> -->
-            <Editor v-model="formData.introduction" ref="editorRef" class="full-width-editor"/>
+            <!-- <Editor v-model="formData.introduction" ref="editorRef" class="full-width-editor" /> -->
+            <el-input type="textarea" v-model="formData.introduction" placeholder="暂无简介" />
           </el-form-item>
         </el-col>
         <!--        学院和学生下载-->
-        <el-col :span="24" v-if="userInfo.userType==='4'||userInfo.userType==='1'&&formType==='detail'">
+        <!-- <el-col :span="24" v-if="userInfo.userType==='4'||userInfo.userType==='1'&&formType==='detail'">
           <el-form-item label="导师简历下载(PDF)" prop="introduction">
               <el-button
                 v-if="formData.introduction"
@@ -69,6 +70,11 @@
               </el-button>
               <span v-else>暂无文件</span>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="24" v-if="userInfo.userType==='4'||userInfo.userType==='1'&&formType==='detail'">
+          <el-form-item label="导师简历" prop="introduction">
+            <el-input type="textarea" v-model="cleanedintroduction" placeholder="暂无简介" disabled />
+          </el-form-item>
         </el-col>
       </el-row>
     <el-row  >
@@ -189,11 +195,14 @@ const submitForm = async () => {
 
 const isSupervisor = computed(() => userInfo.value.userType === '3');
 
+const cleanedintroduction = computed(() => {
+  return formData.value.introduction ? formData.value.introduction.replace(/<\/?[^>]+(>|$)/g, '') : '';
+});
 //下载PDF
-const handleDownload = () => {
-  console.log(formData.value.introduction)
-  download.markdown(formData.value.introduction, '个人简历.pdf');
-};
+// const handleDownload = () => {
+//   console.log(formData.value.introduction)
+//   download.markdown(formData.value.introduction, '个人简历.pdf');
+// };
 
 
 /** 重置表单 */

+ 4 - 3
src/views/system/workroomTeacher/TeacherSelf/TForm.vue

@@ -59,13 +59,14 @@
         </el-col>
       </el-row>
 
-<!--  <el-row>
+      <el-row>
         <el-col :span="24">
           <el-form-item label="个人简历" prop="introduction">
-            <upload-file v-model="formData.introduction" />
+            <!-- <upload-file v-model="formData.introduction" /> -->
+            <el-input type="textarea" v-model="formData.introduction" placeholder="暂无简介" />
           </el-form-item>
         </el-col>
-      </el-row> -->
+      </el-row>
 
       <el-row>
         <el-col :span="24">

+ 8 - 2
src/views/system/workroomTeacher/TeacherSelf/index.vue

@@ -50,6 +50,13 @@
           </div>
 
         </ul>
+        <div class="info-remark">
+          <div style="display: flex; align-items: center;">
+            <Icon icon="fontisto:email" />
+            <div class="div-label" style="margin-left: 8px;">个人简历:</div>
+          </div>
+          <div class="remark-content">userInfo.introduction</div>
+        </div>
         <div class="info-remark">
           <div style="display: flex; align-items: center;">
             <Icon icon="ep:picture" />
@@ -62,7 +69,6 @@
             </div>
           </div>
         </div>
-        
       </el-card>
       <TForm
         ref="formRef"
@@ -198,7 +204,7 @@ const fetchImageUrls = async () => {
   }
 };
 // 创建一个 computed 属性来处理并去掉 <p> 标签
-  const cleanedremark = computed(() => {
+const cleanedremark = computed(() => {
   return userInfo.value.remark ? userInfo.value.remark.replace(/<\/?[^>]+(>|$)/g, '') : '';
 });