From 2df2b8a0c79accb13c8b5c37aabe67721c0cd8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 21 Feb 2020 17:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/question/Paperreview_single.js    | 36 ++++++++++++++----
 .../modules/question/component/Contentpart.js |  4 +-
 .../component/QuestionModalPicture.js         | 25 +++++++++---
 .../component/Paperlibraryseeid_items.js      | 38 +++++++++++++++----
 4 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/question/Paperreview_single.js b/public/react/src/modules/question/Paperreview_single.js
index 27f14ba6e..311c08688 100644
--- a/public/react/src/modules/question/Paperreview_single.js
+++ b/public/react/src/modules/question/Paperreview_single.js
@@ -6,6 +6,7 @@ import {
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import QuillForEditor from "../../common/quillForEditor";
+import QuestionModalPicture from "./component/QuestionModalPicture";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -23,6 +24,8 @@ class Paperreview_single extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
+
 		}
 
 	}
@@ -55,10 +58,21 @@ class Paperreview_single extends Component {
 	Singlemagaziness = () => {
 
 	}
-
+	handleShowUploadImage = (url) => {
+		// console.log('==============>>>>>>>>>>>>',url);
+		// setUrl(url);
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
 	render() {
-		let { questions, totalscore, total, items } = this.state;
-		let { objectsingle, indexx, paperreviewsingleindex, indexxy, name } = this.props;
+		let {questions, totalscore, total, items,url} = this.state;
+		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
 
 
 		var itemssname = "";
@@ -97,10 +111,15 @@ class Paperreview_single extends Component {
 		}
 		return (
 			<div key={indexxy}
-				className={"w100s borderwdswuh   mb20  pd20 "}
-				onMouseEnter={() => this.props.showparagraphs(indexxy, name)} style={{
-					minHeight: "114px",
-				}}>
+					 className={ "w100s borderwdswuh   mb20  pd20 "}
+					 onMouseEnter={() => this.props.showparagraphs(indexxy,name)} style={{
+				minHeight: "114px",
+			}}>
+				{url?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -184,6 +203,7 @@ class Paperreview_single extends Component {
 										<QuillForEditor
 											readOnly={true}
 											value={itemssname}
+											showUploadImage={this.handleShowUploadImage}
 										/>
 								}
 
@@ -227,6 +247,7 @@ class Paperreview_single extends Component {
 													<QuillForEditor
 														readOnly={true}
 														value={itemsnamesy}
+														showUploadImage={this.handleShowUploadImage}
 													/>
 											}
 
@@ -258,6 +279,7 @@ class Paperreview_single extends Component {
 																	<QuillForEditor
 																		readOnly={true}
 																		value={string}
+																		showUploadImage={this.handleShowUploadImage}
 																	/>
 																	: ""
 															:
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 2acdd6e85..0f418b588 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -18,7 +18,7 @@ import LoadingSpin from '../../../common/LoadingSpin';
 import Contentquestionbank from "./Contentquestionbank";
 import Listjihe from "./Listjihe";
 import Certifiedprofessional from "../../modals/Certifiedprofessional";
-import QuestionModalys from '../component/QuestionModalPicture.js'
+import QuestionModalPicture from '../component/QuestionModalPicture.js'
 const { TabPane } = Tabs;
 const Search = Input.Search;
 class Contentpart extends Component {
@@ -199,7 +199,7 @@ class Contentpart extends Component {
 			<div className=" clearfix mt25">
 				<div className="educontent mt10 pb20 w1200s">
 					{url?
-						<QuestionModalys  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalys>
+						<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
 						:
 						""
 					}
diff --git a/public/react/src/modules/question/component/QuestionModalPicture.js b/public/react/src/modules/question/component/QuestionModalPicture.js
index 97108d0ea..f54576d61 100644
--- a/public/react/src/modules/question/component/QuestionModalPicture.js
+++ b/public/react/src/modules/question/component/QuestionModalPicture.js
@@ -6,7 +6,7 @@ import './../questioncss/questioncom.css'
 import './../../../common/components/comment/index.scss';
 
 //立即申请试用
-class QuestionModalys extends Component {
+class QuestionModalPicture extends Component {
 
 	constructor(props) {
 		super(props);
@@ -21,17 +21,30 @@ class QuestionModalys extends Component {
 		return(
 			<Modal
 				keyboard={false}
-				closable={false}
+				closable={true}
 				footer={null}
 				destroyOnClose={true}
 				title=""
 				centered={true}
 				visible={this.props.url?true:false}
+				onCancel={this.props.handleClose}
 			>
 				{/* 显示上传的图片信息 */}
-				<div className="show_upload_image" style={{ display: this.props.url ? 'block' : 'none'}}>
-					<Icon type="close" className="image_close" onClick={this.props.handleClose}/>
-					<div className="image_info">
+				<style>
+					{
+						`
+						.intermediatecenter{
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+							}
+						`
+					}
+				</style>
+				<div className="show_upload_image intermediatecenter" style={{ display: this.props.url ? 'block' : 'none'}}>
+					{/*<Icon type="close" className="image_close" onClick={this.props.handleClose}/>*/}
+					<div className="image_info intermediatecenter">
 						<img className="image" src={ this.props.url} alt=""/>
 					</div>
 				</div>
@@ -40,4 +53,4 @@ class QuestionModalys extends Component {
 	}
 }
 
-export default QuestionModalys;
+export default QuestionModalPicture;
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
index fdd076fed..cc198e1d2 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
@@ -6,6 +6,7 @@ import {
 import '../testioncss/testioncss.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
 import QuillForEditor from "../../../common/quillForEditor";
+import QuestionModalPicture from "../../question/component/QuestionModalPicture";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -23,6 +24,7 @@ class Paperlibraryseeid_items extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
 		}
 
 	}
@@ -55,10 +57,21 @@ class Paperlibraryseeid_items extends Component {
 	Singlemagaziness = () => {
 
 	}
-
+	handleShowUploadImage = (url) => {
+		// console.log('==============>>>>>>>>>>>>',url);
+		// setUrl(url);
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
 	render() {
-		let { questions, totalscore, total, items } = this.state;
-		let { objectsingle, indexx, paperreviewsingleindex, indexxy, name } = this.props;
+		let {questions, totalscore, total, items,url} = this.state;
+		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
 
 
 		var itemssname = "";
@@ -95,10 +108,15 @@ class Paperlibraryseeid_items extends Component {
 
 		return (
 			<div key={indexxy}
-				className={"w100s borderwdswuh   mb20  pd20 "}
-				style={{
-					minHeight: "114px",
-				}}>
+					 className={ "w100s borderwdswuh   mb20  pd20 "}
+					 style={{
+				minHeight: "114px",
+			}}>
+				{url?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -182,6 +200,8 @@ class Paperlibraryseeid_items extends Component {
 											<QuillForEditor
 												readOnly={true}
 												value={itemssname}
+												showUploadImage={this.handleShowUploadImage}
+
 											/>
 									}
 
@@ -224,6 +244,8 @@ class Paperlibraryseeid_items extends Component {
 														<QuillForEditor
 														readOnly={true}
 														value={itemsnamesy}
+														showUploadImage={this.handleShowUploadImage}
+
 														/>
 													}
 
@@ -254,6 +276,8 @@ class Paperlibraryseeid_items extends Component {
 																	<QuillForEditor
 																		readOnly={true}
 																		value={string}
+																		showUploadImage={this.handleShowUploadImage}
+
 																	/>
 																	: ""
 															: