下载失败数据
@@ -232,6 +232,9 @@ export default {
teacherIds:state.successIds
}).then(res=>{
console.log(res,'res')
+ if(res.code == 200){
+ ctx.emit("AddImpStuvisibleClose", state.isAddStudent);
+ }
})
state.successIds = []
state.errorIds = []
@@ -246,7 +249,7 @@ export default {
state.downloadErrUrl = "";
ctx.emit("update:AddImpStuvisible", false);
// 通知父组件重新获取学员列表
- ctx.emit("AddImpStuvisibleClose", state.isAddStudent);
+ // ctx.emit("AddImpStuvisibleClose", state.isAddStudent);
state.isAddStudent = false;
};
@@ -327,8 +330,8 @@ export default {
// 下载失败数据
const downloadEeeorData = () => {
- if (state.downloadErrUrl !== "") {
- window.open(`/activityApi/teacher/errorExport?ids=${state.errorIds}`);
+ if (state.errorIds.length !== 0) {
+ window.open(`/activityApi/teacher/errorExport?ids=${state.errorIds.join(',')}`);
}
};
diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue
index b8ea1bfe..24e7bc81 100644
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -128,6 +128,15 @@ const OnlineLearning = async () => {
}
})
}
+//创建认证
+const createData = () => {
+ createParam.value = {
+ name: '',
+ description: '',
+ cover: '',
+ }
+ visible.value = true
+}
//删除数据
const deleteReview = (record) =>{
dialog({
@@ -202,6 +211,7 @@ console.log(999);
}
//重置
const handleRest = ()=>{
+ searchValue.value = null
getlist()
}
@@ -362,7 +372,7 @@ function handleOper(record, type, status = "") {
diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue
index bce47732..4db4b43b 100644
--- a/src/views/gratefulteacher/LecturerManagement.vue
+++ b/src/views/gratefulteacher/LecturerManagement.vue
@@ -4,7 +4,7 @@ import { message } from 'ant-design-vue';
import AddInstructor from './AddInstructor.vue'
import LeadInstructor from './LeadInstructor.vue'
import { useRoute, useRouter } from 'vue-router'
-import {getTeacherList,deleTeTeacher,getReview,delreview,reviewdetail,reviewSave,endreview,addTeacher,editreview} from '@/api/examineApi.js'
+import {getTeacherList,deleTeTeacher,getReview,delreview,reviewdetail,reviewSave,endreview,addTeacher,editreview,backDraft,getDataById,getCertificationProcess} from '@/api/examineApi.js'
import dialog from "@/utils/dialog";
// import QrCode from './QrCode.vue'
import ViewReview from './ViewReview.vue'
@@ -139,6 +139,17 @@ const columnsTeacher = [
dataIndex: 'reviewTime',
},
]
+//认证流程
+const attestation = [
+ {name:'初稿已上传',success:'su3.png',error:'',initial:''},
+ {name:'线上学习已完成',success:'su4.png',error:'',initial:'s1.png'},
+ {name:'线下辅导已完成',success:'su5.png',error:'',initial:'s2.png'},
+ {name:'终稿已上传',success:'su1.png',error:'',initial:'s3.png'},
+ {name:'认证未通过',success:'su2.png',error:'e1.png',initial:'s4.png'},
+ {name:'线下辅导已完成',success:'su5.png',error:'',initial:'s2.png'},
+ {name:'终稿已上传',success:'su1.png',error:'',initial:'s3.png'},
+ {name:'认证',success:'su2.png',error:'e1.png',initial:'s4.png'},
+]
//老师重置
const resetTeacher = ()=>{
addTeacherList()
@@ -317,18 +328,34 @@ function handleOper(record, type, status = "") {
//搜索教师
const SearchTeachers =async()=>{
const res = await getTeacherList({
- PageNo: 1,
- PageSize: 8,
- examineId: route.query.id.toString(),
- secondResult: value2.value.toString(),
- reviewResult:value.value.toString(),
- keyWord:value3.value.toString()
+ pageNo: 1,
+ pageSize: 8,
+ examineId: route.query.id,
+ secondResult: value2.value,
+ reviewResult:value.value,
+ keyWord:value3.value
})
+ total.value = res.data.total
+ data.value = res.data.records
+
+ if(value2.value=='1'){
+ getTeacher2()
+ }
}
//重置教师
const handleRest=()=>{
+ value2.value = null
+ value.value = null
+ value3.value = null
getTeacher()
-
+ getTeacher2()
+}
+//刷新列表
+const translateTeacher = (flag) => {
+ handleRest()
+}
+const translate = (flag) => {
+ handleRest()
}
//2次认证
const total2 = ref(null)
@@ -336,11 +363,12 @@ const data2 = ref([])
//教师列表2
const getTeacher2 =async()=>{
const res = await getTeacherList({
- PageNo: 1,
- PageSize: 8,
+ pageNo: 1,
+ pageSize: 8,
examineId: route.query.id.toString(),
- secondResult: '0',
-
+ secondResult: '1',
+ reviewResult:value.value,
+ keyWord:value3.value
})
console.log(res,'resaaaa')
total2.value = res.data.total
@@ -358,8 +386,8 @@ const onChangeTeacher = (pageNo,pageSize) => {
//教师列表
const getTeacher =async()=>{
const res = await getTeacherList({
- PageNo: current1.value,
- PageSize: 8,
+ pageNo: current1.value,
+ pageSize: 8,
examineId: route.query.id.toString(),
secondResult: "0"
})
@@ -383,7 +411,7 @@ onMounted(()=>{
}
getTeacher()
getReviewList()
- // getTeacher2()
+ getTeacher2()
})
const activeName = ref('first')
const ViewReviewShow =ref(null)
@@ -481,6 +509,52 @@ const twiceolumns = [
key: 'action',
},
];
+const twiceolumnsOne = [
+ {
+ title: '序号',
+ dataIndex: 'index',
+ key: 'index',
+ customRender: ({ text,record,index }) => index + 1
+ },
+ {
+ title: '评委姓名',
+ dataIndex: 'judgesName',
+ key: 'judgesName',
+ },
+ {
+ title: '评委工号',
+ dataIndex: 'judgesWorkNum',
+ key: 'judgesWorkNum',
+ },
+ {
+ title: '评分',
+ dataIndex: 'score',
+ key: 'score',
+ },
+];
+const twiceolumnsTwo = [
+ {
+ title: '序号',
+ dataIndex: 'index',
+ key: 'index',
+ customRender: ({ text,record,index }) => index + 1
+ },
+ {
+ title: '评委姓名',
+ dataIndex: 'judgesName',
+ key: 'judgesName',
+ },
+ {
+ title: '评委工号',
+ dataIndex: 'judgesWorkNum',
+ key: 'judgesWorkNum',
+ },
+ {
+ title: '评分',
+ dataIndex: 'score',
+ key: 'score',
+ },
+]
const selectedRowKeysList = ref(null)
const rowSelection = {
onChange: async(selectedRowKeys, selectedRows) => {
@@ -514,9 +588,48 @@ const delVisible = ref(false)
const activeKey = ref('1');
const showViewInstructor =ref(false)
-const show= ()=>{
+const techerDetail = ref(null)
+const processData = ref()
+const show= async (record)=>{
showViewInstructor.value=true
-
+ await getDataById({teacherId:record.teacherId}).then(res=>{
+ console.log(res,'res')
+ if(res.code == 200){
+ console.log(res.data,'data')
+ techerDetail.value = res.data
+ }
+ })
+ await getCertificationProcess({teacherId:record.teacherId}).then(res=>{
+ console.log(res,'getCertificationProcess')
+ processData = res.data
+ })
+}
+const returnPage = (record) => {
+ console.log(record,'record')
+ dialog({
+ content: "确定退回初稿吗？",
+ ok:()=>{
+ backDraft({
+ teacherId:record.id,
+ version:0
+ }).then(res=>{
+ console.log(res,'res')
+ })
+ }
+ });
+}
+const returnPageTwo = (record) => {
+ dialog({
+ content: "确定退回初稿吗？",
+ ok:()=>{
+ backDraft({
+ teacherId:record.id,
+ version:1
+ }).then(res=>{
+ console.log(res,'res')
+ })
+ }
+ });
}
const InitiateReviewShow = ref(false)
//二维码显示
@@ -604,7 +717,7 @@ const options1 = ref([{
-
+
添加讲师
@@ -618,7 +731,7 @@ const options1 = ref([{
导入讲师
-
导出讲师
+
导出讲师
批量删除
@@ -666,11 +779,11 @@ const options1 = ref([{
-
+
查看
-
- 退回初搞
+
+ 退回初稿
删除
@@ -731,6 +844,9 @@ const options1 = ref([{
查看
+
+ 退回终稿
+
删除
@@ -742,7 +858,7 @@ const options1 = ref([{
-