diff --git a/src/AppConfig.js b/src/AppConfig.js index f771b9eab..a55649ce0 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index d4277253d..301357a36 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -86,9 +86,9 @@ const Glcc = (propsF) => { const isStudentApplyDate = new Date().getTime() > new Date('2022-05-26').getTime() && new Date().getTime() < new Date('2022-06-25 0:0').getTime(); const secondStudentApplyDate = new Date().getTime() > new Date('2022-06-29 1:0').getTime() && new Date().getTime() < new Date('2022-06-30 0:0').getTime(); // 学生中期考核入口可见时间 - const checkTime1 = new Date().getTime() > new Date('2022-08-12 8:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); + const checkTime1 = new Date().getTime() > new Date('2022-08-1 8:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); // 导师中期考核时间 - const checkTime2 = new Date().getTime() > new Date('2022-08-12 10:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); + const checkTime2 = new Date().getTime() > new Date('2022-08-1 10:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); // 中期考核结果公示8月26日0点 const checkTime3 = new Date().getTime() > new Date('2022-08-26 0:0').getTime(); diff --git a/src/glcc/interimReview/tutorReview.jsx b/src/glcc/interimReview/tutorReview.jsx index d14a780cb..af344948b 100644 --- a/src/glcc/interimReview/tutorReview.jsx +++ b/src/glcc/interimReview/tutorReview.jsx @@ -26,9 +26,10 @@ function TutorReview(props){ window.location.href="/glcc"; }else{ getAuditList({ userId: current_user.user_id, pass: 1 }).then(res => { - if (res.message == 'success') { - setTaskList(res.data.rows); - res.data.rows.length && setTaskId(res.data.rows[0].id); + if (res.message === 'success') { + const filterStuNull = res.data.rows.filter(item=>{return item.studentName !== null}) + setTaskList(filterStuNull); + filterStuNull.length && setTaskId(filterStuNull[0].id); } else { res && showNotification(res.message || '查询课题列表失败'); } @@ -53,7 +54,6 @@ function TutorReview(props){ function submit(e){ e.preventDefault(); validateFieldsAndScroll((err, values) => { - console.log('aaa', err, values); if(!err){ const params = { ...values, @@ -64,7 +64,7 @@ function TutorReview(props){ params['id'] = detail.glccTutorEvaluation.id; updateTutorEvaluation(params).then(res=>{ if(res && res.message === "success"){ - console.log('评论', res); + setIsEdit(false); message.success("修改成功"); setReload(Math.random()); } @@ -72,7 +72,6 @@ function TutorReview(props){ }else{ submitTutorEvaluation(params).then(res=>{ if(res && res.message === "success"){ - console.log('评论', res); message.success("您已成功评分"); setReload(Math.random()); }