tiku

public/react/src/modules/question/NewMyShixunModel.js

@@ -91,7 +91,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -117,7 +117,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
@@ -141,7 +141,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
@@ -156,7 +156,7 @@ class NewMyShixunModel extends Component {
 			public: defaultActiveKey,
 			page:1,
 			per_page:10,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -209,7 +209,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -342,7 +342,7 @@ class NewMyShixunModel extends Component {
 			page: pageNumber,
 			per_page:10,
 			oj_status:this.state.oj_status,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 
 		};
 		this.getdata(data);
@@ -461,7 +461,7 @@ class NewMyShixunModel extends Component {
 			page:1,
 			per_page:10,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -488,7 +488,7 @@ class NewMyShixunModel extends Component {
 			per_page:10,
 			keywords:null,
 			oj_status:null,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -543,7 +543,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:this.state.oj_status,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -567,7 +567,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:parseInt(this.props.exam_id),
+						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 				}
@@ -593,7 +593,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:parseInt(this.props.exam_id),
+						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 
 					};
 					this.getdata(data);
@@ -639,7 +639,13 @@ class NewMyShixunModel extends Component {
 	//选用
 	getitem_baskets=(data)=>{
 		//选用题型可以上传单个 或者多个题型
-		let url="/examination_items.json";
+		let url="";
+		if(this.props.exam_id===undefined){
+			url="/item_baskets.json";
+		}else{
+			url="/examination_items.json";
+		}
+
 
 		axios.post(url, data)
 			.then((result) => {
@@ -655,7 +661,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:parseInt(this.props.exam_id),
+						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
@@ -669,11 +675,15 @@ class NewMyShixunModel extends Component {
 	}
 	// 撤销
 	getitem_basketss=(id)=>{
-		//选用题型可以上传单个 或者多个题型
-		let url=`/examination_banks/${id}/revoke_item.json`;
+		let url="";
+		if(this.props.exam_id===undefined){
+			url=`/item_baskets/${id}.json`;
+		}else{
+			url=`/examination_banks/${id}/revoke_item.json`;
+		}
 
 		axios.delete(url,{ data: {
-				item_id:parseInt(this.props.exam_id),
+				item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 				}})
 			.then((result) => {
 				if (result.data.status == 0) {
@@ -688,7 +698,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:parseInt(this.props.exam_id),
+						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
@@ -729,7 +739,7 @@ class NewMyShixunModel extends Component {
 		}
 		const data={
 			item_ids:item_idsdata,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		}
 		this.getitem_baskets(data);
 		this.setState({
@@ -758,7 +768,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:parseInt(this.props.exam_id),
+						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 					this.getbasket_listdata();
@@ -796,7 +806,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:oj_status,
-			item_id:parseInt(this.props.exam_id),
+			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}

public/react/src/modules/question/Paperreview.js

@@ -24,6 +24,7 @@ import JudquestionEditor from "./component/JudquestionEditor";
 import Paperreview_item from "./Paperreview_item"
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import Comthetestpaperst from "./comthetestpaper/Comthetestpaperst";
+import NewMyShixunModel from "../question/NewMyShixunModel";
 //人工组卷预览
 class Paperreview extends Component {
 	constructor(props) {
@@ -49,7 +50,7 @@ class Paperreview extends Component {
 			difficulty:null,
 			name:null,
 			duration:null,
-
+			newmyshixunmodelbool:false,
 
 		}
 		// single_questions:null, 单选题
@@ -245,14 +246,48 @@ class Paperreview extends Component {
 	getcontentMdRef = (Ref) => {
 		this.contentMdRef = Ref;
 	}
+
+	setnewmyshixunmodelbool=(bool)=>{
+		if(bool===true){
+			let scrollToTop = window.setInterval(function() {
+				let pos = window.pageYOffset;
+				if ( pos > 0 ) {
+					window.scrollTo( 0, pos - 20 ); // how far to scroll on each step
+				} else {
+					window.clearInterval( scrollToTop );
+				}
+			}, 2);
+		}
+		this.setState({
+			newmyshixunmodelbool:bool
+		})
+	}
 	render() {
-		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,Cohetepaperbool} = this.state;
+		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,Cohetepaperbool,newmyshixunmodelbool} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
 		// //console.log(params);
 		return (
 			<div>
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
+					{
+						newmyshixunmodelbool===true?
+							<style>{
+								`
+								body{  overflow: hidden !important; }
+								`
+							}</style>
+							:""
+					}
+
+					{
+						newmyshixunmodelbool===true?
+							<div className="fangdatwo">
+								<NewMyShixunModel exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
+							</div>
+							:
+							""
+					}
 
 					<style>
 						{
@@ -284,7 +319,7 @@ class Paperreview extends Component {
 
 						{
 							Cohetepaperbool===false?
-								<Paperreview_item {...this.state} {...this.props} getdata={(data)=>this.getdata(data)}>
+								<Paperreview_item {...this.state} {...this.props} getdata={(data)=>this.getdata(data)} setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}>
 
 								</Paperreview_item>
 								:

public/react/src/modules/question/Paperreview_item.js

@@ -430,7 +430,7 @@ class Paperreview_item extends Component {
 							<p className="ml58 questionstotal lh34">总分：{this.props.all_questions_count}</p>
 						</div>
 						<div className="w30s xaxisreverseorder">
-							<div className="jixuxuanti xiaoshou" onClick={() => this.jixuxuantioncli()}>
+							<div className="jixuxuanti xiaoshou" onClick={() => this.props.setnewmyshixunmodelbool(true)}>
 								继续选题
 							</div>
 						</div>

public/react/src/modules/question/component/Listjihe.js

@@ -45,7 +45,7 @@ class Listjihe extends Component {
 		  }else{
 			 data={
 				item_ids:[id],
-				exam_id:this.props.exam_id
+				exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 			}
 		  }
 

public/react/src/modules/testpaper/Paperlibraryeditid.js

@@ -22,8 +22,10 @@ import Paperlibraryseeid_item from './component/Paperlibraryseeid_item';
 import Comthetestpaperst from '../question/comthetestpaper/Comthetestpaperst';
 import Paperlibraryseeid_itemss from './component/Paperlibraryseeid_itemss';
 import JudquestionEditor from "../question/component/JudquestionEditor";
-import NewMyShixunModel from "../question/NewMyShixunModel"
-//人工组卷预览
+import NewMyShixunModel from "../question/NewMyShixunModel";
+
+
+//试卷编辑
 class Paperlibraryeditid extends Component {
 	constructor(props) {
 		super(props);
@@ -187,6 +189,16 @@ class Paperlibraryeditid extends Component {
 	}
 
 	setnewmyshixunmodelbool=(bool)=>{
+		if(bool===true){
+			let scrollToTop = window.setInterval(function() {
+				let pos = window.pageYOffset;
+				if ( pos > 0 ) {
+					window.scrollTo( 0, pos - 20 ); // how far to scroll on each step
+				} else {
+					window.clearInterval( scrollToTop );
+				}
+			}, 2);
+		}
 		this.setState({
 			newmyshixunmodelbool:bool
 		})