From ff81e2d19bc95802fad2eb1b6a5e5e4ec36d3f2c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sun, 10 Nov 2024 16:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=B2=E5=B8=88=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue     |  2 +-
 src/views/lecturer/LookInsideLecturer.vue | 50 +++++++++++++----------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 5c08b166..97d3098b 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -94,7 +94,7 @@
                   @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
                 <a-button v-if="record.status == '2'" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
-                    <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                    <a-button v-if="lecturerAdmin('lecturer-admin')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"  
                    v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
               </a-space>
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index e950bf57..33ad9a3d 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -16,9 +16,9 @@
     <a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" />
     <a-layout-content>
         <!-- 讲师信息 -->
-        <div style="width: 100%;margin-top: 10px;">
+        <div style="width: 100%;margin-top: 10px;padding: 20px;">
         <span class="line"></span>
-        <a-descriptions title="讲师信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenter">
+        <a-descriptions title="讲师信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
             <!-- 一层 -->
     <a-descriptions-item label="讲师头像">
       <!-- <a-avatar :src="formParam.photo" /> -->
@@ -26,47 +26,52 @@
     :width="55" style="border-radius: 50%;"
     :src=formParam.photo
   /></a-descriptions-item>
-    <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
-    <a-descriptions-item label="讲师姓名">{{formParam.name}}</a-descriptions-item>
-    <a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item>
+    <!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> -->
+    <a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item>
+    <a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>
     <!-- 二层 -->
-    <a-descriptions-item label="讲师级别">{{formParam.tlevelName
- }}</a-descriptions-item>
-    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}} 
+    <a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':'-'}} 
       <span>
                   <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
                     @click="handleup">查看认证资料</a-button>
                 </span>
     </a-descriptions-item>
-    <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (formParam.teaching /60 ).toFixed(2)}}小时</span>
+    <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (formParam.teaching /60 ).toFixed(2)}}小时</span><span v-else>-</span>
            </a-descriptions-item>
-    <a-descriptions-item label="发薪地  ">{{formParam.payrollPlaceName}}</a-descriptions-item>
+    <a-descriptions-item label="发薪地  ">{{formParam.payrollPlaceName||'-'}}</a-descriptions-item>
     <!-- 三层 -->
-    <a-descriptions-item label="在职状态">{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':''}}</a-descriptions-item>
-    <a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==1 ?'停用':''}}</a-descriptions-item>
-    <a-descriptions-item label="创建方式">{{formParam.entryType=='0'?'系统生成' :formParam.entryType=='1'?'手动录入':''}}</a-descriptions-item>
+    <a-descriptions-item label="在职状态">{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}</a-descriptions-item>
+    <a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==1 ?'停用':'-'}}</a-descriptions-item>
+    <a-descriptions-item label="创建方式">{{formParam.entryType=='0'?'系统生成' :formParam.entryType=='1'?'手动录入':'-'}}</a-descriptions-item>
     <a-descriptions-item label="所属组织" >   <a-popover title="所属组织">
                 <template #content>
                   {{ formParam.orgName }}
                 </template>
-                {{ formParam.neworgName  }}
+                {{ formParam.neworgName || '-' }}
               </a-popover>
     </a-descriptions-item>
   </a-descriptions>
   <div style="margin-top: 10px;"></div>
   <span class="line" ></span>
-  <a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenter"  >
+  <a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters"  >
             <!-- 一层 -->
     <a-descriptions-item label="讲师介绍" :span="4" >
-      <div v-if="formParam.description !=null"  style="min-width: 500px;" v-html="formParam.description" ></div>
+      <div v-if="formParam.description !=null&&formParam.description.trim() != '<p><br></p>'"  style="min-width: 500px;" v-html="formParam.description" ></div>
+      <div v-else>-</div>
      </a-descriptions-item>
     <a-descriptions-item label="工作职责" :span="4">
-      <div v-if="formParam.workExperience !=null"  style="min-width: 500px;" v-html="formParam.workExperience" ></div>
+      <div v-if="formParam.workExperience !=null&&formParam.workExperience.trim() != '<p><br></p>'"  style="min-width: 500px;" v-html="formParam.workExperience" ></div>
+      <div v-else>-</div>
       </a-descriptions-item>
     <a-descriptions-item label="擅长课程" :span="4">
-      <div v-if="formParam.courses !=null"  style="min-width: 500px;" v-html="formParam.courses" ></div>
+      <div v-if="formParam.courses !=null&&formParam.courses.trim() != '<p><br></p>'"  style="min-width: 500px;" v-html="formParam.courses" ></div>
+      <div v-else>-</div>
       </a-descriptions-item>
-    <a-descriptions-item label="教师专长" :span="4">{{formParam.expertiseNames===null?'':formParam.expertiseNames}}</a-descriptions-item>
+    <a-descriptions-item label="教师专长" :span="4">
+      <a-tag v-if="formParam.expertiseNames" color="blue" style="margin-right:10px" v-for="item in formParam.expertiseNames?.split(',')">{{item}}</a-tag>
+      <span v-else>-</span>
+    </a-descriptions-item>
   </a-descriptions>
   <!-- 记录 -->
   <div style="margin-top: 1px;"></div>
@@ -380,8 +385,8 @@ export default{
 
 const handleup = ()=>{
   window.open (
-        `${process.env.VUE_APP_BASE_API}/teacherUpload/teacherDownload?teacherId= ${state.id}`
-      );
+    `${process.env.VUE_APP_BASE_API}/teacherUpload/teacherDownload?teacherId= ${state.id}`
+  );
 }
         return{
             ...toRefs(state),
@@ -391,7 +396,8 @@ const handleup = ()=>{
             // getSysTypeMap,
             // sysTypeOptions,
             TeacherSystem,
-            rowCenter:{"text-align":"center"},
+            rowCenter:{"text-align":"left"},
+            rowCenters:{"text-align":"center"},
             teacherrecordstableData,
       teacherrecordsColumns,
       getteacherrecordstableData,