调整

public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js

@@ -67,11 +67,10 @@ class Groupjobbandetails extends Component {
 				<div className="yslquestionbank1">
 
 					{
-						datas&&(datas.description===null||datas.description==="null"||datas.description===""?
+					datas.description===null||datas.description==="null"||datas.description===""?
 								 ""
 								:
 										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
-						)
 					}
 					<div className="mt24">
 					{datas.attachments === undefined || datas.attachments === null || datas.attachments === ""? "" :

public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js

@@ -64,7 +64,7 @@ class Completetopicdetails extends Component {
 				<div className="bor-bottom-greyE">
 				<div className="yslquestionbank1">
 					{
-						datas&&(datas.description===null?
+				datas.description===null?
 						   ""
 								:datas.description==="null"?
 									""
@@ -73,25 +73,24 @@ class Completetopicdetails extends Component {
 										""
 										:
 										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
-						)
 					}
 
 					{datas.attachment_list === undefined ?
-						(datas.description===undefined || datas.description===null?
+						(datas.description===undefined || datas.description===null||datas.description===""?
 								<NoneData></NoneData>
 								:
 								""
 						)
 						:
 						datas.attachment_list === null ?
-							(datas.description===undefined || datas.description===null?
+							(datas.description===undefined || datas.description===null||datas.description===""?
 									<NoneData></NoneData>
 									:
 									""
 							)
 							:
 							datas.attachment_list.length === 0 ?
-								(datas.description===undefined || datas.description===null?
+								(datas.description===undefined || datas.description===null||datas.description===""?
 										<NoneData></NoneData>
 										:
 										""

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -68,12 +68,12 @@ class Groupjobbandetails extends Component {
 				<div className="yslquestionbank1">
 					{
 						ddatas.description===null?
-								<NoneData></NoneData>
+								""
 					 			:datas.description==="null"?
-									<NoneData></NoneData>
+						   	""
 									:
 									datas.description===""?
-										<NoneData></NoneData>
+										""
 										:
 										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
 									// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
@@ -84,13 +84,38 @@ class Groupjobbandetails extends Component {
 					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}
 					{/*	)*/}
 					{/*})}*/}
+					{datas.attachments === undefined ?
+						(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+								<NoneData></NoneData>
+								:
+								""
+						)
+						:
+						datas.attachments=== "" ?
+							(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+									<NoneData></NoneData>
+									:
+									""
+							)
+							:
+							datas.attachments=== null ?
+								(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+										<NoneData></NoneData>
+										:
+										""
+								)
+								:
+								datas.attachments.length === 0 ?
+									(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+											<NoneData></NoneData>
+											:
+											""
+									)
+									:
 					<div className="mt24">
-					{datas.attachments === undefined ? "" :
+						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>
-						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
-
 				 </div>
-
+					}
-
 					<GroupPackage2 datas={datas} bool={true}></GroupPackage2>
 				</div>
 

public/react/src/modules/courses/questionbank/Generaljobdetails.js

@@ -62,20 +62,49 @@ class Generaljobdetails extends Component {
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
 					{
-						datas&&(datas.description===null?
+					datas.description===null?
-								<NoneData></NoneData>
+								""
 								:datas.description==="null"?
-									<NoneData></NoneData>
+									""
 									:datas&&datas.description===""?
-										<NoneData></NoneData>:
+									""
+							    :
 									<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
 							// <div id="MakedownHTML "className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
-							)
 					}
+					{datas.attachments === undefined ?
+						(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+								<NoneData></NoneData>
+								:
+								""
+						)
+						:
+						datas.attachments=== "" ?
+							(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+									<NoneData></NoneData>
+									:
+									""
+							)
+							:
+							datas.attachments=== null ?
+								(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+										<NoneData></NoneData>
+										:
+										""
+								)
+								:
+								datas.attachments.length === 0 ?
+									(datas.description === undefined || datas.description === undefined || datas.description === "" ?
+											<NoneData></NoneData>
+											:
+											""
+									)
+									:
 									<div className="mt16px">
-						{datas.attachments === undefined ? "" :
+											<AttachmentsList {...this.state} {...this.props}
-							<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
+																			 attachments={datas.attachments}></AttachmentsList>
 									</div>
+					}
 				</div>
 
 			</div>