调整题库

yslnewtiku
杨树林 6 years ago
parent 97c79f24e4
commit 4954d244b4

@ -24,7 +24,7 @@ class Question extends Component {
super(props); super(props);
this.state = { this.state = {
count: 50, count: 50,
defaultActiveKey: 0, defaultActiveKey:"0",
Headertop: "", Headertop: "",
Footerdown: "", Footerdown: "",
visible: false, visible: false,
@ -57,17 +57,22 @@ class Question extends Component {
discipline_id:null, discipline_id:null,
sub_discipline_id:null, sub_discipline_id:null,
tag_discipline_id:null, tag_discipline_id:null,
booljupyterurls:false,
disciplinesdatakc:0,
disciplinesdatazsd:0,
} }
} }
setdiscipline_id=(discipline_id)=>{ setdiscipline_id=(discipline_id)=>{
this.setState({ this.setState({
discipline_id:discipline_id discipline_id:discipline_id,
sub_discipline_id:null,
tag_discipline_id:null
}) })
var data = { var data = {
discipline_id:discipline_id, discipline_id:discipline_id,
sub_discipline_id:this.state.sub_discipline_id, sub_discipline_id:null,
tag_discipline_id:this.state.tag_discipline_id, tag_discipline_id:null,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty, difficulty: this.state.difficulty,
item_type: this.state.item_type, item_type: this.state.item_type,
@ -81,12 +86,13 @@ class Question extends Component {
setsub_discipline_id=(sub_discipline_id)=>{ setsub_discipline_id=(sub_discipline_id)=>{
this.setState({ this.setState({
sub_discipline_id:sub_discipline_id sub_discipline_id:sub_discipline_id,
tag_discipline_id:null
}) })
var data = { var data = {
discipline_id:this.state.discipline_id, discipline_id:this.state.discipline_id,
sub_discipline_id:sub_discipline_id, sub_discipline_id:sub_discipline_id,
tag_discipline_id:this.state.tag_discipline_id, tag_discipline_id:null,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty, difficulty: this.state.difficulty,
item_type: this.state.item_type, item_type: this.state.item_type,
@ -155,6 +161,33 @@ class Question extends Component {
this.setState({ this.setState({
disciplinesdata: response.data.disciplines, 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) => { getdata = (data) => {
const url = `/item_banks.json`; const url = `/item_banks.json`;
this.setState({
booljupyterurls:true,
})
axios.get((url), {params: data}).then((response) => { axios.get((url), {params: data}).then((response) => {
setTimeout(()=>{
this.setState({
booljupyterurls:false,
})
},1000);
if (response === null || response === undefined) { if (response === null || response === undefined) {
return return
@ -197,7 +238,9 @@ class Question extends Component {
}) })
}).catch((error) => { }).catch((error) => {
////console.log(error) ////console.log(error)
this.setState({
booljupyterurls:false,
})
}); });
} }

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

@ -24,7 +24,6 @@ class Headplugselection extends Component {
//初始化 //初始化
componentDidMount(){ componentDidMount(){
} }
// //
// setdiscipline_id={(e)=>this.setdiscipline_id(e)} // setdiscipline_id={(e)=>this.setdiscipline_id(e)}
@ -42,12 +41,9 @@ class Headplugselection extends Component {
}) })
if(name==="全部"){ if(name==="全部"){
this.props.setdiscipline_id(null); this.props.setdiscipline_id(null);
this.props.setsub_discipline_id(null);
this.props.settag_discipline_id(null);
}else{ }else{
this.props.setdiscipline_id(id); 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, titlesttingss:null,
}) })
this.props.setsub_discipline_id(id); this.props.setsub_discipline_id(id);
this.props.settag_discipline_id(null);
} }
settitlesttingss=(name,id)=>{ settitlesttingss=(name,id)=>{
@ -84,9 +79,11 @@ class Headplugselection extends Component {
let {page,titlestting,titlesttings,titlesttingss}=this.state; let {page,titlestting,titlesttings,titlesttingss}=this.state;
// console.log("Headplugselection"); // console.log("Headplugselection");
// console.log(this.props.disciplinesdata); // console.log(this.props.disciplinesdata);
// disciplinesdatakc:kc,
// disciplinesdatazsd:zsd,
return ( return (
<div className=" clearfix mt21 "> <div className=" clearfix mt21 ">
<div className="educontent w1200"> <div className="educontent w1200dbl">
<div className="clearfix edu-back-white tophoms"> <div className="clearfix edu-back-white tophoms">
{/*课程*/} {/*课程*/}
@ -107,95 +104,79 @@ class Headplugselection extends Component {
})} })}
</div> </div>
</div> </div>
{/*课程*/} {/*课程*/}
<div className="mt30 sortinxdirection"> {
<div className="w60 tophomsembolds"> this.props.disciplinesdatakc===0?
课程 ""
</div> :
<div className="sortinxdirection minleng40"> <div className="mt30 sortinxdirection">
<div className="w60 tophomsembolds">
课程
</div>
<div className="sortinxdirection minleng40">
{this.props.disciplinesdata&&this.props.disciplinesdata.map((objectn, index) => { {this.props.disciplinesdata&&this.props.disciplinesdata.map((objectn, index) => {
return (
titlestting==="全部"?
objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
return ( return (
<div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou" titlestting==="全部"?
objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}> return (
{object.name} <div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou"
</div>
)
})
:
objectn.name===titlestting?
objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
return (
<div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou"
:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}>
{object.name}
</div>
)
})
: ""
)
})}
</div>
</div>
:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}>
{object.name}
</div>
)
})
:
objectn.name===titlestting?
objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
return (
<div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou"
:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}>
{object.name}
</div>
)
})
: ""
)
})}
</div>
</div>
}
{/*知识点*/} {/*知识点*/}
<div className="mt30 sortinxdirection"> {
<div className="w60 tophomsembolds"> this.props.disciplinesdatazsd===0?
知识点 ""
</div> :<div className="mt30 sortinxdirection">
<div className="w60 tophomsembolds">
知识点
</div>
<div className="sortinxdirection minleng40"> <div className="sortinxdirection minleng40">
{this.props.disciplinesdata&&this.props.disciplinesdata.map((objecta, index) => { {this.props.disciplinesdata&&this.props.disciplinesdata.map((objecta, index) => {
return ( return (
titlestting==="全部"&&titlesttings===null? titlestting==="全部"&&titlesttings===null?
objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => { objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
return (
objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
return (
<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
{object.name}
</div>
)
})
)
})
:titlestting==="全部"&&titlesttings!==null?
objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
return (
titlesttings===objectb.name?
objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
return ( return (
<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou": objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou" return (
:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}> <div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
{object.name} index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
</div> :titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
{object.name}
</div>
)
})
) )
}):"" })
) :titlestting==="全部"&&titlesttings!==null?
})
: titlestting!=="全部"&&titlesttings!==null?
titlestting===objecta.name?
objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => { objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
return ( return (
titlesttings===objectb.name? titlesttings===objectb.name?
@ -210,39 +191,51 @@ class Headplugselection extends Component {
}):"" }):""
) )
}) })
:"" : titlestting!=="全部"&&titlesttings!==null?
: titlestting!=="全部"&&titlesttings===null? titlestting===objecta.name?
titlestting===objecta.name? objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => { return (
return ( titlesttings===objectb.name?
objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => { objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
return ( return (
<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou": <div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou" index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}> :titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
{object.name} {object.name}
</div> </div>
) )
}) }):""
) )
}) })
:"" :""
:"" : titlestting!=="全部"&&titlesttings===null?
) titlestting===objecta.name?
})} objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
return (
objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
return (
<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
{object.name}
</div>
)
})
)
})
:""
:""
)
})}
</div> </div>
</div> </div>
</div> }
</div> </div>
</div>
</div> </div>
) )

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

@ -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;

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

Loading…
Cancel
Save