m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_aliyun2
杨树林 5 years ago committed by harry
parent cf5847d8aa
commit fda2cfee5d
7 changed files with 142 additions and 44 deletions
Show Stats Download Patch File Download Diff File

6
public/react/src/modules/question/Paperreview.js
Unescape View File

@ -355,9 +355,9 @@ class Paperreview extends Component {
</div> </div>
<Bottomsubmit {...this.props} {...this.state} bottomvalue={Cohetepaperbool === false ? "保存组卷" : "完成"} <Bottomsubmit {...this.props} {...this.state} bottomvalue={Cohetepaperbool===false?"保存组卷":"完成"}
setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)} setCohetepaperbool={(bool)=>this.setCohetepaperbool(bool)}
onSubmits={() => this.preservation()} url={'/question'}></Bottomsubmit> onSubmits={() => this.preservation()} url={ artificialtype==="artificial"?'/question':'/paperlibrary'}></Bottomsubmit>
</div> </div>
) )

2
public/react/src/modules/question/Questionitem_banks.js
Unescape View File

@ -457,7 +457,7 @@ class Questionitem_banks extends Component {
} }
if (this.state.item_type === "PROGRAM") { if (this.state.item_type === "PROGRAM") {
//编程题 跳转到 oj 中创建 //编程题 跳转到 oj 中创建
debugger // debugger
var myrbkc=[]; var myrbkc=[];
var Getdatasdatas=Getdatasdata[2].rbzsd; var Getdatasdatas=Getdatasdata[2].rbzsd;
for(let myda of Getdatasdatas) { for(let myda of Getdatasdatas) {

49
public/react/src/modules/question/component/Contentpart.js
Unescape View File

@ -37,17 +37,17 @@ class Contentpart extends Component {
this.props.chakanjiexibool(index); this.props.chakanjiexibool(index);
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (prevProps.current_user !== this.props.current_user) { if(prevProps.current_user !== this.props.current_user) {
debugger
const isysladmins = this.props && this.props.current_user && this.props.current_user.admin ? this.props.current_user.admin : false; const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
const is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false; const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false; const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
let { defaultActiveKey } = this.props; let {defaultActiveKey} = this.props;
var defaultActiveKeys = defaultActiveKey; var defaultActiveKeys=defaultActiveKey;
if (isysladmins === true || (is_teacher === true && professional_certification === true)) { if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
defaultActiveKeys = "0" defaultActiveKeys="0"
} else { }else{
defaultActiveKeys = "1" defaultActiveKeys="1"
} }
this.props.callback(defaultActiveKeys); this.props.callback(defaultActiveKeys);
} }
@ -95,11 +95,12 @@ class Contentpart extends Component {
} }
render() { render() {
let { page } = this.state; let {page}=this.state;
let { defaultActiveKey, item_type, booljupyterurls } = this.props; let {defaultActiveKey,item_type,booljupyterurls}=this.props;
const isysladmins = this.props && this.props.current_user && this.props.current_user.admin ? this.props.current_user.admin : false; const defaultActiveKeys=defaultActiveKey+'';
const is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false; const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false; const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
const content = ( const content = (
@ -165,15 +166,15 @@ class Contentpart extends Component {
{ {
isysladmins === true || (is_teacher === true && professional_certification === true) ? isysladmins===true||(is_teacher===true&&professional_certification===true)?
<Tabs activeKey={defaultActiveKey} onChange={(e) => this.props.callback(e)}> <Tabs activeKey={defaultActiveKeys} onChange={(e)=>this.props.callback(e)}>
<TabPane tab="公共" key="1"> <TabPane tab="公共" key="1">
</TabPane> </TabPane>
<TabPane tab="我的" key="0"> <TabPane tab="我的" key="0">
</TabPane> </TabPane>
</Tabs> </Tabs>
: :
<Tabs activeKey={1} onChange={(e) => this.props.callback(e)}> <Tabs activeKey={"1"} onChange={(e)=>this.props.callback(e)}>
<TabPane tab="公共" key="1"> <TabPane tab="公共" key="1">
</TabPane> </TabPane>
</Tabs> </Tabs>

29
public/react/src/modules/question/component/Headplugselections.js
Unescape View File

@ -80,10 +80,36 @@ class Headplugselections extends Component {
}catch (e) { }catch (e) {
} }
}
shixunserdchAlls=(itme,id)=>{
if(id!=undefined){
this.setState({
shixunsearchAllvalue:id,
})
try {
this.props.setdiscipline_id(id);
}catch (e) {
}
}
console.log(itme);
console.log(itme[0]);
if(itme!=undefined){
try {
this.props.setsub_discipline_id(id,itme[0].id);
}catch (e) {
}
}
} }
//获取方向 //获取方向
shixunsearchAll = (id) => { shixunsearchAll = (id) => {
//大写A
//console.log("获取方向"); //console.log("获取方向");
//console.log(id); //console.log(id);
if(id!=undefined){ if(id!=undefined){
@ -141,6 +167,7 @@ class Headplugselections extends Component {
} }
} }
} }
render() { render() {
let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state; let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state;
@ -233,7 +260,7 @@ class Headplugselections extends Component {
return( return(
item.sub_disciplines.length>0? item.sub_disciplines.length>0?
<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={ overlaymenu(item.sub_disciplines,item.id)} key={key} placement={item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}> <Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={ overlaymenu(item.sub_disciplines,item.id)} key={key} placement={item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
<li key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id} onClick={()=>this.shixunsearchAll(item.id)}> <li key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id} onClick={()=>this.shixunserdchAlls(item.sub_disciplines,item.id)}>
{item.name} {item.name}
</li> </li>
</Dropdown> </Dropdown>

67
public/react/src/modules/question/component/Newknledpots.js
Unescape View File

@ -9,7 +9,10 @@ class PaperDeletModel extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state={ this.state={
newkntypeinput:"" newkntypeinput:"",
errores:false,
errorestit:'',
addonAfteronelens3:0,
} }
} }
isNull=( str )=>{ isNull=( str )=>{
@ -28,12 +31,23 @@ class PaperDeletModel extends Component {
// }) // })
// //console.log(e.target.value); // //console.log(e.target.value);
// //console.log(e.target.value.length); // //console.log(e.target.value.length);
if(this.isNull(e.target.value)===true){ if(this.isNull(e.target.value)===true){
this.props.showNotification('不能输入空格'); this.props.showNotification('不能输入空格');
this.setState({
errorestit:'不能输入空格',
errores:true,
boolred:true,
})
return return
} }
this.setState({ this.setState({
newkntypeinput: e.target.value newkntypeinput: e.target.value,
addonAfteronelens3:e.target.value.length,
errorestit:'',
errores:false,
boolred:false,
}) })
this.props.setboolred(false); this.props.setboolred(false);
// //
@ -48,7 +62,8 @@ class PaperDeletModel extends Component {
// }) // })
// } // }
// } // }
} };
mysinputOnBlur=(e)=>{ mysinputOnBlur=(e)=>{
//console.log("失去焦点了"); //console.log("失去焦点了");
} }
@ -57,8 +72,28 @@ class PaperDeletModel extends Component {
//console.log("获取焦点"); //console.log("获取焦点");
} }
NewknTypedeltyoedels=()=>{
debugger
if(this.state.newkntypeinput.length===0){
this.setState({
errorestit:'请输入知识点',
errores:true,
boolred:true,
})
return
}
if(this.isNull(this.state.newkntypeinput)===true){
this.setState({
errorestit:'不能输入空格',
errores:true,
boolred:true,
})
return
}
this.props.NewknTypedeltyoedel(this.state.newkntypeinput)
}
render() { render() {
let{errores,errorestit,addonAfteronelens3}=this.state;
return( return(
<Modal <Modal
keyboard={false} keyboard={false}
@ -71,12 +106,28 @@ class PaperDeletModel extends Component {
width="442px" width="442px"
> >
<div className="educouddiv"> <div className="educouddiv">
<div className={this.props.boolred===true?"tabeltext-alignleft mt10 inpustred":"tabeltext-alignleft mt10"}> <style>
<Input onInput={this.handleChange} maxLength={15} onBlur={this.mysinputOnBlur } onFocus={this.inputOnFocus }/> {
`
.eduinpus .ant-input{
width: 310px !important;
border-right: 0px solid #FFFFff !important;
}
`
}
</style>
<div className={this.props.boolred===true?"tabeltext-alignleft mt10 inpustred inpustredysl eduinpus":errores===true?"tabeltext-alignleft mt10 inpustred inpustredysl eduinpus":"tabeltext-alignleft mt10 eduinpus"}>
<Input className={"eduinpus"} onInput={this.handleChange} maxLength={15} onBlur={this.mysinputOnBlur } addonAfter={String(addonAfteronelens3)+"/15"} onFocus={this.inputOnFocus }/>
</div> </div>
<div className="clearfix mt30 edu-txt-center"> {
errores===true?
<p className={"xingcolor"}>{errorestit}</p>
:""
}
<div className={errores===true?"clearfix mt10 edu-txt-center":"clearfix mt30 edu-txt-center"}>
<a className="task-btn mr30 w80" onClick={()=>this.props.NewknTypedeldel(false)}>取消</a> <a className="task-btn mr30 w80" onClick={()=>this.props.NewknTypedeldel(false)}>取消</a>
<a className="task-btn task-btn-orange w80" onClick={()=>this.props.NewknTypedeltyoedel(this.state.newkntypeinput)}>确定</a> <a className="task-btn task-btn-orange w80" onClick={ ()=>this.NewknTypedeltyoedels()}>确定</a>
</div> </div>
</div> </div>
</Modal> </Modal>

27
public/react/src/modules/question/questioncss/questioncom.css
Unescape View File

@ -931,10 +931,29 @@
margin-left: 18px; margin-left: 18px;
} }
.btques { .inpustred .ant-input{
width: 1021px; border: 1px solid #f30707 !important;
background: rgba(249, 249, 249, 1); border-right: 0px solid #FFFFff !important;
border: 1px solid rgba(221, 221, 221, 1); }
.inpustredysl .ant-input:hover{
border: 1px solid #f30707 !important;
border-right: 0px solid #FFFFff !important;
}
.inpustredysl .ant-input:active{
border: 1px solid #f30707 !important;
border-right: 0px solid #FFFFff !important;
}
.inpustredysl .ant-input-group-addon{
border: 1px solid #f30707 !important;
border-left: 0px solid #FFFFff !important;
}
.inpustredysl .ant-input-group-addon:hover{
border: 1px solid #f30707 !important;
border-left: 0px solid #FFFFff !important;
}
.inpustredysl .ant-input-group-addon:active{
border: 1px solid #f30707 !important;
border-left: 0px solid #FFFFff !important;
} }
.borderwdswuhques { .borderwdswuhques {

6
public/react/src/modules/testpaper/component/Contentpart.js
Unescape View File

@ -57,7 +57,7 @@ class Contentpart extends Component {
render() { render() {
let {page}=this.state; let {page}=this.state;
let {defaultActiveKey}=this.props; let {defaultActiveKey}=this.props;
const defaultActiveKeys=defaultActiveKey+'';
const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false; const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false; const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
@ -108,14 +108,14 @@ class Contentpart extends Component {
{ {
isysladmins===true||(is_teacher===true&&professional_certification===true)? isysladmins===true||(is_teacher===true&&professional_certification===true)?
<Tabs activeKey={defaultActiveKey} onChange={(e)=>this.props.callback(e)}> <Tabs activeKey={defaultActiveKeys} onChange={(e)=>this.props.callback(e)}>
<TabPane tab="公共" key="1"> <TabPane tab="公共" key="1">
</TabPane> </TabPane>
<TabPane tab="我的" key="0"> <TabPane tab="我的" key="0">
</TabPane> </TabPane>
</Tabs> </Tabs>
: :
<Tabs activeKey={1} onChange={(e)=>this.props.callback(e)}> <Tabs activeKey={"1"} onChange={(e)=>this.props.callback(e)}>
<TabPane tab="公共" key="1"> <TabPane tab="公共" key="1">
</TabPane> </TabPane>
</Tabs> </Tabs>

Write Preview
Loading…
Cancel
Save