diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index b8f1f9831..e29acfc55 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3218,7 +3218,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"> : ""}

) : (

@@ -3249,14 +3249,14 @@ class PollNewQuestbank extends Component { // ) // "" // : - itemo.question.answers.length > 2 &&indext>1? + itemo.question.answers.length > 2 &&indext>=1? { indext > 1 ? this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-22 color-grey-c"> :"" } { @@ -3265,12 +3265,12 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : } @@ -3280,7 +3280,7 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> :"") // : "") : "":""} @@ -3482,6 +3482,7 @@ class PollNewQuestbank extends Component { : "") : + // 编辑

{resultDom} {this.state.Newdisplay === false ? @@ -3525,8 +3526,8 @@ class PollNewQuestbank extends Component { onInput={(e) => this.HandleInputTopic(e, indexo)}>{itemo.question.question_title} } {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)}> + className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"> : ""}

) : (

@@ -3576,14 +3577,14 @@ class PollNewQuestbank extends Component { // title="新增" placement={"bottom"}> // :"") - itemo.question.answers.length > 2 && indext>1 ? + itemo.question.answers.length > 2 && indext>=1 ? { indext > 1 ? this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-22 color-grey-c"> :"" } { @@ -3591,12 +3592,12 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : @@ -3607,7 +3608,7 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> :"") // : "") : "":""} @@ -3885,7 +3886,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"> : ""}

) : (

@@ -3927,7 +3928,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-22 color-grey-c "> :"" } @@ -3938,14 +3939,14 @@ class PollNewQuestbank extends Component { onClick={() => this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : itemo.question.answers.length - 1 === indext ? this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> : this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> :"") : "":""}

)} diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js index 98bec53a6..265bcc7d7 100644 --- a/public/react/src/modules/modals/SendTopics.js +++ b/public/react/src/modules/modals/SendTopics.js @@ -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; } + ` } @@ -151,9 +163,9 @@ class SendTopics extends Component{
{showcheck===true?
请先选择课堂
:""} -
- this.props.topicscancelmodel()} className="pop_close task-btn mr30">取消 - this.submitInfo()}>确定 +
+ this.props.topicscancelmodel()} className="pop_close task-btn mr30 ">取消 + this.submitInfo()}>确定
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 9f5f3c150..dd1bf0378 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -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{
-
+
{user_type!="学生"?:""} diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index c3100ea54..2a72fcfd1 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -338,7 +338,7 @@ } .topicsbtn{ - padding: 3px 15px; + padding: 0px 15px; border-radius: 2px; /*color: #4C4C4C;*/ cursor: pointer;