diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue index 0a8aee89..34565582 100644 --- a/src/components/common/CommonAlert.vue +++ b/src/components/common/CommonAlert.vue @@ -17,6 +17,7 @@ 提示 +
{{ content }}
diff --git a/src/views/gratefulteacher/AddLevelImportTec.vue b/src/views/gratefulteacher/AddLevelImportTec.vue index c6b0eb3f..c5be0518 100644 --- a/src/views/gratefulteacher/AddLevelImportTec.vue +++ b/src/views/gratefulteacher/AddLevelImportTec.vue @@ -114,62 +114,13 @@ }}条数据导入失败
- -
- +
@@ -240,7 +191,11 @@ export default { state.courseList = res.data.map(item => item.courseId) }) } - const closeDrawer = () => { + const closeDrawerTrue = () => { + if(state.errorIds.length==0&&state.successIds.length==0){ + message.warning("请导入数据"); + return + } if(state.successIds.length!=0){ getTeacherId({ids:state.successIds.join(',')}).then(res=>{ state.studentLists = res.data @@ -271,6 +226,10 @@ export default { } }) + closeDrawer() + } + const closeDrawer = () => { + state.successIds = [] state.errorIds = [] // clearInterval(state.timers); @@ -334,36 +293,6 @@ export default { state.errorIds = info.file.response.data.failIds state.fileName = info.file.name; let i = 0; - // state.timers = setInterval(() => { - // let uid = info.file.response.data; - // api - // .getImportStatus(uid) - // .then((res) => { - // console.log("查询导入状态", res); - // if (res.data.code === 200) { - // if (res.data.data.status !== "START") { - // i++; - // if (i === 1) { - // message.destroy(); - // message.success(`${info.file.name}上传成功`); - // state.showBottomBar = true; - // state.addLoading = false; - // state.isAddStudent = true; - // } - // state.succNum = res.data.data.successNum; - // state.errNum = res.data.data.failedNum; - // state.downloadErrUrl = res.data.data.url; - // clearInterval(state.timers); - // } - // } - // }) - // .catch((err) => { - // clearInterval(state.timers); - // state.showBottomBar = true; - // state.addLoading = false; - // console.log("查询导入状态失败", err); - // }); - // }, 500); } else if (status === "error") { state.addLoading = false; state.uploadErr = true; @@ -389,6 +318,10 @@ export default { state.succNum = 0; state.errNum = 0; state.downloadErrUrl = ""; + successNum.value = null + errfile.value = null + state.successIds = [] + state.errorIds = [] }; return { @@ -396,6 +329,7 @@ export default { afterVisibleChange, userInfo, closeDrawer, + closeDrawerTrue, // change, headers, handleChange, diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue index f56acd6c..9c5e770d 100644 --- a/src/views/gratefulteacher/InstructorCertification.vue +++ b/src/views/gratefulteacher/InstructorCertification.vue @@ -49,6 +49,8 @@ const columns = [ { title: '操作', key: 'action', + fixed: "right", + width: 250, }, ]; const ViewReviewcolumns =[ @@ -58,6 +60,7 @@ const ViewReviewcolumns =[ dataIndex: 'courseName', key: 'id', ellipsis: true, + width: 400, }, { title: "创建人", @@ -65,6 +68,7 @@ const ViewReviewcolumns =[ dataIndex: 'createName', key: 'id', align: "center", + width: 150, }, { title: "发布时间", @@ -73,6 +77,7 @@ const ViewReviewcolumns =[ key: 'id', align: "center", ellipsis: true, + width: 150, }, { title: "操作", @@ -81,6 +86,7 @@ const ViewReviewcolumns =[ key: "id", fixed: 'right', align: "center", + width: 150, slots: { customRender: "action" }, }, ] @@ -407,7 +413,7 @@ function handleOper(record, type, status = "") { :row-selection="rowSelection" :pagination="false" - :scroll="{ x: 'max-content' }" + :scroll="{ x: 1000 }" :columns="ViewReviewcolumns" :data-source="ViewReviewdata" @@ -528,28 +534,21 @@ function handleOper(record, type, status = "") { - - + + - - - - +
- + diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue index 7aa2b954..760f8925 100644 --- a/src/views/gratefulteacher/LecturerManagement.vue +++ b/src/views/gratefulteacher/LecturerManagement.vue @@ -36,6 +36,8 @@ const CancelReview = ()=>{ formState.reviewname = '' formState.time = '' InitiateReviewShow.value = false; + teacherNames.value = [] + teacherid.value = [] } const namelist = ref([]) //表格点击时间 @@ -55,6 +57,8 @@ const InitReview = () => { formState.reviewname = '' formState.time = '' rwname.value = null + teacherNames.value = [] + teacherid.value = [] addTeacherList() } const teacherid = ref(null) @@ -187,30 +191,40 @@ const reviewcolumn = [ name: 'Name', dataIndex: 'name', key: 'name', + width: 100, }, { title: '评审名称', dataIndex: 'reviewName', key: 'reviewName', + width: 190, + ellipsis: true, }, { title: '认证讲师', dataIndex: 'teacherName', key: 'teacherName', + ellipsis: true, + width: 500, }, { - title: '认证时间', + title: '评审时间', key: 'reviewTime', dataIndex: 'reviewTime', + width: 200, + ellipsis: true, }, { title: '认证状态', key: 'reviewResult', dataIndex: 'reviewResult', + width: 100, }, { title: '操作', key: 'action', + width: 200, + fixed: 'right', }, ]; const columnsTeacher = [ @@ -316,7 +330,7 @@ const getReviewList = async () => { const res = await getReview({ examineId:route.query.id, pageNo: ReviewPageNo.value, - pageSize: 15, + pageSize: 10, reviewName: "" }) console.log(res, 'pings'); @@ -418,7 +432,7 @@ const searchReview = async () => { const res = await getReview({ examineId:route.query.id, pageNo: ReviewPageNo.value, - pageSize: 15, + pageSize: 10, reviewName: reviewValue.value }) @@ -454,6 +468,7 @@ const delteacherIdList = async () => { current1.value = current1.value - 1 } console.log(data.value.length,'sha c sss'); + current1.value = 1 getTeacher() getTeacher2() } @@ -492,7 +507,7 @@ function handleOper(record, type, status = "") { const SearchTeachers =async()=>{ const res = await getTeacherList({ pageNo: 1, - pageSize: 8, + pageSize: 15, examineId: route.query.id, secondResult: value2.value==null?'1':value2.value, reviewResult:value.value, @@ -542,14 +557,13 @@ const data = ref([]) const current1 = ref(1); const onChangeTeacher = (pageNo, pageSize) => { current1.value = pageNo - console.log(pageNo, 1111); getTeacher() }; //教师列表 const getTeacher =async()=>{ const res = await getTeacherList({ pageNo: current1.value, - pageSize: 8, + pageSize: 15, examineId: route.query.id.toString(), secondResult: "1" }) @@ -890,8 +904,8 @@ const vwtext = ref(null)
-

认证项目名称：{{ route.query.time }}

-

具体说明：{{ route.query.description }}

+

认证项目名称：{{ route.query.time }}

+

具体说明：{{ route.query.description }}

@@ -916,6 +930,7 @@ const vwtext = ref(null)
+ 已报名 认证中 未通过 已通过 @@ -981,7 +996,7 @@ const vwtext = ref(null)