{
- teachers_count?
+ teachers_count || teachers_count===0?
{teachers_count}人
:
{
- students_count?
+ students_count || students_count===0?
{students_count}人
:
{
- courses_count?
+ courses_count || courses_count === 0?
{courses_count}个
:
{
- shixuns_count?
+ shixuns_count || shixuns_count === 0?
{shixuns_count}个
:
{
- shixun_report_count?
+ shixun_report_count || shixun_report_count===0?
{shixun_report_count}个
:
{
- shixun_time?
+ shixun_time || shixun_time === 0 ?
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 3ebd4fab3..d83f51c0a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -502,7 +502,8 @@ class Listofworksstudentone extends Component {
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}
+ // onClick={() => this.Viewstudenttraininginformation(record)}
+ >{record.operating}
}
@@ -897,7 +898,8 @@ class Listofworksstudentone extends Component {
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}
+ // onClick={() => this.Viewstudenttraininginformation(record)}
+ >{record.operating}
}
@@ -1295,11 +1297,13 @@ class Listofworksstudentone extends Component {
record.submitstate === "未开启" ?
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "} :
+ // onClick={() => this.Viewstudenttraininginformationt(record)}
+ >{record.has_comment===true?"详情":"评阅 "} :
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "}
+ // onClick={() => this.Viewstudenttraininginformationt(record)}
+ >{record.has_comment===true?"详情":"评阅 "}
)
},
@@ -1657,11 +1661,13 @@ class Listofworksstudentone extends Component {
record.submitstate === "未开启" ?
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"} :
+ // onClick={() => this.Viewstudenttraininginformationt(record)}
+ >{record.has_comment===true?"详情":"评阅"} :
this.Viewstudenttraininginformationtysl2(e, record)}
- onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"}
+ // onClick={() => this.Viewstudenttraininginformationt(record)}
+ >{record.has_comment===true?"详情":"评阅"}
)
},
diff --git a/public/react/src/modules/page/layers/ImageLayer.js b/public/react/src/modules/page/layers/ImageLayer.js
index 921a47d8c..b1adc5b6b 100644
--- a/public/react/src/modules/page/layers/ImageLayer.js
+++ b/public/react/src/modules/page/layers/ImageLayer.js
@@ -19,7 +19,7 @@ class ImageLayer extends Component {
{showImage ?
{shixun_time}天
:
- 
+
+
+ {url?
+ this.handleClose()}>
+ :
+ ""
+ }
{
restricte===false?
this.getanswerMdRef(ref)}
+ handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
>
@@ -594,6 +616,7 @@ class Questionitem_banks extends Component {
{...this.state}
{...this.props}
getanswerMdRef={(ref) => this.getChoquesEditor(ref)}
+ handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
>
diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js
index 512e6e373..82cd7b1b4 100644
--- a/public/react/src/modules/question/component/ChoquesEditor.js
+++ b/public/react/src/modules/question/component/ChoquesEditor.js
@@ -79,6 +79,8 @@ class ChoquesEditor extends Component{
question_titlesysl:this.props.question_titlesysl||'',
question_titleysl:this.props.question_title || '',
item_banksedit:[],
+ bindinginputs:null,
+ url:"",
}
}
addOption = () => {
@@ -174,8 +176,30 @@ class ChoquesEditor extends Component{
onCancel = () => {
this.props.onEditorCancel()
}
+ handleShowUploadImages=(url)=>{
+ this.setState({
+ url:url,
+ })
+ try {
+ this.props.handleShowUploadImage(url)
+ }catch (e) {
+
+ }
+ }
+ handleShowUploadImage = (url,i) => {
+
+ this.setState({
+ url:url,
+ bindinginputs:i
+ })
+
+ try {
+ this.props.handleShowUploadImage(url)
+ }catch (e) {
+ }
+ }
componentDidMount = () => {
try {
@@ -228,10 +252,22 @@ class ChoquesEditor extends Component{
}
var texts;
const _text = quill.getText();
+ // console.log("onOptionContentChange");
+ // console.log(value);
+ // console.log(value.ops.length);
+ // console.log(_text);
const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) {
// 处理编辑器内容为空
texts="";
+ try {
+ if(value.ops.length>1){
+ //单独图片的话 _text是为空的
+ texts=JSON.stringify(value);
+ }
+ }catch (e) {
+
+ }
} else {
if(_text.length>=500){
var result = _text.substring(0,450);
@@ -288,40 +324,68 @@ class ChoquesEditor extends Component{
if (!reg.test(_text)) {
// 处理编辑器内容为空
this.setState({
- question_titleysl:""
+ question_titleysl:"",
})
+ try {
+ if(value.ops.length>1) {
+ this.setState({
+ question_titleysl:JSON.stringify(value),
+ })
+ }
+ }catch (e) {
+
+ }
} else {
// 提交到后台的内容需要处理一下;
try {
let texts = JSON.stringify(value);
this.setState({
- question_titleysl:texts
+ question_titleysl:texts,
})
}catch (e) {
this.setState({
- question_titleysl:""
+ question_titleysl:"",
})
}
}
}
+ bindinginputs=(i)=>{
+ this.setState({
+ bindinginputs:i
+ })
+
+ }
+
+
onContentChanges=(value,quill)=>{
const _text = quill.getText();
const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) {
// 处理编辑器内容为空
this.setState({
- question_titlesysl:""
+ question_titlesysl:"",
})
+ try {
+ if(value.ops.length>1){
+ //单独图片的话 _text是为空的
+ this.setState({
+ question_titlesysl:JSON.stringify(value),
+ })
+ }
+ }catch (e) {
+
+ }
} else {
// 提交到后台的内容需要处理一下;
try {
let texts = JSON.stringify(value);
this.setState({
- question_titlesysl:texts
+ question_titlesysl:texts,
+
})
}catch (e) {
this.setState({
- question_titlesysl:""
+ question_titlesysl:"",
})
}
@@ -330,7 +394,7 @@ class ChoquesEditor extends Component{
render() {
- let { question_title, question_score, question_type, question_choices, standard_answers,question_titles} = this.state;
+ let { question_title, question_score, question_type, question_choices, standard_answers,question_titles,bindinginputs} = this.state;
let { question_id, index, exerciseIsPublish,
// question_title,
// question_type,
@@ -382,6 +446,20 @@ class ChoquesEditor extends Component{
.signleEditor .quill_editor_for_react_area .ql-container .ql-editor p{
font-family: MicrosoftYaHei;
}
+
+ .content_editorMd_show{
+ display: flex !important;
+ margin-top:0px !important;
+ border-radius:2px !important;
+ max-width: 1056px !important;
+ word-break:break-all !important;
+ border:1px solid rgba(221,221,221,1) !important;
+ }
+ .contestedtext{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ color:rgba(172,172,172,1);
+ }
`}
{question_choices.map( (item, index) => {
+ // console.log("question_choices");
+ // console.log(item);
const bg = standard_answers[index] ? 'check-option-bg' : ''
return
{/* {!question_id ? '新建' : '编辑'} */}
@@ -391,12 +469,14 @@ class ChoquesEditor extends Component{
0?"df optionRow mt15": "df optionRow"} >
{/* 点击设置答案 */}
@@ -423,25 +505,51 @@ class ChoquesEditor extends Component{
{
item===undefined||item===null||item===""?
- this.onOptionContentChange(value,quill,index)}
- />
+ this.onOptionContentChange(value,quill,index)}
- />
+
@@ -474,12 +582,14 @@ class ChoquesEditor extends Component{
+ {
+ bindinginputs===null||bindinginputs!==index?
+ this.onOptionContentChange(value,quill,index)}
+ showUploadImage={(url)=>this.handleShowUploadImage(url,index)}
+ />
+
+ }
+
:
- this.bindinginputs(index)}>
+ {/*
:
+ 请您输入选项
*/} +
+ {
+ bindinginputs===null||bindinginputs!==index?
+ this.onOptionContentChange(value,quill,index)}
+ showUploadImage={(url)=>this.handleShowUploadImage(url,index)}
+ />
+ }
+
+
}
this.bindinginputs(index)}>
+
+ this.handleShowUploadImage(url,index)}
+ />
+
+ :
+