调整选用试卷试题栏

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

@@ -17,6 +17,7 @@ import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
 import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import SiderBar from "../tpm/SiderBar";
+
 class Question extends Component {
 	constructor(props) {
 		super(props);
@@ -42,9 +43,17 @@ class Question extends Component {
 			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,
 		}
 
 	}
+
 	//初始化
 	componentDidMount() {
 		let {defaultActiveKey} = this.state;
@@ -54,9 +63,7 @@ class Question extends Component {
 		this.getdata(data);
 
 		let url = `/users/get_navigation_info.json`;
-		axios.get(url, {
+		axios.get(url, {}).then((response) => {
-
-		}).then((response) => {
 			// //console.log("开始请求/get_navigation_info.json");
 			// //console.log(response);
 			if (response != undefined) {
@@ -158,7 +165,6 @@ class Question extends Component {
 	};
 
 
-
 	modalCancel = () => {
 		this.setState({
 			modalsType: false
@@ -308,20 +314,32 @@ class Question extends Component {
 	getbasket_listdata = () => {
 		// 获取试题篮展开的数据
 		const url = "/item_baskets/basket_list.json";
-		axios.post(url)
+		axios.get(url)
 			.then((result) => {
 				if (result.data.status == 0) {
 					console.log("getbasket_listdata");
 					console.log(result.data);
 					this.setState({
-						basket_list:result.data,
+						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({
-				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,
 			})
 		})
 
@@ -329,10 +347,23 @@ class Question extends Component {
 
 
 	render() {
-		let {page,limit,count,Headertop,visible,placement,modalsType,basket_list}=this.state;
+		let {
+			page, limit, count, Headertop, visible, placement, modalsType, basket_list,
+			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
+			program_questions_count, single_questions_count, subjective_questions_count
+		} = 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}>
-				<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={()=>this.modalCancel()} setDownload={()=>this.setDownload()}></QuestionModal>
+				<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
+											 setDownload={() => this.setDownload()}></QuestionModal>
 				<SiderBar
 					{...this.props}
 					{...this.state}
@@ -382,20 +413,88 @@ class Question extends Component {
 					onClose={() => this.onClose()}
 					visible={visible}
 				>
-					{
+
-						basket_list&&basket_list.length===0?
+					{Datacount && Datacount > 0 ?
-							<div className="drawernonedatadiv intermediatecenter">
-								<NoneData></NoneData>
-							</div>
-							:
 						<div>
 							<div className="mt25 mb26">
 								<Input placeholder="未命名试卷"/>
 							</div>
+							{
+								single_questions_count === 0 ?
+									""
+									: <div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">单选题{'('}{single_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
+							{
+								multiple_questions_count === 0 ?
+									""
+									:
+									<div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">多选题{'('}{multiple_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
+							{
+								judgement_questions_count === 0 ?
+									""
+									:
+									<div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">判断题{'('}{judgement_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
+							{
+								completion_questions_count === 0 ?
+									""
+									:
+									<div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">填空题{'('}{completion_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
+							{
+								subjective_questions_count === 0 ?
+									""
+									:
+									<div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">简答题{'('}{subjective_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
+							{
+								practical_questions_count === 0 ?
+									""
+									:
 									<div className="sortinxdirection">
-									<p className="w50s intermediatecenterysls sortinxdirection font-14">单选题</p>
+										<p
-									<p className="w50s intermediatecenterysls xaxisreverseorder"><i className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="w50s intermediatecenterysls sortinxdirection font-14">实训题{'('}{practical_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
 									</div>
+							}
+							{
+								program_questions_count === 0 ?
+									""
+									:
+									<div className="sortinxdirection">
+										<p
+											className="w50s intermediatecenterysls sortinxdirection font-14">编程题{'('}{program_questions_count}{')'}</p>
+										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+									</div>
+							}
 
 							<div className="intermediatecenter verticallayout mt42">
 								<div className="drawerbutton">
@@ -403,7 +502,13 @@ class Question extends Component {
 								</div>
 							</div>
 						</div>
+						:
+						<div className="drawernonedatadiv intermediatecenter">
+							<NoneData></NoneData>
+						</div>
 					}
+
+
 				</Drawer>
 
 
@@ -413,6 +518,7 @@ class Question extends Component {
 	}
 
 
-
 }
+
 export default SnackbarHOC()(TPMIndexHOC(Question));
+