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

Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

Browse Source
topic_bank
hjm 6 years ago
parent 2bc77bad5d 34ff5a7022
commit 85e3542ab3
4 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File

39
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -3218,7 +3218,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3249,14 +3249,14 @@ class PollNewQuestbank extends Component {
// )
// ""
// :
itemo.question.answers.length > 2 &&indext>1?
itemo.question.answers.length > 2 &&indext>=1?
<span>
{
indext > 1 ?
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
:""
}
{
@ -3265,12 +3265,12 @@ class PollNewQuestbank extends Component {
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
: itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
: <a className="lineh-40 yw18"
></a>
}
@ -3280,7 +3280,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40" id="bianjibianji1"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
// : "")
: "":""}
@ -3482,6 +3482,7 @@ class PollNewQuestbank extends Component {
</div>
</div> : "")
:
// 编辑
<div className="bor-bottom-greyE problemShow" >
{resultDom}
{this.state.Newdisplay === false ?
@ -3525,8 +3526,8 @@ class PollNewQuestbank extends Component {
onInput={(e) => this.HandleInputTopic(e, indexo)}>{itemo.question.question_title}</TextArea>
}
{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
console.log("chishiyong1");
console.log(itemo.question.answers[itemo.question.answers.length - 1]);
// console.log("chishiyong1");
// console.log(itemo.question.answers[itemo.question.answers.length - 1]);
// var bools=true;
// if(){
//
@ -3549,7 +3550,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3576,14 +3577,14 @@ class PollNewQuestbank extends Component {
// title="新增" placement={"bottom"}><i
// className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
// :"")
itemo.question.answers.length > 2 && indext>1 ?
itemo.question.answers.length > 2 && indext>=1 ?
<span>
{
indext > 1 ?
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
:""
}
{
@ -3591,12 +3592,12 @@ class PollNewQuestbank extends Component {
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
: itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:
<a className="lineh-40 yw18"
></a>
@ -3607,7 +3608,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 " id="bianjibianji2"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
// : "")
: "":""}
@ -3885,7 +3886,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3927,7 +3928,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-25 color-grey-c "></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
:""
}
@ -3938,14 +3939,14 @@ class PollNewQuestbank extends Component {
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:
itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:
<a className="lineh-40 yw18"
@ -3958,7 +3959,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
: "":""}
</p>)}

26
public/react/src/modules/modals/SendTopics.js
Unescape View File

@ -1,5 +1,5 @@
import React,{ Component } from "react";
import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd";
import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col ,Spin} from "antd";
import axios from 'axios';
const { Search } = Input;
class SendTopics extends Component{
@ -9,7 +9,8 @@ class SendTopics extends Component{
courses:[],
search:null,
Radiolist:undefined,
showcheck:false
showcheck:false,
smallisSpin:false
}
}
@ -54,13 +55,17 @@ class SendTopics extends Component{
}
submitInfo=()=>{
this.setState({
smallisSpin:true
})
let{Radiolist}=this.state;
let url=`/question_banks/send_to_course.json`;
let object_id=this.props.checkBoxValues;
let object_type=this.props.category;
if(Radiolist===undefined){
this.setState({
showcheck:true
showcheck:true,
smallisSpin:false
})
}else{
axios.post(url,{
@ -69,6 +74,9 @@ class SendTopics extends Component{
course_id:Radiolist
}
).then((result)=>{
this.setState({
smallisSpin:false
})
if(result.data.status===0){
this.props.showNotification(result.data.message)
this.props.topicscancelmodel()
@ -78,12 +86,15 @@ class SendTopics extends Component{
}
}).catch((error)=>{
console.log(error)
this.setState({
smallisSpin:false
})
})
}
}
render(){
let{courses,Radiolist,showcheck}= this.state;
let{courses,Radiolist,showcheck,smallisSpin}= this.state;
const radioStyle = {
display: 'block',
@ -108,6 +119,7 @@ class SendTopics extends Component{
height:221px;
overflow-y: auto;
}
`
}
</style>
@ -151,9 +163,9 @@ class SendTopics extends Component{
</div>
{showcheck===true?<div className={"color-red mt10"}>请先选择课堂</div>:""}
<div className="mt20 clearfix edu-txt-center">
<a onClick={()=>this.props.topicscancelmodel()} className="pop_close task-btn mr30">取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.submitInfo()}>确定</a>
<div className="mt20 clearfix edu-txt-center" >
<a onClick={()=>this.props.topicscancelmodel()} className="pop_close task-btn mr30 ">取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.submitInfo()}>确定</a>
</div>
</div>
</Modal>

12
public/react/src/modules/user/usersInfo/InfosTopics.js
Unescape View File

@ -70,6 +70,9 @@ class InfosTopics extends Component{
// }else{
//
// }
this.setState({
isSpin:true
})
let user_id=this.props.match.params&&this.props.match.params.username;
if(user_id!=undefined){
let {per_page}=this.state;
@ -86,10 +89,13 @@ class InfosTopics extends Component{
}).then((response) => {
this.setState({
data:response.data,
checkBoxValues:[]
checkBoxValues:[],
isSpin:false
})
}).catch((error) => {
this.setState({
isSpin:false
})
});
}
}
@ -491,7 +497,7 @@ class InfosTopics extends Component{
<div className="clearfix">
<div className="item-body">
<div className="clearfix ds pr pt5 contentSection" >
<div className="clearfix ds pr pt10 contentSection" >
{user_type!="学生"?<Checkbox value={item.id} key={item.id} className={"fl mt5"}></Checkbox>:""}

2
public/react/src/modules/user/usersInfo/usersInfo.css
Unescape View File

@ -338,7 +338,7 @@
}
.topicsbtn{
padding: 3px 15px;
padding: 0px 15px;
border-radius: 2px;
/*color: #4C4C4C;*/
cursor: pointer;

Write Preview
Loading…
Cancel
Save