From 2602913c3b72a96e78c231c5586b2d93acb27362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 31 Aug 2019 13:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Completetaskdetails.js                    | 20 +++++++++++++++--
 .../comtopicdetails/Completetopicdetails.js   | 20 +++++++++++++++--
 .../groupjobbank/Groupjobbandetails.js        | 20 +++++++++++++++--
 .../groupjobbank/Groupjobquesanswer.js        | 20 +++++++++++++++--
 .../courses/questionbank/Generaljobanswer.js  | 22 ++++++++++++++++++-
 .../questionbank/Generaljobbankdetails.js     |  2 +-
 .../courses/questionbank/Generaljobdetails.js | 19 ++++++++++++++--
 7 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
index 05bb600e9..979e6daf7 100644
--- a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
@@ -61,8 +61,24 @@ class Groupjobbandetails extends Component {
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
-
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>
+					{
+						datas&&(datas.description===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.description==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+						)
+					}
+					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
 
 					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
 						return (
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
index 5b15bc7f6..fbfb65d44 100644
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
+++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
@@ -61,8 +61,24 @@ class Completetopicdetails extends Component {
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="bor-bottom-greyE">
 				<div className="yslquestionbank1">
-
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>
+					{
+						datas&&(datas.description===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.description==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+						)
+					}
+					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
 
 					{datas.attachment_list === undefined ? "" : datas.attachment_list.map((item, key) => {
 						return (
diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
index 6b3e817c1..805ca65a0 100644
--- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
+++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
@@ -62,8 +62,24 @@ class Groupjobbandetails extends Component {
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
-
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>
+					{
+						datas&&(datas.description===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.description==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+						)
+					}
+					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
 
 					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
 						return (
diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
index a951769be..e668db7e3 100644
--- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
+++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
@@ -61,8 +61,24 @@ class Groupjobquesanswer extends Component {
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
-
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>
+					{
+						datas&&(datas.reference_answer===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.reference_answer==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
+						)
+					}
+					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
 
 					{datas.attachments === undefined ? "" :
 						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
index d8d86ffa5..17178ecf9 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
@@ -59,8 +59,28 @@ class Generaljobanswer extends Component {
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
+					{
+						datas&&(datas.reference_answer===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.reference_answer==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
+						)
+					}
+					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.reference_answer===null?"无":datas.reference_answer==="null"?"无":datas.reference_answer)).replace(/▁/g, "▁▁▁")}}/>*/}
+
+
+
 
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.reference_answer===null?"无":datas.reference_answer==="null"?"无":datas.reference_answer)).replace(/▁/g, "▁▁▁")}}/>
 					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
 						return (
 							<GroupPackage key={key} attachments={item}></GroupPackage>
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
index e91dcf65b..c355d241a 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn} from 'educoder';
+import {WordsBtn, ActionBtn,getImageUrl} from 'educoder';
 import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
 import axios from 'axios';
 import {
diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
index 64413b368..44f45f2cb 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
@@ -59,8 +59,24 @@ class Generaljobdetails extends Component {
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
+					{
+						datas&&(datas.description===null?
+								<div className="alltask ">
+									<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																								src={getImageUrl("images/educoder/nodata.png")} />
+										<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+								</div>
+								:datas.description==="null"?
+									<div className="alltask ">
+										<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
+																																									src={getImageUrl("images/educoder/nodata.png")} />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+									</div>
+									:
+							<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+							)
+					}
 
-				<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>
 					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
 						return (
 							<GroupPackage key={key} attachments={item}></GroupPackage>
@@ -69,7 +85,6 @@ class Generaljobdetails extends Component {
 
 				</div>
 
-
 			</div>