调整题库

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

@@ -24,7 +24,7 @@ class Question extends Component {
 		super(props);
 		this.state = {
 			count: 50,
-			defaultActiveKey: 0,
+			defaultActiveKey:"0",
 			Headertop: "",
 			Footerdown: "",
 			visible: false,
@@ -57,17 +57,22 @@ class Question extends Component {
 			discipline_id:null,
 			sub_discipline_id:null,
 			tag_discipline_id:null,
+			booljupyterurls:false,
+			disciplinesdatakc:0,
+			disciplinesdatazsd:0,
 		}
 
 	}
 	setdiscipline_id=(discipline_id)=>{
 		this.setState({
-			discipline_id:discipline_id
+			discipline_id:discipline_id,
+			sub_discipline_id:null,
+			tag_discipline_id:null
 		})
 		var data = {
 			discipline_id:discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			sub_discipline_id:null,
+			tag_discipline_id:null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
@@ -81,12 +86,13 @@ class Question extends Component {
 
 	setsub_discipline_id=(sub_discipline_id)=>{
 		this.setState({
-			sub_discipline_id:sub_discipline_id
+			sub_discipline_id:sub_discipline_id,
+			tag_discipline_id:null
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
 			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			tag_discipline_id:null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
@@ -155,6 +161,33 @@ class Question extends Component {
 					this.setState({
 						disciplinesdata: response.data.disciplines,
 					})
+				const didata = response.data.disciplines;
+        var kc=0;
+				var zsd=0;
+
+				for (var i = 0; i < didata.length; i++) {
+					//方向
+					const fxdidata = didata[i].sub_disciplines;
+					for (var j = 0; j < fxdidata.length; j++) {
+						kc=kc+1;
+						//课程
+						const zsddata = fxdidata[j].tag_disciplines;
+						for (var k = 0; k < zsddata.length; k++) {
+							//知识点
+							zsd=zsd+1;
+
+						}
+					}
+
+
+				}
+
+				this.setState({
+					disciplinesdata: response.data.disciplines,
+					disciplinesdatakc:kc,
+					disciplinesdatazsd:zsd,
+				})
+
 			}
 		});
 	}
@@ -179,7 +212,15 @@ class Question extends Component {
 
 	getdata = (data) => {
 		const url = `/item_banks.json`;
+		this.setState({
+			booljupyterurls:true,
+		})
 		axios.get((url), {params: data}).then((response) => {
+			setTimeout(()=>{
+				this.setState({
+					booljupyterurls:false,
+				})
+			},1000);
 			if (response === null || response === undefined) {
 
 				return
@@ -197,7 +238,9 @@ class Question extends Component {
 			})
 		}).catch((error) => {
 			////console.log(error)
-
+			this.setState({
+				booljupyterurls:false,
+			})
 		});
 	}
 

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

@@ -12,6 +12,8 @@ import {
 	Popover
 } from "antd";
 import './../questioncss/questioncom.css';
+import NoneDatas from '../component/NoneDatas';
+import LoadingSpin from '../../../common/LoadingSpin';
 import Contentquestionbank from "./Contentquestionbank";
 import Listjihe from "./Listjihe";
 const { TabPane } = Tabs;
@@ -165,6 +167,10 @@ class Contentpart extends Component {
 						</div>
 					</div>
 					{/*内容*/}
+					{
+						this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0 ?
+							<div className=" w100s mb10"></div>
+							:
 							<div className=" w100s mb10">
 								{
 									defaultActiveKey===1||defaultActiveKey==="1"?
@@ -177,9 +183,20 @@ class Contentpart extends Component {
 										:""
 								}
 							</div>
+					}
+
+					<div className="minheight">
 					{/*列表集合*/}
 					<div className=" w100s">
-						{this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null? "" : this.props.Contentdata.items.map((object, index) => {
+						{
+							this.props.booljupyterurls===true?
+								<LoadingSpin></LoadingSpin>
+								:
+							this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0?
+							 <NoneDatas></NoneDatas>
+
+
+							: this.props.Contentdata.items.map((object, index) => {
 							return (
 								<Listjihe {...this.state} {...this.props} items={object}
 													getitem_basketss={(id)=>this.props.getitem_basketss(id)}
@@ -195,7 +212,7 @@ class Contentpart extends Component {
 
 					</div>
 
-
+					</div>
 
 
 

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

@@ -24,7 +24,6 @@ class Headplugselection extends Component {
 	//初始化
 	componentDidMount(){
 
-
 	}
 //
 // 	setdiscipline_id={(e)=>this.setdiscipline_id(e)}
@@ -42,12 +41,9 @@ class Headplugselection extends Component {
 		})
 		if(name==="全部"){
 			this.props.setdiscipline_id(null);
-			this.props.setsub_discipline_id(null);
-			this.props.settag_discipline_id(null);
+
 		}else{
 			this.props.setdiscipline_id(id);
-			this.props.setsub_discipline_id(null);
-			this.props.settag_discipline_id(null);
 		}
 
 
@@ -62,7 +58,6 @@ class Headplugselection extends Component {
 			titlesttingss:null,
 		})
 		this.props.setsub_discipline_id(id);
-		this.props.settag_discipline_id(null);
 	}
 
 	settitlesttingss=(name,id)=>{
@@ -84,9 +79,11 @@ class Headplugselection extends Component {
 		let {page,titlestting,titlesttings,titlesttingss}=this.state;
 		// console.log("Headplugselection");
 		// console.log(this.props.disciplinesdata);
+		// disciplinesdatakc:kc,
+		// 	disciplinesdatazsd:zsd,
 		return (
 			<div className=" clearfix mt21  ">
-				<div className="educontent w1200">
+				<div className="educontent w1200dbl">
 
 			<div className="clearfix edu-back-white    tophoms">
 				{/*课程*/}
@@ -107,11 +104,12 @@ class Headplugselection extends Component {
 					})}
 
 				</div>
-
 			</div>
-
-
       {/*课程*/}
+				{
+					this.props.disciplinesdatakc===0?
+						""
+						:
 						<div className="mt30 sortinxdirection">
 							<div className="w60  tophomsembolds">
 								课程：
@@ -149,13 +147,12 @@ class Headplugselection extends Component {
 
 
 						</div>
-
-
-
-
-
+				}
 				{/*知识点*/}
-				<div className="mt30 sortinxdirection">
+				{
+					this.props.disciplinesdatazsd===0?
+						""
+						:<div className="mt30 sortinxdirection">
 							<div className="w60  tophomsembolds">
 								知识点：
 							</div>
@@ -235,14 +232,10 @@ class Headplugselection extends Component {
 
 
 						</div>
-			</div>
-
+				}
 
 			</div>
-
-
-
-
+			</div>
 			</div>
 		)
 

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

@@ -127,7 +127,7 @@ class Itembankstop extends Component {
 				// ////console.log("获取的form 数据");
 				// ////console.log(values);
 				data.push({
-					rbnd:values.rbnd
+					rbnd:parseInt(values.rbnd)
 				})
 				data.push({
 					rbtx:values.rbtx

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

@@ -0,0 +1,36 @@
+import React, { Component } from 'react';
+import { getImageUrl , getUrl } from 'educoder';
+
+class NoneDatas extends Component{
+	constructor(props) {
+		super(props)
+	}
+	render(){
+		const { style } = this.props;
+		return(
+			<div className="edu-tab-con-box clearfix edu-txt-center intermediatecenter" style={ style || { width:"100%",height:"100%"}}>
+				<style>
+					{`
+            .edu-tab-con-box{
+              padding:100px 0px;
+            }
+            .ant-modal-body .edu-tab-con-box{
+              padding:0px!important;
+            }
+            img.edu-nodata-img{
+              margin: 40px auto 20px;
+            }
+            .zenwuxgsj{
+						font-size:17px;
+						font-family:MicrosoftYaHei;
+						color:rgba(136,136,136,1);
+            }
+          `}
+				</style>
+				<img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
+				<p className="edu-nodata-p mb10  zenwuxgsj">暂无相关数据</p>
+			</div>
+		)
+	}
+}
+export default NoneDatas;

public/react/src/modules/question/questioncss/questioncom.css

@@ -5,6 +5,14 @@
     box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
     border-radius:2px;
 }
+
+.w1200dbl{
+    width:1062px;
+    min-height:60px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
+    border-radius:2px;
+}
 .w1200fpx{
     width:1200px;
     background:rgba(255,255,255,1);
@@ -597,3 +605,7 @@
 .h30{
     min-height: 30px !important;
 }
+
+.minheight{
+    min-height: 500px !important;
+}