diff --git a/app/templates/shared/main.css b/app/templates/shared/main.css index 884f6fa37..befe7e40a 100644 --- a/app/templates/shared/main.css +++ b/app/templates/shared/main.css @@ -83,6 +83,7 @@ a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center .font-20{ font-size: 20px!important;} .font-22{ font-size: 22px!important;} .font-24{ font-size: 24px!important;} +.font-25{ font-size: 25px!important;} .font-26{ font-size: 26px!important;} .font-28{ font-size: 28px!important;} .font-30{ font-size: 30px!important;} diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index 9bbf43e9b..4a4c7b49f 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -103,6 +103,7 @@ a:hover.link-color-grey03{color:#3498db!important;} .font-18{ font-size: 18px!important;} .font-20{ font-size: 20px!important;} .font-22{ font-size: 22px!important;} +.font-25{ font-size: 25px!important;} .font-24{ font-size: 24px!important;} .font-28{ font-size: 28px!important;} .font-30{ font-size: 30px!important;} diff --git a/public/react/public/css/edu-common.css b/public/react/public/css/edu-common.css index 6817312ad..cd8d65e94 100755 --- a/public/react/public/css/edu-common.css +++ b/public/react/public/css/edu-common.css @@ -103,6 +103,7 @@ a:hover.link-color-grey03{color:#3498db!important;} .font-18{ font-size: 18px!important;} .font-20{ font-size: 20px!important;} .font-22{ font-size: 22px!important;} +.font-25{ font-size: 25px!important;} .font-24{ font-size: 24px!important;} .font-28{ font-size: 28px!important;} .font-30{ font-size: 30px!important;} diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index 584965039..20343c870 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -76,6 +76,7 @@ class commonWork extends Component{ } componentDidUpdate(prevProps, prevState) { if (prevProps.match.path != this.props.match.path) { + this.clearSelection() this._getList() } } diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index a36180e9e..16db651b0 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -1032,7 +1032,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); return; } } @@ -1252,7 +1252,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); return; } } @@ -1573,7 +1573,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); return; } } @@ -1784,7 +1784,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); return; } } diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 3e9be6a74..b8f1f9831 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3218,7 +3218,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"> : ""}

) : (

@@ -3256,7 +3256,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-25 color-grey-c"> :"" } { @@ -3265,12 +3265,12 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : } @@ -3280,7 +3280,7 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> :"") // : "") : "":""} @@ -3549,7 +3549,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"> : ""}

) : (

@@ -3583,7 +3583,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-25 color-grey-c"> :"" } { @@ -3591,12 +3591,12 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : @@ -3607,7 +3607,7 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> :"") // : "") : "":""} @@ -3885,7 +3885,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"> : ""}

) : (

@@ -3927,7 +3927,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-25 color-grey-c "> :"" } @@ -3938,14 +3938,14 @@ class PollNewQuestbank extends Component { onClick={() => this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> : this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-22 iconfont icon-roundaddfill"> :"") : "":""}

)} diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js index e384049a5..e55cd7b33 100644 --- a/public/react/src/modules/paths/ShixunPathCard.js +++ b/public/react/src/modules/paths/ShixunPathCard.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import {getImageUrl} from 'educoder'; +import { getImageUrl , setImagesUrl } from 'educoder'; import { BrowserRouter as Router, Route, Link } from "react-router-dom"; import { Tooltip } from 'antd'; import axios from 'axios'; @@ -44,7 +44,7 @@ class ShixunPathCard extends Component{ {/*target="_blank"*/} - 详情图片 + 详情图片

diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index ad1d2598c..4e9fcbffd 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -108,6 +108,7 @@ a:hover.link-color-grey03{color:#3498db!important;} .font-18{ font-size: 18px!important;} .font-20{ font-size: 20px!important;} .font-22{ font-size: 22px!important;} +.font-25{ font-size: 25px!important;} .font-24{ font-size: 24px!important;} .font-28{ font-size: 28px!important;} .font-30{ font-size: 30px!important;} diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 68305cc5b..4c596bad2 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -82,6 +82,7 @@ a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center .font-18{ font-size: 18px!important;} .font-20{ font-size: 20px!important;} .font-22{ font-size: 22px!important;} +.font-25{ font-size: 25px!important;} .font-24{ font-size: 24px!important;} .font-26{ font-size: 26px!important;} .font-28{ font-size: 28px!important;}