细节修改,并且查漏

This commit is contained in:
zhangsir
2024-05-15 00:44:58 +08:00
parent 3799fd7c2b
commit b4b614d18e
3 changed files with 87 additions and 40 deletions

View File

@@ -145,14 +145,23 @@ const editFee = (record) => {
} }
//线上学习课列表显示 //线上学习课列表显示
const ViewReviewdata = ref([]) const ViewReviewdata = ref([])
const ViewReviewDataShow = ref([])
function selectCourse(row) { function selectCourse(row) {
console.log(row); console.log(row);
ViewReviewdata.value = [row]; row.courseName = row.name
row.type = '在线课'
row.sysCreateBy = row.sysCreateBy
row.createTime = row.publishTime
console.log(row,'row')
if (!ViewReviewDataShow.value.some(item => item.id === row.id)) {
console.log('添加')
ViewReviewdata.value.push(row);
ViewReviewDataShow.value.push(row);
}
onlineRef.value.closeModal(); onlineRef.value.closeModal();
} }
const OnlineLearning = async (i, row) => { const OnlineLearning = async (i, row) => {
window.selectCourse = selectCourse; window.selectCourse = selectCourse;
// row && (ViewReviewdata.value = [row.info]);
ViewReviewShow.value = true ViewReviewShow.value = true
await getOnlineLearningList().then(res=>{ await getOnlineLearningList().then(res=>{
if(res.code == 200){ if(res.code == 200){
@@ -191,6 +200,20 @@ const falseData = () => {
} }
const AddList = () => { const AddList = () => {
console.log(ViewReviewdata.value,'数据') console.log(ViewReviewdata.value,'数据')
if(ViewReviewDataShow.value.length==0){
message.error('请选择课程')
return
}
const data = ViewReviewDataShow.value.map(item=>{
return {
courseName: item.name,
courseContent: '',
courseId: item.orgId
}
})
addCourse({data}).then(res=>{
console.log(res,'res')
})
falseData() falseData()
} }
//认证审批项目列表数据 //认证审批项目列表数据
@@ -330,7 +353,7 @@ function handleOper(record, type, status = "") {
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="falseData"
/> />
</div> </div>
<div style="display: flex;flex-direction: column;"> <div style="display: flex;flex-direction: column;">
@@ -390,9 +413,9 @@ function handleOper(record, type, status = "") {
<div style="display: flex;justify-content: space-between;align-self: end;"> <div style="display: flex;justify-content: space-between;align-self: end;">
<div v-if="Administrator===0" @click="OnlineLearning" style=" cursor: pointer;margin-right: 15px;height: 38px; width: 150px;background: #4ea6ff; line-height: 40px;text-align: center;border-radius: 8px;color: #ffffff;">线上学习课程设置</div> <div v-if="Administrator===0" @click="OnlineLearning" style=" cursor: pointer;margin-right: 15px;height: 38px; width: 150px;background: #4ea6ff; line-height: 40px;text-align: center;border-radius: 8px;color: #ffffff;">线上学习课程设置</div>
<div class="btns" @click="centerDialogVisible=true"> <div class="btns" @click="centerDialogVisible=true">
<div style="margin-right: 0;" class="btn btn3"> <div style="margin-right: 0;" class="btn btn3" @click="createData">
<div class="search"></div> <div class="search"></div>
<div class="btnText" @click="createData">创建认证</div> <div class="btnText">创建认证</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -829,9 +829,9 @@ const vwtext = ref(null)
<p>具体说明{{ route.query.description }}</p> <p>具体说明{{ route.query.description }}</p>
</div> </div>
<div> <div @click="$router.push({ path: '/InstructorCertification' })" style="cursor: pointer;">
<img src="../../assets/images/projectadd/return.png" alt=""> <img src="../../assets/images/projectadd/return.png" alt="">
<el-button type="primary" text @click="$router.push({ path: '/InstructorCertification' })">返回</el-button> <el-button type="primary" text style="margin-left: 10px;">返回</el-button>
</div> </div>
</div> </div>
@@ -1241,9 +1241,8 @@ const vwtext = ref(null)
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">查看讲师</div> <div class="headerTitle">查看讲师</div>
<img v-if="techerDetail?.avatar" style="width: 29px; height: 29px; cursor: pointer" :src="techerDetail?.avatar"/>
<img <img
v-else @click="showViewInstructor = false"
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
/> />
@@ -1251,7 +1250,12 @@ const vwtext = ref(null)
<div > <div >
<div style="display: flex;width: 100%; height: 88px;"> <div style="display: flex;width: 100%; height: 88px;">
<div> <div>
<img src="../../assets/2.png" alt=""> <img v-if="techerDetail?.avatar" style="width: 60px; height: 58px;margin-left: 22px;margin-right: 29px;margin-top: 13px;" :src="techerDetail?.avatar"/>
<img
v-else
style="width: 60px; height: 58px;margin-left: 22px;margin-right: 29px;margin-top: 13px;"
src="../../assets/2.png"
/>
</div> </div>
<div style="margin-left: 18px;"> <div style="margin-left: 18px;">
<div style="font-size: 18px;font-weight: 500;color: #333333;line-height: 25px;font-style: normal;">{{techerDetail?.teacherName}}<span style="margin-left: 8px;"> {{techerDetail?.teacherNo}}</span></div> <div style="font-size: 18px;font-weight: 500;color: #333333;line-height: 25px;font-style: normal;">{{techerDetail?.teacherName}}<span style="margin-left: 8px;"> {{techerDetail?.teacherNo}}</span></div>
@@ -1291,12 +1295,12 @@ const vwtext = ref(null)
<div style='font-size: 18px;font-weight: 500;margin-top: 39px;'> <div style='font-size: 18px;font-weight: 500;margin-top: 39px;'>
认证流程 认证流程
</div> </div>
<div style="margin-top: 13px; height: 125px;width: 100%;display: flex;align-items: center;justify-content: center;" > <div style="margin-top: 13px; height: 125px;width: 100%;display: flex;margin-left: 44px;" >
<div class="step_box" v-for="(item,index) in attestation" :key="index"> <div class="step_box" v-for="(item,index) in attestation" :key="index">
<div v-if="index != 0" style="height: 1px;width: 81px;background-color: #DEDEDE;"></div> <div v-if="index != 0" style="height: 2px;width: 81px;background-color: #DEDEDE;margin-top: -30px;"></div>
<div style="display: flex;width: 70px;height: 78px;flex-direction: column;align-items: center"> <div style="display: flex;min-width: 70px;height: 78px;flex-direction: column;align-items: center">
<img style="width: 46px;height: 46px;" :src="require(`../../assets/images/gratefulteacher/${item.images[item.status]}`)" alt=""> <img style="width: 46px;height: 46px;margin-bottom: 12px;" :src="require(`../../assets/images/gratefulteacher/${item.images[item.status]}`)" alt="">
<div style="color: #409EFF;font-size: 14px;">{{item.name[item.status]}}</div> <div style="font-size: 14px;" :style="{color:['#3DA8F0','#DEDEDE','#FF4040','#31AF0D'][item.status]}">{{item.name[item.status]}}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -1490,7 +1494,7 @@ const vwtext = ref(null)
align-items: center; align-items: center;
flex-shrink: 0; flex-shrink: 0;
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 58px;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;

View File

@@ -67,7 +67,7 @@
:columns="columns" :columns="columns"
:data-source="datalist" :data-source="datalist"
:pagination="stuPagination" :pagination="stuPagination"
:loading="loading" :loading="loadings"
row-key="id" row-key="id"
> >
<template #action="{ record }"> <template #action="{ record }">
@@ -89,7 +89,7 @@
</a-table> </a-table>
</div> </div>
</div> </div>
<div class="btn" style="display: flex;justify-content: center;margin-top: 200px"> <div class="btn_footer">
<button class="btn2" @click="closeDrawer" style="cursor: pointer;border: none; margin-right: 15px;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;">取消</button> <button class="btn2" @click="closeDrawer" style="cursor: pointer;border: none; margin-right: 15px;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;">取消</button>
<button class="btn2" @click="closeDrawer" style=" cursor: pointer;border: none;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;">确定</button> <button class="btn2" @click="closeDrawer" style=" cursor: pointer;border: none;height: 38px; width: 100px;background: #4ea6ff; line-height: 38px;text-align: center;border-radius: 8px;color: #ffffff;">确定</button>
</div> </div>
@@ -163,18 +163,23 @@ import { message } from "ant-design-vue";
}); });
const datalist = ref([]) const datalist = ref([])
const getData = async ()=>{ const getData = async ()=>{
const res = await removePermission({ loadings.value = true
"examineId": props.id await removePermission({
"examineId": props.id,
pageNo: searchParams.value.pageNo,
pageSize: searchParams.value.pageSize,
}).then(res=>{
console.log(res,'权限列表');
datalist.value = res.data.records
total.value = res.data.total
loadings.value = false
}) })
console.log(res,'权限列表');
datalist.value = res.data.records
} }
onMounted(()=>{ onMounted(()=>{
getData() getData()
}) })
const visiable = ref(false); const visiable = ref(false);
const total = ref(0)
const initParams = { const initParams = {
studentName: "", studentName: "",
pageNo: 1, pageNo: 1,
@@ -241,13 +246,13 @@ import { message } from "ant-design-vue";
}, },
]); ]);
const { // const {
data: studentList, // data: studentList,
fetch: searchStu, // fetch: searchStu,
total, // total,
loading, // loading,
} = usePage(STUDENT_LIST, searchParams); // } = usePage(STUDENT_LIST, searchParams);
const { loading: stuAsyncLoading } = useAsyncStu(props.id, props.types.join(","), searchStu); // const { loading: stuAsyncLoading } = useAsyncStu(props.id, props.types.join(","), searchStu);
const stuPagination = computed(() => ({ const stuPagination = computed(() => ({
@@ -263,15 +268,24 @@ import { message } from "ant-design-vue";
}; };
const changePagination = (page) => { const changePagination = (page) => {
console.log(page,'page')
searchParams.value.pageNo = page; searchParams.value.pageNo = page;
getData()
}; };
const loadings = ref(false)
const search = async()=>{ const search = async()=>{
const res = await removePermission({ loadings.value = true
searchParams.value.pageNo = 1;
await removePermission({
"examineId": props.id, "examineId": props.id,
"name" : searchName.value "name" : searchName.value,
pageNo: 1,
pageSize: 10
}).then(res => {
loadings.value = false
datalist.value = res.data.records
total.value = res.data.total
}) })
datalist.value = res.data.records
} }
// function search() { // function search() {
// searchParams.value.studentName = searchName.value; // searchParams.value.studentName = searchName.value;
@@ -327,14 +341,15 @@ import { message } from "ant-design-vue";
// searchStu() // searchStu()
// } // }
watch(visiable, () => { watch(visiable, (val) => {
visiable.value && searchStu(); if(val){
searchParams.value = initParams; getData()
}
}); });
defineExpose({ defineExpose({
searchStu, // searchStu,
loading, // loading,
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
@@ -592,6 +607,10 @@ import { message } from "ant-design-vue";
} }
} }
} }
.btn_footer{
display: flex;
justify-content: center;
}
.deleteModal1 { .deleteModal1 {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
@@ -721,4 +740,5 @@ import { message } from "ant-design-vue";
} }
} }
} }
</style> </style>