m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

Browse Source
topic_bank
caicai8 6 years ago
parent 82fe9f6ca6 8749d51ddd
commit 741de9860c
6 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/App.js
Unescape View File

@ -346,7 +346,7 @@ class App extends Component {
} }
} }
disableVideoContextMenu = () => { disableVideoContextMenu = () => {
window.$( "body" ).on( "mousedown", "video", function() { window.$( "body" ).on( "mousedown", "video", function(event) {
if(event.which === 3) { if(event.which === 3) {
window.$('video').bind('contextmenu',function () { return false; }); window.$('video').bind('contextmenu',function () { return false; });
} else { } else {

2
public/react/src/modules/courses/coursesPublic/AppraiseModal.js
Unescape View File

@ -94,7 +94,6 @@ class AppraiseModal extends Component{
width: 48px; width: 48px;
height: 16px; height: 16px;
font-size: 16px; font-size: 16px;
font-family: PingFangSC;
font-weight: 400; font-weight: 400;
color: rgba(5,16,26,1); color: rgba(5,16,26,1);
line-height: 16px; line-height: 16px;
@ -102,7 +101,6 @@ class AppraiseModal extends Component{
.newfont{ .newfont{
height: 16px; height: 16px;
font-size: 16px; font-size: 16px;
font-family: PingFangSC;
font-weight: 400; font-weight: 400;
color: rgba(5,16,26,1); color: rgba(5,16,26,1);
line-height: 16px; line-height: 16px;

92
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -1062,7 +1062,7 @@ class PollNewQuestbank extends Component {
} else if (object.question.question_type === 2) { } else if (object.question.question_type === 2) {
//插入多选题 //插入多选题
if (object.question.max_choices < object.question.min_choices) { if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1087,11 +1087,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1293,7 +1293,7 @@ class PollNewQuestbank extends Component {
//插入多选题 //插入多选题
if (object.question.max_choices < object.question.min_choices) { if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification('可选的最大限制不能小于最小限制！'); this.props.showNotification('可选：最小和最大限制须同时为数值或者“--"');
return; return;
} }
@ -1318,11 +1318,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
}else { }else {
this.props.showNotification(`最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1623,7 +1623,7 @@ class PollNewQuestbank extends Component {
} else if (object.question.question_type === 2) { } else if (object.question.question_type === 2) {
//插入多选题 //插入多选题
if (object.question.max_choices < object.question.min_choices) { if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1649,11 +1649,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1827,7 +1827,7 @@ class PollNewQuestbank extends Component {
} else if (object.question.question_type === 2) { } else if (object.question.question_type === 2) {
//插入多选题 //插入多选题
if (object.question.max_choices < object.question.min_choices) { if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -1853,11 +1853,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选的最大限制不能小于最小限制！`); this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return; return;
} }
@ -3251,10 +3251,14 @@ class PollNewQuestbank extends Component {
// : // :
itemo.question.answers.length > 2 &&indext>1? itemo.question.answers.length > 2 &&indext>1?
<span> <span>
<a className="lineh-40 mr10" {
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip indext > 1 ?
title="删除" placement={"bottom"}><i <a className="lineh-40 mr10"
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a> onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
:""
}
{ {
itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ? 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 ? itemo.question.answers.length > 2 && indext>1 ?
<span> <span>
<a className="lineh-40 mr10" {
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip indext > 1 ?
title="删除" placement={"bottom"}><i <a className="lineh-40 mr10"
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a> onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
:""
}
{ {
itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ? itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
<a className="lineh-40" <a className="lineh-40"
@ -3897,22 +3905,34 @@ class PollNewQuestbank extends Component {
}} }}
onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea> onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea>
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
(itemo.question.question_type === 2&& itemo.question.answers.length === 3 ? // (itemo.question.question_type === 2&& itemo.question.answers.length === 3 ?
(indext ===1? // (itemo.question.answers[itemo.question.answers.length-1].answer_text === "其他" &&indext ===1?
<a className="lineh-40" id="bianjibianji3" // <a className="lineh-40" id="bianjibianji3"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip // onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" // title="新增"
placement={"bottom"}><i // placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> // className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"") // :itemo.question.answers[itemo.question.answers.length-1].answer_text === "选项" &&indext ===1?
: // <a className="lineh-40" id="bianjibianji3"
itemo.question.answers.length > 2 && indext>1 ? // onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
// title="新增"
// placement={"bottom"}><i
// className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
// :"")
// :
itemo.question.answers.length > 2 && indext>=1 ?
<span> <span>
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
{ {
indext>1?
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
:""
}
{
itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ? itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
<a className="lineh-40" <a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
@ -3940,9 +3960,7 @@ class PollNewQuestbank extends Component {
placement={"bottom"}><i placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"") :"")
: "":""}
: "")
: ""}
</p>)} </p>)}
</div> </div>
) )

10
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -2504,6 +2504,15 @@ class Listofworksstudentone extends Component {
// console.log(this.props.isAdmin()); // console.log(this.props.isAdmin());
let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; 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 ( return (
this.props.isAdmin() === true ? this.props.isAdmin() === true ?
( (
@ -3035,6 +3044,7 @@ class Listofworksstudentone extends Component {
: :
// 学生能查看别人的 // 学生能查看别人的
<div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}> <div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}>
{/*双层*/}
<DownloadMessageysl <DownloadMessageysl
{...this.props} {...this.props}
value={this.state.DownloadMessageval} value={this.state.DownloadMessageval}

1
public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
Unescape View File

@ -323,7 +323,6 @@ class ShixunWorkReport extends Component {
.back_font{ .back_font{
height: 18px; height: 18px;
font-size: 18px; font-size: 18px;
font-family: PingFangSC;
font-weight: 400; font-weight: 400;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
line-height: 18px; line-height: 18px;

4
public/react/src/modules/user/usersInfo/usersInfo.css
Unescape View File

@ -287,7 +287,6 @@
width:64px; width:64px;
height:16px; height:16px;
font-size:16px; font-size:16px;
font-family:PingFangSC;
font-weight:400; font-weight:400;
color: #666 !important; color: #666 !important;
} }
@ -314,7 +313,6 @@
max-width: 56px; max-width: 56px;
height: 55px; height: 55px;
font-size: 14px; font-size: 14px;
font-family: PingFangSC;
font-weight: 400; font-weight: 400;
cursor: pointer; cursor: pointer;
line-height: 55px; line-height: 55px;
@ -325,7 +323,6 @@
width:230px; width:230px;
height:20px; height:20px;
font-size:14px; font-size:14px;
font-family:PingFangSC;
font-weight:400; font-weight:400;
color:rgba(153,153,153,1); color:rgba(153,153,153,1);
line-height:20px; line-height:20px;
@ -335,7 +332,6 @@
/* width: 141px; */ /* width: 141px; */
height: 20px; height: 20px;
font-size: 14px; font-size: 14px;
font-family: PingFangSC;
font-weight: 400; font-weight: 400;
color: rgba(153,153,153,1); color: rgba(153,153,153,1);
line-height: 20px; line-height: 20px;

Write Preview
Loading…
Cancel
Save