From 31c759e5709193045807fc389933c67bf41f2c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 15:44:04 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/modals/SendTopics.js | 28 ++++++++++++++----- .../src/modules/user/usersInfo/InfosTopics.js | 10 +++++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js index 98bec53a6..9185bf7d4 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,9 @@ class SendTopics extends Component{ height:221px; overflow-y: auto; } + .ml200{ + margin-left:200px; + } ` } @@ -151,9 +165,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 fl">取消 + this.submitInfo()}>确定
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 9f5f3c150..939ab5878 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 + }) }); } } From 11461761ee6031d3aa06432293dc45e701738645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 15:44:09 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/PollNewQuestbank.js | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index b8f1f9831..3e9be6a74 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"> : ""}

) : (

@@ -3256,7 +3256,7 @@ class PollNewQuestbank extends Component { 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"> :"") // : "") : "":""} @@ -3549,7 +3549,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"> : ""}

) : (

@@ -3583,7 +3583,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-22 color-grey-c"> :"" } { @@ -3591,12 +3591,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 +3607,7 @@ class PollNewQuestbank extends Component { this.Ewoption(itemo.question.id, itemo)}> + className="color-green font-18 iconfont icon-roundaddfill"> :"") // : "") : "":""} @@ -3885,7 +3885,7 @@ class PollNewQuestbank extends Component { onClick={() => this.Deleteentrys(arrid, indext, true)}> + className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"> : ""}

) : (

@@ -3927,7 +3927,7 @@ class PollNewQuestbank extends Component { this.Deleteentrys(arrid, indext, false)}> + className="iconfont icon-htmal5icon19 font-22 color-grey-c "> :"" } @@ -3938,14 +3938,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"> :"") : "":""}

)} From 4b63ac24033b27b105dae94ba526399962628d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 15:47:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/modals/SendTopics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js index 9185bf7d4..2958f3b9d 100644 --- a/public/react/src/modules/modals/SendTopics.js +++ b/public/react/src/modules/modals/SendTopics.js @@ -167,7 +167,7 @@ class SendTopics extends Component{ {showcheck===true?
请先选择课堂
:""}
this.props.topicscancelmodel()} className="pop_close task-btn mr30 fl">取消 - this.submitInfo()}>确定 + this.submitInfo()}>确定
From 0549e663ffc2bf2344b186b84f70c5931bf0b479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 15:49:49 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/modals/SendTopics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js index 2958f3b9d..626f3828f 100644 --- a/public/react/src/modules/modals/SendTopics.js +++ b/public/react/src/modules/modals/SendTopics.js @@ -167,7 +167,7 @@ class SendTopics extends Component{ {showcheck===true?
请先选择课堂
:""}
this.props.topicscancelmodel()} className="pop_close task-btn mr30 fl">取消 - this.submitInfo()}>确定 + this.submitInfo()}>确定
From 7ae5441d3e1bcd1312191cd017b4ba13767f5038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 15:56:34 +0800 Subject: [PATCH 5/9] b --- public/react/src/modules/modals/SendTopics.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js index 626f3828f..265bcc7d7 100644 --- a/public/react/src/modules/modals/SendTopics.js +++ b/public/react/src/modules/modals/SendTopics.js @@ -119,9 +119,7 @@ class SendTopics extends Component{ height:221px; overflow-y: auto; } - .ml200{ - margin-left:200px; - } + ` } @@ -165,8 +163,8 @@ class SendTopics extends Component{ {showcheck===true?
请先选择课堂
:""} -
- this.props.topicscancelmodel()} className="pop_close task-btn mr30 fl">取消 +
+ this.props.topicscancelmodel()} className="pop_close task-btn mr30 ">取消 this.submitInfo()}>确定
From 0c1b0e6c55ec65b8e42898d47a5fb4a2e4117862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 16:04:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 4c2d099b4..ef78db6b8 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -67,7 +67,7 @@ class Listofworksstudentone extends Component { pages: 1, limit: 20, loadingstate: true, - order: "update_time", + order: "work_score", search: null, day: 0, hour: 0, @@ -256,21 +256,21 @@ class Listofworksstudentone extends Component { ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: "center", - className:'font-14', - render: (text, record) => ( - - {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} - - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: "center", + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} + // + // ), + // }, { title: '完成情况', dataIndex: 'completion', @@ -379,7 +379,7 @@ class Listofworksstudentone extends Component { }, ], - orders: "update_time", + orders: "work_score", b_order:"desc", allow_late:false, checkedValuesine: undefined, @@ -519,16 +519,16 @@ class Listofworksstudentone extends Component { ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - className:'font-14', - render: (text, record) => ( - {record.updatetime} - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // {record.updatetime} + // ), + // }, { title: '完成情况', dataIndex: 'completion', @@ -796,16 +796,16 @@ class Listofworksstudentone extends Component { ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - className:'font-14', - render: (text, record) => ( - {record.updatetime} - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // {record.updatetime} + // ), + // }, { title: '实战耗时', dataIndex: 'cost_time', @@ -1656,9 +1656,9 @@ class Listofworksstudentone extends Component { var homeworkid = this.props.match.params.homeworkid; let urll = `/homework_commons/${homeworkid}/works_list.json?`; var order = "asc"; - if (ordervlue === "update_time") { - order = "desc"; - } + // if (ordervlue === "update_time") { + // order = "desc"; + // } var checkedValuesines = checkedValuesine; var checkedValuesineinfos = checkedValuesineinfo; var searchtexts = searchtext @@ -2065,15 +2065,15 @@ class Listofworksstudentone extends Component { } //排序 funordert = (e) => { - if (e === "update_time") { - // 时间 - // 时间排序是从小到大 - this.setState({ - orders: "update_time", - loadingstate: true, - }) - this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); - } + // if (e === "update_time") { + // // 时间 + // // 时间排序是从小到大 + // this.setState({ + // orders: "update_time", + // loadingstate: true, + // }) + // this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); + // } if (e === "work_score") { // 成绩 @@ -2762,10 +2762,10 @@ class Listofworksstudentone extends Component {