合并

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

@@ -12,6 +12,7 @@ import {
 } from "antd";
 import GroupPackage from '../groupjobbank/GroupPackage'
 import './questionbank.css';
+import AttachmentsList from '../../../common/components/attachment/AttachmentList';
 
 class Generaljobanswer extends Component {
 
@@ -78,14 +79,15 @@ class Generaljobanswer extends Component {
 					}
 					{/*<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 ? "" :
+						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
 
 
-
+					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
-					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
+					{/*	return (*/}
-						return (
+					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}
-							<GroupPackage key={key} attachments={item}></GroupPackage>
+					{/*	)*/}
-						)
+					{/*})}*/}
-					})}
 
 
 				</div>

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

@@ -12,6 +12,7 @@ import {
 } from "antd";
 import GroupPackage from '../groupjobbank/GroupPackage'
 import './questionbank.css';
+import AttachmentsList from "../../../common/components/attachment/AttachmentList";
 
 //内容详情
 class Generaljobdetails extends Component {
@@ -76,12 +77,9 @@ class Generaljobdetails extends Component {
 							<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
 							)
 					}
+					{datas.attachments === undefined ? "" :
+						<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
 
-					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
-						return (
-							<GroupPackage key={key} attachments={item}></GroupPackage>
-						)
-					})}
 				
 				</div>