From 039a4e7f672e840c9bbf9f8b25b8268900d1bc07 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 6 Sep 2019 13:48:06 +0800 Subject: [PATCH 1/8] event --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 520855519..00f07ecbc 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -335,7 +335,7 @@ class App extends Component { } } disableVideoContextMenu = () => { - window.$( "body" ).on( "mousedown", "video", function() { + window.$( "body" ).on( "mousedown", "video", function(event) { if(event.which === 3) { window.$('video').bind('contextmenu',function () { return false; }); } else { From 4652c28dd25e2adc898f50147104bfb1b4e01070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 13:53:10 +0800 Subject: [PATCH 2/8] b --- .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 7fef99111..29797ae43 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -3035,6 +3035,7 @@ class Listofworksstudentone extends Component { : // 学生能查看别人的
+ {/*双层*/} Date: Fri, 6 Sep 2019 13:56:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesPublic/AppraiseModal.js | 2 -- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 1 - public/react/src/modules/user/usersInfo/usersInfo.css | 4 ---- 3 files changed, 7 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js index fc9427d27..ab67dddc6 100644 --- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js +++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js @@ -94,7 +94,6 @@ class AppraiseModal extends Component{ width: 48px; height: 16px; font-size: 16px; - font-family: PingFangSC; font-weight: 400; color: rgba(5,16,26,1); line-height: 16px; @@ -102,7 +101,6 @@ class AppraiseModal extends Component{ .newfont{ height: 16px; font-size: 16px; - font-family: PingFangSC; font-weight: 400; color: rgba(5,16,26,1); line-height: 16px; diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 11a9b2f34..d5ab535e2 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -323,7 +323,6 @@ class ShixunWorkReport extends Component { .back_font{ height: 18px; font-size: 18px; - font-family: PingFangSC; font-weight: 400; color: rgba(51,51,51,1); line-height: 18px; diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 39cae868e..3db3097c9 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -287,7 +287,6 @@ width:64px; height:16px; font-size:16px; - font-family:PingFangSC; font-weight:400; color: #666 !important; } @@ -314,7 +313,6 @@ max-width: 56px; height: 55px; font-size: 14px; - font-family: PingFangSC; font-weight: 400; cursor: pointer; line-height: 55px; @@ -325,7 +323,6 @@ width:230px; height:20px; font-size:14px; - font-family:PingFangSC; font-weight:400; color:rgba(153,153,153,1); line-height:20px; @@ -335,7 +332,6 @@ /* width: 141px; */ height: 20px; font-size: 14px; - font-family: PingFangSC; font-weight: 400; color: rgba(153,153,153,1); line-height: 20px; From 5ace28129d93acb40fd64277f0be3378e301d12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 14:19:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/PollNewQuestbank.js | 20 +++++++++---------- .../shixunHomework/Listofworksstudentone.js | 9 +++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index a84a4cc16..e152c5163 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -1062,7 +1062,7 @@ class PollNewQuestbank extends Component { } else if (object.question.question_type === 2) { //插入多选题 if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } @@ -1087,11 +1087,11 @@ class PollNewQuestbank extends Component { if(object.question.min_choices>0){ if(object.question.max_choices){ if(object.question.max_choices===0){ - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } }else { - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } @@ -1293,7 +1293,7 @@ class PollNewQuestbank extends Component { //插入多选题 if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification('可选的最大限制不能小于最小限制！'); + this.props.showNotification('可选：最小和最大限制须同时为数值或者“--"'); return; } @@ -1623,7 +1623,7 @@ class PollNewQuestbank extends Component { } else if (object.question.question_type === 2) { //插入多选题 if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } @@ -1649,11 +1649,11 @@ class PollNewQuestbank extends Component { if(object.question.min_choices>0){ if(object.question.max_choices){ if(object.question.max_choices===0){ - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } }else { - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } @@ -1827,7 +1827,7 @@ class PollNewQuestbank extends Component { } else if (object.question.question_type === 2) { //插入多选题 if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } @@ -1853,11 +1853,11 @@ class PollNewQuestbank extends Component { if(object.question.min_choices>0){ if(object.question.max_choices){ if(object.question.max_choices===0){ - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } }else { - this.props.showNotification(`可选的最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 29797ae43..4c2d099b4 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2504,6 +2504,15 @@ class Listofworksstudentone extends Component { // console.log(this.props.isAdmin()); let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; + // if(this.props.isAdmin() === false){ + // if(teacherdata.student_works!==undefined){ + // if(teacherdata.student_works.length>0){ + // + // + // } + // } + // + // } return ( this.props.isAdmin() === true ? ( From ebc9b4f52ecc9c0e78b808141db6b25aa0c8d214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 14:20:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/poll/PollNewQuestbank.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index e152c5163..0e307bb34 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -1318,11 +1318,11 @@ class PollNewQuestbank extends Component { if(object.question.min_choices>0){ if(object.question.max_choices){ if(object.question.max_choices===0){ - this.props.showNotification(`最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } }else { - this.props.showNotification(`最大限制不能小于最小限制！`); + this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); return; } From 254d01b25a8b1080d501a36b6cb26709b9f71071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 14:33:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/PollNewQuestbank.js | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 0e307bb34..3715d33b2 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3897,15 +3897,21 @@ class PollNewQuestbank extends Component { }} onInput={(e) => this.HandleInputChanges(e, indexo, indext)}> {polls_status === undefined || polls_status === 1 ? - (itemo.question.question_type === 2&& itemo.question.answers.length === 3 ? - (indext ===1? - this.Ewoption(itemo.question.id, itemo)}> - :"") - : + // (itemo.question.question_type === 2&& itemo.question.answers.length === 3 ? + // (itemo.question.answers[itemo.question.answers.length-1].answer_text === "其他" &&indext ===1? + // this.Ewoption(itemo.question.id, itemo)}> + // :itemo.question.answers[itemo.question.answers.length-1].answer_text === "选项" &&indext ===1? + // this.Ewoption(itemo.question.id, itemo)}> + // :"") + // : itemo.question.answers.length > 2 && indext>1 ? :"") - - : "") - : ""} + : "":""}

)}
) From 350fc8bb852c01f9730822e176693c68e24fafbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 14:43:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/poll/PollNewQuestbank.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 3715d33b2..755b4dc19 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3912,13 +3912,19 @@ class PollNewQuestbank extends Component { // className="color-green font-18 iconfont icon-roundaddfill"> // :"") // : - itemo.question.answers.length > 2 && indext>1 ? + itemo.question.answers.length > 2 && indext>=1 ? - this.Deleteentrys(arrid, indext, false)}> { + indext>1? + this.Deleteentrys(arrid, indext, false)}> + :"" + } + + { + itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ? this.Ewoption(itemo.question.id, itemo)}> Date: Fri, 6 Sep 2019 14:46:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/PollNewQuestbank.js | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 755b4dc19..3e9be6a74 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3251,10 +3251,14 @@ class PollNewQuestbank extends Component { // : itemo.question.answers.length > 2 &&indext>1? - this.Deleteentrys(arrid, indext, false)}> + { + indext > 1 ? + this.Deleteentrys(arrid, indext, false)}> + :"" + } { itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ? @@ -3574,10 +3578,14 @@ class PollNewQuestbank extends Component { // :"") itemo.question.answers.length > 2 && indext>1 ? - this.Deleteentrys(arrid, indext, false)}> + { + indext > 1 ? + this.Deleteentrys(arrid, indext, false)}> + :"" + } { itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?