From a15a2f51c7064c9f3ef582c515f0b5b11aee4d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 7 Jan 2020 16:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=20=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E9=80=89=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/question/NewMyShixunModel.js  | 919 ++++++++++++++++++
 .../modules/question/component/Contentpart.js |   2 +-
 .../modules/question/component/Listjihe.js    |  19 +-
 .../question/questioncss/questioncom.css      |  14 +
 .../modules/testpaper/Paperlibraryeditid.js   |  45 +-
 .../testpaper/component/Seeoagertits.js       |   2 +-
 public/react/src/modules/tpm/NewHeader.js     |  22 +-
 7 files changed, 997 insertions(+), 26 deletions(-)
 create mode 100644 public/react/src/modules/question/NewMyShixunModel.js

diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js
new file mode 100644
index 000000000..e8acf2202
--- /dev/null
+++ b/public/react/src/modules/question/NewMyShixunModel.js
@@ -0,0 +1,919 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import axios from 'axios';
+import {
+	notification,
+	Spin,
+	Table,
+	Pagination,
+	Drawer,
+	Input,
+	Tooltip
+} from "antd";
+import {parabola} from './animation/parabola'
+import Headplugselections from "./component/Headplugselections";
+import QuestionModal from "./component/QuestionModal";
+import QuestionModals from "./component/QuestionModals";
+import Contentpart from "./component/Contentpart";
+import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
+import NoneData from './component/NoneData';
+import './questioncss/questioncom.css';
+import Bottomsubmit from "../modals/Bottomsubmit";
+
+//exam_id 试卷的id
+class NewMyShixunModel extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			count: 50,
+			defaultActiveKey:"0",
+			Headertop: "",
+			Footerdown: "",
+			visible: false,
+			placement: 'right',
+			modalsType: false,
+			modalsTypes:false,
+			titilesm: "设为公开后，所有成员均可使用试题",
+			titiless: "是否设置为公开？",
+			titilesms:"单选题",
+			titbool: false,
+			Contentdata: [],
+			difficulty: null,
+			visiblemys: false,
+			visiblemyss: false,
+			item_type: null,
+			keyword: null,
+			timuid: null,
+			items_count: 0,
+			basket_list: [],
+			completion_questions_count: 0,
+			judgement_questions_count: 0,
+			multiple_questions_count: 0,
+			practical_questions_count: 0,
+			program_questions_count: 0,
+			single_questions_count: 0,
+			subjective_questions_count: 0,
+			page:1,
+			per_page:10,
+			disciplinesdata:[],
+			discipline_id:null,
+			sub_discipline_id:null,
+			tag_discipline_id:null,
+			booljupyterurls:false,
+			disciplinesdatakc:0,
+			disciplinesdatazsd:0,
+			selectallquestionsonthispages:false,
+			oj_status:null,
+			isVisible: false,
+			selectionbools:false,
+		}
+
+	}
+	setdiscipline_id=(discipline_id)=>{
+		this.setState({
+			discipline_id:discipline_id,
+			sub_discipline_id:null,
+			tag_discipline_id:null,
+			keywords:"",
+			page:1,
+			per_page:10,
+			oj_status:null
+		})
+		var data = {
+			discipline_id:discipline_id,
+			sub_discipline_id:null,
+			tag_discipline_id:null,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords: null,
+			page: this.state.page,
+			per_page:10,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+
+	}
+
+	setsub_discipline_id=(sub_discipline_id)=>{
+		this.setState({
+			sub_discipline_id:sub_discipline_id,
+			tag_discipline_id:null,
+			keywords:"",
+			page:1,
+			per_page:10,
+			oj_status:null
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:sub_discipline_id,
+			tag_discipline_id:null,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords:null,
+			page: 1,
+			per_page:10,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+	}
+
+	settag_discipline_id=(tag_discipline_id)=>{
+		this.setState({
+			tag_discipline_id:tag_discipline_id,
+			keywords:"",
+			page:1,
+			per_page:10,
+			oj_status:null
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords: null,
+			page: 1,
+			per_page:10,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+	}
+
+	//初始化
+	componentDidMount() {
+		let {defaultActiveKey} = this.state;
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: defaultActiveKey,
+			page:1,
+			per_page:10,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+
+		let url = `/users/get_navigation_info.json`;
+		axios.get(url, {}).then((response) => {
+			// ////console.log("开始请求/get_navigation_info.json");
+			// ////console.log(response);
+			if (response != undefined) {
+				if (response.status === 200) {
+					this.setState({
+						Headertop: response.data.top,
+						Footerdown: response.data.down
+					})
+				}
+			}
+		});
+
+		this.getbasket_listdata();
+
+		//获取题库筛选资料
+		let urls = `/disciplines.json`;
+		axios.get(urls, {params: {
+				source:"question"
+			}}).then((response) => {
+			console.log("Questiondisciplines");
+			console.log(response.data);
+			if (response) {
+				this.setState({
+					disciplinesdata: response.data.disciplines,
+				})
+			}
+		});
+	}
+	//公共和我的
+	callback = (key) => {
+		this.setState({
+			defaultActiveKey: key,
+			selectallquestionsonthispages:false,
+			difficulty:null,
+			page:1,
+			oj_status:null
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: key,
+			item_type: this.state.item_type,
+			difficulty: null,
+			page: 1,
+			per_page:10,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+
+	}
+
+	//刷新加载
+	getdata = (data) => {
+		const url = `/item_banks.json`;
+		this.setState({
+			booljupyterurls:true,
+			selectionbools:false,
+		})
+		axios.get((url), {params: data}).then((response) => {
+			setTimeout(()=>{
+				this.setState({
+					booljupyterurls:false,
+				})
+			},1000);
+			if (response === null || response === undefined) {
+
+				return
+			}
+			if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
+
+			} else {
+
+			}
+			////console.log("item_banks");
+			////console.log(response);
+			this.setState({
+				Contentdata: response.data,
+				items_count: response.data.items_count,
+			})
+			this.getdataslen(response.data.items);
+		}).catch((error) => {
+			////console.log(error)
+			this.setState({
+				booljupyterurls:false,
+			})
+		});
+	}
+
+	//不刷新加载
+	getdatasy = (data) => {
+		const url = `/item_banks.json`;
+		this.setState({
+			selectionbools:false,
+		})
+		axios.get((url), {params: data}).then((response) => {
+			setTimeout(()=>{
+
+			},1000);
+			if (response === null || response === undefined) {
+
+				return
+			}
+			if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
+
+			} else {
+
+			}
+			////console.log("item_banks");
+			////console.log(response);
+			this.setState({
+				Contentdata: response.data,
+				items_count: response.data.items_count,
+
+			})
+
+			this.getdataslen(response.data.items);
+		}).catch((error) => {
+
+		});
+	}
+
+	//计算
+	getdataslen=(arr)=>{
+		var contes=0;
+		for(let data of arr) {
+			if(data.item_type==="PROGRAM"){
+				//编程题
+				if(data.choosed===true){
+
+				}else{
+					//未选用
+					if(data.program_attr.status===1){
+						//已发布
+						contes=contes+1;
+					}
+
+				}
+
+			}else{
+				//不是编程题
+				if(data.choosed===true){
+
+				}else{
+					//未选用
+					contes=contes+1;
+				}
+			}
+
+		}
+
+		if(contes>0){
+			this.setState({
+				selectionbools:false,
+				selectallquestionsonthispages:false,
+			})
+		}else {
+			this.setState({
+				selectionbools:true,
+				selectallquestionsonthispages:true,
+			})
+		}
+	}
+
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords: this.state.keywords,
+			page: pageNumber,
+			per_page:10,
+			oj_status:this.state.oj_status,
+			exam_id:this.props.exam_id
+
+		};
+		this.getdata(data);
+	}
+	showDrawer = () => {
+		if(this.state.visible===true){
+			this.setState({
+				visible: false,
+			});
+		}else{
+			this.setState({
+				visible: true,
+			});
+			this.getbasket_listdata();
+		}
+
+
+
+	};
+
+	onClose = () => {
+		this.setState({
+			visible: false,
+		});
+	};
+
+	onChange = e => {
+		this.setState({
+			placement: e.target.value,
+		});
+	};
+
+	getContainer = () => {
+		return this.container;
+	};
+	saveContainer = container => {
+		this.container = container;
+	};
+
+	showmodels = (id) => {
+
+		this.setState({
+			modalsType: true,
+			titilesm: "设为公开后，所有成员均可使用试题",
+			titiless: "是否设置为公开？",
+			titbool: true,
+			timuid: id
+		})
+	};
+	showmodelysl = (id) => {
+		this.setState({
+			modalsType: true,
+			titilesm: "确认删除后，无法撤销",
+			titiless: "是否确认删除？",
+			titbool: false,
+			timuid: id
+		})
+	};
+
+
+	modalCancel = () => {
+		this.setState({
+			modalsType: false
+		})
+	}
+	modalCancels=()=>{
+		this.setState({
+			modalsTypes: false
+		})
+	}
+	showQuestionModals =(item_type)=>{
+		this.setState({
+			modalsTypes: true,
+			titilesms:item_type,
+		})
+
+	}
+	setDownloads=(item_type)=>{
+		this.Deletebigquestiontype(item_type);
+		this.setState({
+			modalsTypes: false
+		})
+	}
+	setDownload = () => {
+		//确认
+		if (this.state.titbool === true) {
+			//公开
+			this.publicopentimu(this.state.timuid);
+		} else {
+			// 删除
+			this.deletetimu(this.state.timuid);
+		}
+		this.setState({
+			modalsType: false
+		})
+	}
+
+	setdifficulty = (difficulty) => {
+		this.setState({
+			difficulty: difficulty,
+			visiblemys: false,
+			page: 1,
+			per_page:10,
+			keywords:"",
+			oj_status:null
+		})
+
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: difficulty,
+			item_type: this.state.item_type,
+			keywords:null,
+			page:1,
+			per_page:10,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+
+		this.getdata(data);
+
+	}
+	setitem_types = (item_type) => {
+		this.setState({
+			item_type: item_type,
+			visiblemyss: false,
+			page: 1,
+			per_page:10,
+			keywords:"",
+			oj_status:null
+		})
+
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: item_type,
+			page: 1,
+			per_page:10,
+			keywords:null,
+			oj_status:null,
+			exam_id:this.props.exam_id
+		};
+
+		this.getdata(data);
+	}
+
+	handleVisibleChange = (boll) => {
+		if (this.state.visiblemyss === true) {
+			this.setState({
+				visiblemys: boll,
+				visiblemyss: false,
+			})
+		} else {
+			this.setState({
+				visiblemys: boll,
+			})
+		}
+
+	}
+
+	handleVisibleChanges = (boll) => {
+		if (this.state.visiblemys === true) {
+			this.setState({
+				visiblemyss: boll,
+				visiblemys: false,
+			})
+		} else {
+			this.setState({
+				visiblemyss: boll,
+			})
+		}
+
+	}
+
+	setdatafunsval = (e) => {
+		this.setState({
+			keywords: e.target.value
+		})
+	}
+
+	setdatafuns = (value) => {
+		this.setState({
+			keywords: value,
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords: value,
+			page: this.state.page,
+			per_page:10,
+			oj_status:this.state.oj_status,
+			exam_id:this.props.exam_id
+		};
+
+		this.getdata(data);
+	}
+
+	deletetimu = (id) => {
+
+		const url = `/item_banks/${id}.json`;
+		axios.delete(url)
+			.then((response) => {
+				if (response.data.status == 0) {
+					// this.props.showNotification('删除试题成功')
+					// props.history.push(response.data.right_url)
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keywords: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id
+					};
+					this.getdata(data);
+				}
+			})
+			.catch(function (error) {
+				//console.log(error);
+			});
+	}
+	publicopentimu = (id) => {
+
+		const url = `/item_banks/${id}/set_public.json`;
+		axios.post(url)
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`公开题目成功`);
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keywords: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id
+
+					};
+					this.getdata(data);
+				}
+			}).catch((error) => {
+			//console.log(error);
+		})
+	}
+
+	getbasket_listdata = () => {
+		// 获取试题篮展开的数据
+		// const url = "/item_baskets/basket_list.json";
+		// axios.get(url)
+		// 	.then((result) => {
+		// 		// //console.log("getbasket_listdata");
+		// 		// //console.log(result.data);
+		// 		this.setState({
+		// 			completion_questions_count: result.data.completion_questions_count,
+		// 			judgement_questions_count: result.data.judgement_questions_count,
+		// 			multiple_questions_count: result.data.multiple_questions_count,
+		// 			practical_questions_count: result.data.practical_questions_count,
+		// 			program_questions_count: result.data.program_questions_count,
+		// 			single_questions_count: result.data.single_questions_count,
+		// 			subjective_questions_count: result.data.subjective_questions_count,
+		// 		})
+		//
+		// 	}).catch((error) => {
+		// 	// //console.log(error);
+		// 	this.setState({
+		// 		completion_questions_count: 0,
+		// 		judgement_questions_count: 0,
+		// 		multiple_questions_count: 0,
+		// 		practical_questions_count: 0,
+		// 		program_questions_count: 0,
+		// 		single_questions_count: 0,
+		// 		subjective_questions_count: 0,
+		// 	})
+		// })
+
+	}
+
+
+	//选用
+	getitem_baskets=(data)=>{
+		//选用题型可以上传单个 或者多个题型
+		let url="/examination_items.json";
+
+		axios.post(url, data)
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`选用成功`);
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keywords: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id
+					};
+					this.getdatasy(data);
+					this.getbasket_listdata();
+					// this.setState({
+					// 	visible:true
+					// })
+				}
+			}).catch((error) => {
+			//console.log(error);
+		})
+	}
+	// 撤销
+	getitem_basketss=(id)=>{
+		//选用题型可以上传单个 或者多个题型
+		let url=`/examination_banks/${id}/revoke_item.json`;
+
+		axios.delete(url,{ data: {
+				item_id:this.props.exam_id
+				}})
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`撤销成功`);
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keywords: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id
+					};
+					this.getdatasy(data);
+					this.getbasket_listdata();
+				}
+			}).catch((error) => {
+			//console.log(error);
+		})
+	}
+	//全选试题库
+	selectallquestionsonthispage=()=>{
+		var item_idsdata=[];
+
+		var arr= this.state.Contentdata.items;
+		for(let data of arr) {
+			if(data.item_type==="PROGRAM"){
+				//编程题
+				if(data.choosed===true){
+
+				}else{
+					//未选用
+					if(data.program_attr.status===1){
+						//已发布
+						item_idsdata.push(data.id);
+					}
+
+				}
+
+			}else{
+				//不是编程题
+				if(data.choosed===true){
+
+				}else{
+					//未选用
+					item_idsdata.push(data.id);
+				}
+			}
+
+		}
+		const data={
+			item_ids:item_idsdata,
+			exam_id:this.props.exam_id
+		}
+		this.getitem_baskets(data);
+		this.setState({
+			selectallquestionsonthispages:true,
+		})
+	}
+
+	//全选的状态
+
+	//删除大题型
+	Deletebigquestiontype =(item_type)=>{
+		const  url=`/item_baskets/delete_item_type.json`;
+		axios.delete((url), { data: {
+					item_type:item_type
+				}})
+			.then((response) => {
+				if (response.data.status == 0) {
+					// this.props.showNotification('删除成功');
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keywords: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id
+					};
+					this.getdata(data);
+					this.getbasket_listdata();
+				}
+			})
+			.catch(function (error) {
+				//console.log(error);
+			});
+
+	}
+
+
+	//跳转
+	gotopaperreview=()=>{
+
+		this.props.history.replace("/paperreview");
+
+	}
+
+	setoj_status=(oj_status)=>{
+		//编程题发布未发布
+		this.setState({
+			selectallquestionsonthispages:false,
+			difficulty:null,
+			oj_status:oj_status
+		})
+		var data = {
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			item_type: this.state.item_type,
+			keywords: this.state.keywords,
+			page: this.state.page,
+			per_page:10,
+			oj_status:oj_status,
+			exam_id:this.props.exam_id
+		};
+		this.getdata(data);
+	}
+
+
+	render() {
+		let {
+			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes,basket_list,
+			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
+			program_questions_count, single_questions_count, subjective_questions_count,selectionbools
+		} = this.state;
+
+		const Datacount = completion_questions_count + judgement_questions_count
+			+ multiple_questions_count + practical_questions_count
+			+ program_questions_count
+			+ single_questions_count
+			+ subjective_questions_count;
+
+		return (
+			<div className="newMain clearfix "    ref={this.saveContainer}>
+
+
+				{
+					visible===true?
+						<style>
+							{
+								`
+						.newHeaders{
+						position: fixed;
+						top: 0px;
+						z-index:  999 !important;
+						}
+						.ant-drawer {
+								z-index: 800 !important;
+						}
+						.ant-notification{
+						position: fixed;
+						z-index: 1500 !important;
+						}
+						.newFooter{
+						 position: relative;
+							z-index: 9999999 ;
+						}
+						`
+							}
+						</style>
+						:""
+				}
+				{
+					visible===true?
+						<div
+							style={{
+								marginTop: "60px"
+							}}></div>
+						:""}
+				{
+					modalsTypes===true?
+						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}
+														setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
+						:""
+				}
+				{
+					modalsType===true?
+						<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
+													 setDownload={() => this.setDownload()}></QuestionModal>
+						:""
+				}
+
+				{/*顶部*/}
+
+				<Headplugselections
+					disciplinesdata={this.state.disciplinesdata}
+					{...this.props}
+					{...this.state}
+					setdifficulty={(e) => this.setdifficulty(e)}
+					setitem_types={(e) => this.setitem_types(e)}
+					setdiscipline_id={(e)=>this.setdiscipline_id(e)}
+					setsub_discipline_id={(e)=>this.setsub_discipline_id(e)}
+					settag_discipline_id={(e)=>this.settag_discipline_id(e)}
+				/>
+				{/*头部*/}
+				<Contentpart {...this.state} {...this.props}
+										 exam_id={this.props.exam_id}
+										 getitem_basketss={(id)=>this.getitem_basketss(id)}
+										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
+										 getitem_baskets={(e)=>this.getitem_baskets(e)}
+										 setdatafuns={(e) => this.setdatafuns(e)}
+										 setdatafunsval={(e) => this.setdatafunsval(e)}
+										 handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
+										 handleVisibleChange={(e) => this.handleVisibleChange(e)}
+										 showmodels={(e) => this.showmodels(e)}
+										 showmodelysl={(e) => this.showmodelysl(e)}
+										 callback={(e) => this.callback(e)}
+										 setoj_status={(e)=>this.setoj_status(e)}></Contentpart>
+
+				{
+					items_count&&items_count>10?
+						<div className="mb30 clearfix educontent mt40 intermediatecenter">
+							<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+													pageSize={per_page}
+													total={items_count}></Pagination>
+						</div>
+						:<div className="h30 clearfix educontent mt40 intermediatecenter">
+
+						</div>
+				}
+
+
+				<Bottomsubmit {...this.props} {...this.state} bottomvalue={"确定"}
+											Cohetepaperbool={true}
+											setCohetepaperbool={() => this.props.setnewmyshixunmodelbool(false)}
+											onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}></Bottomsubmit>
+			</div>
+		)
+
+	}
+
+}
+
+export default NewMyShixunModel;
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 6cca91f93..ee5b49e6b 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -132,7 +132,7 @@ class Contentpart extends Component {
 									}
 									
 									.xaxisreverseorder .ant-input-lg {
-    height: 41px;}
+    height: 41px !important;}
                  
                   .xaxisreverseorder .ant-popover{
                        top: 30px !important;
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index 0b1f012f5..986e6e08f 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -37,9 +37,18 @@ class Listjihe extends Component {
 
 	//选用
 	Selectingpracticaltraining=(id)=>{
-		let data={
-			item_ids:[id]
-		}
+		let data={}
+			if(this.props.exam_id===undefined){
+		    data={
+				item_ids:[id]
+			}
+		  }else{
+			 data={
+				item_ids:[id],
+				exam_id:this.props.exam_id
+			}
+		  }
+
 		this.props.getitem_baskets(data);
 	}
 	//撤销
@@ -184,8 +193,8 @@ class Listjihe extends Component {
 						{
 							items.choosed===true?
 								<p className="selectionss  xiaoshou" onClick={()=>this.Selectingpracticaltrainings(items.id)}>
-									<i className="iconfont icon-jianhao font-12 lg ml7 lh30 icontianjiadaohangcolor mr10"></i>
-									<span>撤销</span></p>
+									<i className="iconfont icon-jianhao font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
+									<span className="mr15 lh30">撤销</span></p>
 								:
 								items.item_type==="PROGRAM"?
 									items.program_attr.status===0?
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index 4bf767b0f..c117ce20a 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -922,3 +922,17 @@
 .mr15{
     margin-right: 15px;
 }
+.fangdatwo{
+    background: #fefefe;
+    background-color: #fefefe;
+    height: 100%;
+    overflow-y: scroll !important;
+    width: 100%;
+    margin-top: 60px !important;
+    position: fixed;
+    top:0px;
+    bottom: 0px;
+    left: 0px;
+    z-index: 999999;
+    right: 0px;
+}
diff --git a/public/react/src/modules/testpaper/Paperlibraryeditid.js b/public/react/src/modules/testpaper/Paperlibraryeditid.js
index 1497a12ec..4845ba757 100644
--- a/public/react/src/modules/testpaper/Paperlibraryeditid.js
+++ b/public/react/src/modules/testpaper/Paperlibraryeditid.js
@@ -22,7 +22,7 @@ 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"
 //人工组卷预览
 class Paperlibraryeditid extends Component {
 	constructor(props) {
@@ -33,7 +33,8 @@ class Paperlibraryeditid extends Component {
 			disciplinesdata: [],
 			knowledgepoints: [],
 			disciplmy: [],
-			item_banksedit: []
+			item_banksedit: [],
+			newmyshixunmodelbool:false,
 		}
 
 
@@ -185,14 +186,39 @@ class Paperlibraryeditid extends Component {
 		this.contentMdRef = Ref;
 	}
 
+	setnewmyshixunmodelbool=(bool)=>{
+		this.setState({
+			newmyshixunmodelbool:bool
+		})
+	}
+
 	render() {
-		let {paperlibrartdata} = this.state;
+		let {paperlibrartdata,newmyshixunmodelbool} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
-		// //console.log(params);
+	// console.log("newmyshixunmodelbool");
+	// console.log(newmyshixunmodelbool);
 		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>
 						{
@@ -221,6 +247,7 @@ class Paperlibraryeditid extends Component {
 						<div className=" clearfix  educontent Contentquestionbankstyle w100s w1200wuh mt19">
 
 							<Seeoagertits
+								setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}
 								all_score={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_questions_count}
 								all_questions_count={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_score}
 								difficulty={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.difficulty}
@@ -253,10 +280,12 @@ class Paperlibraryeditid extends Component {
 
 
 				</div>
-
-				<Bottomsubmit {...this.props} {...this.state} bottomvalue={"保存"}
-											setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
-											onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
+				{
+					newmyshixunmodelbool === true ? "" :
+						<Bottomsubmit {...this.props} {...this.state} bottomvalue={"保存"}
+													setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
+													onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
+				}
 			</div>
 		)
 
diff --git a/public/react/src/modules/testpaper/component/Seeoagertits.js b/public/react/src/modules/testpaper/component/Seeoagertits.js
index 1c2b596bf..a983bd67e 100644
--- a/public/react/src/modules/testpaper/component/Seeoagertits.js
+++ b/public/react/src/modules/testpaper/component/Seeoagertits.js
@@ -48,7 +48,7 @@ class Seeoagertit extends Component {
 
 					</div>
 					<div className="w30s xaxisreverseorder">
-						<div className="jixuxuanti xiaoshou" onClick={() => this.jixuxuantioncli()}>
+						<div className="jixuxuanti xiaoshou" onClick={() => this.props.setnewmyshixunmodelbool(true)}>
 							继续选题
 						</div>
 					</div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 6e27f9591..0e4ea3073 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1039,17 +1039,17 @@ submittojoinclass=(value)=>{
 												`
 											}
 										</style>
-										{/*<li className={`pr `}>*/}
-										{/*	<Popover   placement="bottom"  content={contents} trigger="click" >*/}
-										{/*		<div className=" sortinxdirection mr10">*/}
-										{/*			<div style={{*/}
-										{/*				color:"#fff"*/}
-										{/*			}}>*/}
-										{/*				题库*/}
-										{/*			</div>*/}
-										{/*		</div>*/}
-										{/*	</Popover>*/}
-										{/*</li>*/}
+										<li className={`pr `}>
+											<Popover   placement="bottom"  content={contents} trigger="click" >
+												<div className=" sortinxdirection mr10">
+													<div style={{
+														color:"#fff"
+													}}>
+														题库
+													</div>
+												</div>
+											</Popover>
+										</li>
 
 										<li
 											style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}}