From 8fe48821560dbdf32ae70268598d070e28f6c435 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 18 Nov 2024 14:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue     | 21 +++++++++++----------
 src/views/lecturer/LookExternalLecturer.vue |  4 ++--
 src/views/lecturer/LookInsideLecturer.vue   | 21 ++++++++++++++-------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index f629ef99..135ec8ac 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -2,7 +2,7 @@
 <template>
   <div>
     <!-- 搜索框及按钮 -->
-    <div class="filter" style="min-width: 1380px;">
+    <div class="filter" >
       <a-form layout="inline">
         <a-form-item  class="select">
           <!--  v-model:value="searchParam.name" -->
@@ -40,10 +40,10 @@
           <template #action="{ record, column }">
               <a-space >
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                <a-button type="link" v-if="record.isPermission==='true'||record.isSuperPermission==='true'" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status == '1'&&(record.isPermission==='true'||record.isSuperPermission==='true')" type="link"
+                <a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                <a-button v-if="record.status == '1'" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
-                <a-button v-if="record.status == '2'&&(record.isPermission==='true'||record.isSuperPermission==='true')" type="link"
+                <a-button v-if="record.status == '2'" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
                   <a-button type="link" v-if="record.isSuperPermission==='true'" @click="() => deleteModal(record, String(record.courseform))"
                       >删除</a-button>
@@ -79,12 +79,13 @@
                 <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
                   :headers="headers" :before-upload="beforeUpload">
                  <img class="i_upload_img" v-if="formParam.photo" :src="formParam.photo" alt="avatar" title="更换头像" />
-                  <div class="i_upload" v-else>
+                 <img class="i_upload_img" v-else src="../../assets/avatar.png" alt="avatar" title="更换头像" />
+                  <!-- <div class="i_upload" v-else>
                     <div class="addimg">
                       <div class="heng"></div>
                       <div class="shu"></div>
                     </div>
-                  </div>
+                  </div> -->
                 </a-upload>
               <div class="i_bottom">
                 <div class="tip" style="margin-bottom: 10px;">
@@ -315,7 +316,7 @@ export default {
       formParam: {
         description:"",
         teacherType:'2',
-        photo:avatar,
+        photo:null,
         status:1,
         teaching:'',
       },
@@ -492,7 +493,7 @@ export default {
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
       // state.formParam.photo =userInfo.value?.avatar
-      state.formParam.photo = avatar
+      state.formParam.photo = null
       state.vf = true
       state.formParam.status = '1'
       // state.formParam.photo = state.formParam.photo === null ?boe : state.formParam.photo
@@ -679,7 +680,7 @@ export default {
         console.log("外部讲师详情", res.data);
         state.formParam = res.data.data
         state.formParam.description = state.formParam.description === null ? '' : state.formParam.description
-        state.formParam.photo = state.formParam.photo === null ? userInfo.value?.avatar : state.formParam.photo
+        // state.formParam.photo = state.formParam.photo === null ? userInfo.value?.avatar : state.formParam.photo
       })
         .catch((err) => {
           console.log("外部讲师详情", err);
@@ -715,7 +716,7 @@ export default {
     }
     const clearNonNumber = () => {
       state.formParam.teaching = state.formParam.teaching.replace(/\D/g, '');
-      // state.formParam.teaching
+      state.formParam.teaching = state.formParam.teaching.slice(0,8)
     }
     const sendRemark=()=>{
       state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index eedc73f5..3cc697ba 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -170,8 +170,8 @@ export default{
       },
       {
         title: '内容分类',
-        dataIndex: 'nrfl',
-        key: 'nrfl',
+        dataIndex: 'courseTypeName',
+        key: 'courseTypeName',
         ellipsis: true, align: "center",
         width: 120,
       },
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index 53212d27..0ab95ce1 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -235,7 +235,7 @@ export default{
       {
           title: "内容分类",
           width: 100,
-          dataIndex: "sysType1",
+          dataIndex: "courseTypeName",
           ellipsis: true,
           key: "keywords",
           align: "center",
@@ -352,22 +352,29 @@ export default{
         const promotionrecordsColumns = ref([
       {
         title: '变更时间',
-        dataIndex: 'updateTime',
-        key: 'updateTime',
+        dataIndex: 'createTime',
+        key: 'createTime',
         ellipsis: true, align: "center",
         width: 120,
       },
       {
         title: '变更方式',
-        dataIndex: 'operatorType',
-        key: 'operatorType',
+        dataIndex: 'type',
+        key: 'type',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.type == 1 ? "自动" : value.record.type == 0 ? '手动':"-"}
+            </div>
+          )
+        }
       },
       {
         title: '变更结果',
-        dataIndex: 'levelName',
-        key: 'levelName',
+        dataIndex: 'result',
+        key: 'result',
         ellipsis: true, align: "center",
         width: 120,
       },