From c9f69cae9ba36c14ebf740761a953c6b7857f669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 16 Oct 2019 16:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E8=AF=BE=E5=A0=82=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 24 ++++++++--------- .../courses/busyWork/CommonWorkSetting.js | 10 +++---- .../courses/coursesDetail/CoursesBanner.js | 26 +++++++------------ .../courses/coursesPublic/SelectSetting.js | 2 +- .../courses/exercise/Exercisesetting.js | 2 ++ .../tasks/GraduationTaskssetting.js | 2 +- .../courses/poll/PollDetailTabForth.js | 2 +- .../shixunHomework/Trainingjobsetting.js | 2 +- public/react/src/modules/modals/Modals.js | 1 + 9 files changed, 34 insertions(+), 37 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 3c150c90c..197aee940 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -21,16 +21,16 @@ let hashTimeout // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// 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' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + 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._debugType = debugType; export function initAxiosInterceptors(props) { initOnlineOfflineListener() @@ -84,9 +84,9 @@ export function initAxiosInterceptors(props) { } config.url = `${proxy}${url}`; if (config.url.indexOf('?') == -1) { - config.url = `${config.url}?debug=${debugType}`; + config.url = `${config.url}?debug=${'teacher'}`; } else { - config.url = `${config.url}&debug=${debugType}`; + config.url = `${config.url}&debug=${'teacher'}`; } } else { // 加api前缀 diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 9aa31acb1..f0273f9b8 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -1217,7 +1217,7 @@ class CommonWorkSetting extends Component{ {/* 开启时间 */}
开启时间： - + 匿评数量： - + 缺评扣分： - + 违规匿评扣分： - +
- + 普通模式（选中，则取各助教最终评分的平均分） diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 8173b226a..b8e906b77 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -162,17 +162,7 @@ class CoursesBanner extends Component { return json; }; - showeditmenu = () => { - this.setState({ - show: true, - }) - } - hideeditmenu = () => { - this.setState({ - show: false - }) - } tojoinclass = (val) => { if(this.props.current_user&&this.props.current_user.profile_completed===false){ @@ -201,13 +191,14 @@ class CoursesBanner extends Component { yslJointhe:true }) } - showActionPoll=(i,s,ss)=>{ + showActionPoll=(i,s,ss,trs)=>{ this.setState({ modalsType: true, modalsTopval: s, loadtype: false, metype: i, modalsBottomval: ss, + modalstrsvalue:trs, }) } ActionPoll = (i) => { @@ -248,9 +239,10 @@ class CoursesBanner extends Component { } } if (i ===5) { - s = "复制”功能将会为您创建一个新的课堂旧课堂的作业、资源、试卷"; - ss = "都将被复制到新的课堂里面请问是否继续？？"; - this.showActionPoll(i,s,ss) + s = `“复制”功能将会为您创建一个新的课堂`; + ss = "请问是否继续？"; + let mid="旧课堂的作业、资源、试卷都将被复制到新的课堂里面 "; + this.showActionPoll(i,s,ss,mid) } } @@ -261,7 +253,8 @@ class CoursesBanner extends Component { modalsTopval: "", modalsBottomval:"", loadtype: false, - antIcon:false + antIcon:false, + modalstrsvalue:undefined }) } @@ -483,7 +476,7 @@ class CoursesBanner extends Component { render() { - let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype} = this.state; + let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype,modalstrsvalue} = this.state; const isCourseEnd = this.props.isCourseEnd() document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name; return ( @@ -513,6 +506,7 @@ class CoursesBanner extends Component { modalsTopval={modalsTopval} loadtype={loadtype} modalsBottomval={modalsBottomval} + modalsMidval={modalstrsvalue} modalCancel={this.modalCancel} modalSave={this.ModalAction} antIcon={antIcon} diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index 57106600d..f0b1dd884 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -242,7 +242,7 @@ class Selectsetting extends Component{ } delectcousedelectfils=(id)=>{ - const url = `/attachments/${id}.json`; + const url = `/attachments/${id}.json?type=history`; axios.delete(url) .then((response) => { diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js index 42cafc2d6..fc1bea135 100644 --- a/public/react/src/modules/courses/exercise/Exercisesetting.js +++ b/public/react/src/modules/courses/exercise/Exercisesetting.js @@ -652,6 +652,7 @@ class Exercisesetting extends Component{
发布时间：
+ +

{ unit_p_tip !="" ? {unit_p_tip}:"" diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 19980cca5..bab853a13 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -1076,7 +1076,7 @@ debugger

截止时间： - + 发布时间：
- +
发布时间： - +

{this.props.modalsTopval}

+ {this.props.modalsMidval===undefined?"":

{this.props.modalsMidval}

}

{this.props.modalsBottomval}

{this.props.loadtype===true?