Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage

This commit is contained in:
wangxuemei
2024-11-10 18:17:33 +08:00
2 changed files with 27 additions and 33 deletions

View File

@@ -94,7 +94,7 @@
@click="() => handleOperate(record, String(record.courseform))">停用</a-button> @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
<a-button v-if="record.status == '2'" type="link" <a-button v-if="record.status == '2'" type="link"
@click="() => handleOperate(record, String(record.courseform))">启用</a-button> @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))" <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->  v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
</a-space> </a-space>

View File

@@ -16,9 +16,9 @@
<a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" /> <a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" />
<a-layout-content> <a-layout-content>
<!-- 讲师信息 --> <!-- 讲师信息 -->
<div style="width: 100%;margin-top: 10px;"> <div style="width: 100%;margin-top: 10px;padding: 20px;">
<span class="line"></span> <span class="line"></span>
<a-descriptions title="讲师信息" bordered :column="4" :labelStyle="rowCenter"> <a-descriptions title="讲师信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
<!-- 一层 --> <!-- 一层 -->
<a-descriptions-item label="讲师头像"> <a-descriptions-item label="讲师头像">
<!-- <a-avatar :src="formParam.photo" /> --> <!-- <a-avatar :src="formParam.photo" /> -->
@@ -26,57 +26,51 @@
:width="55" style="border-radius: 50%;" :width="55" style="border-radius: 50%;"
:src=formParam.photo :src=formParam.photo
/></a-descriptions-item> /></a-descriptions-item>
<a-descriptions-item label="讲师工号">{{formParam.userNo}}</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.name}}/{{formParam.userNo}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item> <a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>
<!-- 二层 --> <!-- 二层 -->
<a-descriptions-item label="讲师级别">{{formParam.tlevelName <a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
}}</a-descriptions-item> <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':'-'}}
<a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}}
<span> <span>
<a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1" <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
@click="handleup">查看认证资料</a-button> @click="handleup">查看认证资料</a-button>
</span> </span>
</a-descriptions-item> </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>
<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.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.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.entryType=='0'?'系统生成' :formParam.entryType=='1'?'手动录入':'-'}}</a-descriptions-item>
<a-descriptions-item label="所属组织" > <a-popover title="所属组织"> <a-descriptions-item label="所属组织" > <a-popover title="所属组织">
<template #content> <template #content>
{{ formParam.orgName }} {{ formParam.orgName }}
</template> </template>
{{ formParam.neworgName }} {{ formParam.neworgName || '-' }}
</a-popover> </a-popover>
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<div style="margin-top: 10px;"></div> <div style="margin-top: 10px;"></div>
<span class="line" ></span> <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" > <a-descriptions-item label="讲师介绍" :span="4" >
<div v-if="formParam.description !=null" style="min-width: 500px;" v-html="formParam.description" > <div v-if="formParam.description !=null&&formParam.description.trim() != '<p><br></p>'" style="min-width: 500px;" v-html="formParam.description" ></div>
</div> <div v-else>-</div>
<div v-if="formParam.description ==null || formParam.description =='<p><br></p>'" style="min-width: 500px;">-- </div>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="工作职责" :span="4"> <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-if="formParam.workExperience ==null || formParam.workExperience =='<p><br></p>'" style="min-width: 500px;">-- </div> <div v-else>-</div>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="擅长课程" :span="4"> <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-if="formParam.courses ==null || formParam.courses =='<p><br></p>'" style="min-width: 500px;">-- </div> <div v-else>-</div>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="教师专长" :span="4"> <a-descriptions-item label="教师专长" :span="4">
<div v-if="formParam.expertiseNames ==null || formParam.expertiseNames =='<p><br></p>'" style="min-width: 500px;">-- </div> <a-tag v-if="formParam.expertiseNames" color="blue" style="margin-right:10px" v-for="item in formParam.expertiseNames?.split(',')">{{item}}</a-tag>
<!-- <div> <span v-else>-</span>
<a-tag color="#2db7f5"> -->
{{formParam.expertiseNames===null?'':formParam.expertiseNames}}
<!-- </a-tag>
</div> -->
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<!-- 记录 --> <!-- 记录 -->
@@ -194,7 +188,6 @@ export default{
console.log("内部讲师详情", err); console.log("内部讲师详情", err);
}); });
} }
TeacherSystem() TeacherSystem()
//授课记录列表 //授课记录列表
const teacherrecordsColumns = ref([ const teacherrecordsColumns = ref([
@@ -391,8 +384,8 @@ export default{
// getSysTypeMap() // getSysTypeMap()
const handleup = ()=>{ const handleup = ()=>{
window.open ( 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{ return{
...toRefs(state), ...toRefs(state),
@@ -402,7 +395,8 @@ const handleup = ()=>{
// getSysTypeMap, // getSysTypeMap,
// sysTypeOptions, // sysTypeOptions,
TeacherSystem, TeacherSystem,
rowCenter:{"text-align":"center"}, rowCenter:{"text-align":"left"},
rowCenters:{"text-align":"center"},
teacherrecordstableData, teacherrecordstableData,
teacherrecordsColumns, teacherrecordsColumns,
getteacherrecordstableData, getteacherrecordstableData,