From 25ded9f09d0959b65b841c370024d0c3baae932e 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, 9 Aug 2019 16:14:33 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index c827d73cd..ccf6c4547 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {
-
+

From b5b8103479e73186fc4c1c89b912338a3fb982bf 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, 9 Aug 2019 16:14:49 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index ccf6c4547..101163f29 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {

-
+

From a0b5fd69fb019c0dcc19e6729a85ff46c5b6fcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 09:31:43 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=88=B7=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesPublic/PathModal.js | 18 ++++++++------ .../courses/coursesPublic/ShixunModal.js | 24 +++++++++++-------- .../react/src/modules/courses/css/Courses.css | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index 3fbbd4af4..07ce55024 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -122,16 +122,20 @@ class PathModal extends Component{ contentViewScrolledit=(e)=>{ //滑动到底判断 + const {shixunmodallist} = this.state; if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - let {Searchvalue,type,page,shixunpathlist}=this.state; - let newpage=page+1 - this.funshixunpathlist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) - + if(shixunmodallist.subject_list.length===0){ + return; + }else{ + let {Searchvalue,type,page,shixunpathlist}=this.state; + let newpage=page+1 + this.funshixunpathlist(Searchvalue,type,true,newpage) + this.setState({ + page:newpage + }) + } } } diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index 1ae63da90..2a53cf104 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -100,17 +100,21 @@ class ShixunModal extends Component{ } contentViewScrolledit=(e)=>{ - + const {shixunmodallist}=this.state; //滑动到底判断 - if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - let {Searchvalue,type,page}=this.state; - let newpage=page+1 - this.setupdatalist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) - } - + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight) { + + if (shixunmodallist.shixun_list.length === 0) { + return; + } else { + let {Searchvalue, type, page} = this.state; + let newpage = page + 1 + this.setupdatalist(Searchvalue, type, true, newpage) + this.setState({ + page: newpage + }) + } + } } //搜索 diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 47db2f595..b6388b1e7 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -477,9 +477,9 @@ a.white-btn.use_scope-btn:hover{ } .pathInfobox li{ margin-right: 20px; - height: 15px; + height: 20px; /*overflow: hidden;*/ - line-height: 15px; + line-height: 20px; } .width70f{ width: 70px; From 230b603b005921937a3bb12e7360a7742e8d9055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 10 Aug 2019 09:46:20 +0800 Subject: [PATCH 04/25] =?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 | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 2c0b7d9a1..fef1bec75 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1608,7 +1608,7 @@ class Listofworksstudentone extends Component { } - paginationonChanges = (pageNumber) => { + paginationonChangestwo = (pageNumber) => { this.setState({ page: pageNumber, loadingstate: true, @@ -2495,7 +2495,10 @@ class Listofworksstudentone extends Component { // console.log(datajs); // console.log("2202"); // console.log(this.props.isAdmin()); - + // console.log("2498"); + // console.log(data); + // console.log(datas); + // console.log(this.props.isAdmin()); return ( this.props.isAdmin() === true ? ( @@ -2927,8 +2930,8 @@ class Listofworksstudentone extends Component { {teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}已交{teacherdata === undefined ? "" : teacherdata.uncommit_count}未交 + className="color-orange-tip">{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}已交{teacherdata === undefined ? "0" : teacherdata.uncommit_count}未交 {teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" : {teacherdata.left_time.status} } @@ -2969,6 +2972,12 @@ class Listofworksstudentone extends Component { .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot { top: 72%;} } + .edu-table .ant-table-tbody > tr > td { + height: 85px; + } + .edu-table .ant-table-thead > tr > th{ + height: 85px; + } .ysltableow .ant-table-thead > tr > th{ height: 85px; } @@ -3033,7 +3042,7 @@ class Listofworksstudentone extends Component { }

-
+
{ - let id = this.props.match.params.shixunId; + if(this.props.checkIfLogin()===false){ + this.props.showLoginDialog() + return + } + if(this.props.current_user&&this.props.current_user.profile_completed===false){ + this.setState({ + AccountProfiletype:true + }) + return + } + let id = this.props.match.params.shixunId; let url="/shixuns/" + id +"/search_user_courses.json"; this.setState({ Senttothetype:true @@ -384,6 +394,11 @@ class TPMBanner extends Component { //开始实战按钮 startshixunCombat=(id, reset)=>{ + if(this.props.checkIfLogin()===false){ + this.props.showLoginDialog() + return + } + if(this.props.current_user&&this.props.current_user.profile_completed===false){ this.setState({ AccountProfiletype:true diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 980e1d5b2..66054142a 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -220,6 +220,13 @@ class Challenges extends Component { //开始实战按钮 startshixunCombat = (type, ids, id) => { + + if(this.props.checkIfLogin()===false){ + this.props.showLoginDialog() + return + } + + if(this.props.current_user&&this.props.current_user.profile_completed===false){ this.setState({ AccountProfiletype:true @@ -227,7 +234,7 @@ class Challenges extends Component { return } - debugger + let { ChallengesDataList } = this.state; // let id = this.props.match.params.shixunId; this.setState({ From 51c06f366f19841eb5ce948ec720135ad0308ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 11:32:33 +0800 Subject: [PATCH 12/25] b --- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 6b27a666b..490bb1283 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -75,7 +75,7 @@ class ShixunWorkReport extends Component { let homeworkid=this.props.match.params.homeworkid; let url = `/student_works/${homeworkid}/shixun_work_report.json` axios.get(url).then((result) => { - if (response.data.status === 403||response.data.status === 401||response.data.status === 407||response.data.status === 408) { + if (result.data.status === 403||result.data.status === 401||result.data.status === 407||result.data.status === 408) { }else{ this.setState({ From 37010a9c657327694e48578f379b3b373c79f240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 14:18:09 +0800 Subject: [PATCH 13/25] =?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/AppConfig.js | 20 +++++++++---------- .../shixunHomework/ShixunWorkReport.js | 2 +- .../OfficialAcademicTranscript.js | 2 ++ .../shixunreport/Shixunechart.js | 8 +++++--- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 174b163d8..c09a2cbe7 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ let hashTimeout // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : -// window.location.search.indexOf('debug=s') != -1 ? 'student' : -// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : + window.location.search.indexOf('debug=s') != -1 ? 'student' : + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +} window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 490bb1283..66bde2d2a 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -156,7 +156,7 @@ class ShixunWorkReport extends Component { {/*>导出实训报告数据 : ""}*/}
-
+
总体评价
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js index c7c3b67e4..e2cefe247 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js @@ -177,6 +177,8 @@ class OfficialAcademicTranscript extends Component { } .TaskForms{ width: 500px; + text-align: left !important; + padding: 16px !important; } .TaskForms.ant-table-header-column{ width: 100%; diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js index dff7c6859..c12ec13d5 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js @@ -12,6 +12,7 @@ function startechart(data){ var option = { title: { text: '工作效率', + subtext: '工作效率=log(实训总得分/实训总耗时)' }, grid:{ left: '3%', @@ -61,7 +62,7 @@ function startechart(data){ yAxis: [ { type : "value", - name : " 实训总得分/实训总耗时", + name : " ", nameGap: 20, nameTextStyle: { color: '#000', @@ -169,6 +170,7 @@ function startechart(data){ var option1 = { title: { text: '能力值', + subtext: '能力值（实训获得经验值/实训评测次数）' }, backgroundColor: '#fff', color: [ @@ -212,7 +214,7 @@ function startechart(data){ }, yAxis: { type: 'value', - name: " 实训获得经验值/实训评测次数", + name: " ", nameLocation: 'end', nameGap: 20, nameTextStyle: { @@ -356,7 +358,7 @@ class Shixunechart extends Component { `} -
+
  • 姓名
    • From 62316bf168557b8bc04e2fe482ba5306c7b8e084 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 10 Aug 2019 14:23:54 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=91=E9=80=81=E8=87=B3=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E8=B5=84=E6=96=99=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/subjects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index c35397684..825040528 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -1,7 +1,7 @@ class SubjectsController < ApplicationController before_action :require_login, :check_auth, except: [:index, :show] # before_action :check_auth, except: [:index] - before_action :check_account, only: [:new, :create] + before_action :check_account, except: [:index, :show] before_action :find_subject, except: [:index, :create, :new, :append_to_stage] before_action :allowed, only: [:update, :edit, :destroy, :publish, :cancel_publish, :cancel_has_publish, :search_members, :add_subject_members, :statistics, :shixun_report, :school_report, From da5ebae5099ec15a8f0296b400d9217c2bf99d45 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 10 Aug 2019 14:32:48 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/discusses_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 4af27b919..6ddf71ba4 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -1,5 +1,6 @@ class DiscussesController < ApplicationController LIMIT = 10 + before_action :require_login, only: [:create, :reply, :hidden, :reward_code, :plus, :destroy] before_action :find_container, only: [:index, :hidden] before_action :find_discuss, except: [:create, :index, :new_message, :reward_code, :forum_discusses, :plus] From 8fcd326566027d464e1a3638120e4bf594a9d6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 14:35:39 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=88=B7=E6=96=B0=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=20=E8=B0=B7=E6=AD=8C/=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?= =?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/AppConfig.js | 20 +- .../paths/PathDetail/PathDetailIndex.js | 2 +- .../paths/PathDetail/addCollaborators.js | 427 +++++++++--------- public/react/src/modules/tpm/NewHeader.js | 5 +- 4 files changed, 225 insertions(+), 229 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 174b163d8..c09a2cbe7 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ let hashTimeout // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : -// window.location.search.indexOf('debug=s') != -1 ? 'student' : -// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : + window.location.search.indexOf('debug=s') != -1 ? 'student' : + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +} window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js index 1d233a775..302af3d52 100644 --- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js +++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js @@ -426,7 +426,7 @@ class PathDetailIndex extends Component{
    } { - detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" : + this.props.checkIfLogin()===false?"":detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" :

    我的进展 diff --git a/public/react/src/modules/paths/PathDetail/addCollaborators.js b/public/react/src/modules/paths/PathDetail/addCollaborators.js index c828f1589..6100ab2f6 100644 --- a/public/react/src/modules/paths/PathDetail/addCollaborators.js +++ b/public/react/src/modules/paths/PathDetail/addCollaborators.js @@ -1,216 +1,213 @@ -import React, { Component } from 'react'; -import { Modal,Checkbox,Input } from "antd"; -import axios from 'axios'; - -const Search = Input.Search; -const CheckboxGroup = Checkbox.Group; -class addCollaborators extends Component{ - constructor(props){ - super(props); - this.state = { - addPartner:false, - page:1, - partnerList:undefined, - search:'', - partnerListid:[], - checkAll: false, - optionss:[] - } - } - addBox=()=>{ - - this.setState({ - addPartner:true, - search:"", - page:1, - partnerList:undefined, - optionss:[] - }) - this.searchList("") - - } - hideAddBox=()=>{ - this.setState({ - addPartner:false, - optionss:[], - partnerListid:[] - }) - } - // 搜索框输入 - changeSearchValue=(e)=>{ - this.setState({ - search: e.target.value - }) - } - // 回车搜索--搜索成功后page为1 - searchList=()=>{ - let id=this.props.match.params.pathId; - let {search,page}=this.state; - let url='/paths/'+id+'/search_members.json?search='+search+"&page="+page; - axios.post(url).then((result)=>{ - if(result.status==200){ - let list=result.data.users; - let optionss=[] - for(var i=0; i{ - console.log(error); - }) - } - - - SaveAddBox=()=>{ - let {partnerListid} =this.state; - let id=this.props.match.params.pathId; - let url="/paths/"+id+"/add_subject_members.json" - axios.post(url,{ - user_ids:partnerListid - }).then((response) => { - if(response.status==200){ - this.setState({ - addPartner:false, - optionss:[], - partnerListid:[] - }) - this.props.updatadetailInfoLists(); - } - }).catch((error) => { - console.log(error) - }); - } - - addCollaboratorsid=(id)=>{ - this.setState({ - partnerListid:id - }) - } - - onCheckAllChange = (e) => { - let {optionss} =this.state; - - if(e.target.checked===true){ - this.setState({ - checkAll: e.target.checked, - partnerListid:optionss - }); - }else{ - this.setState({ - checkAll: e.target.checked, - partnerListid:[] - }); - } - - } - - contentViewScroll=(e)=>{ - //滑动到底判断 - if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - // console.log("到达底部"); - - let id=this.props.match.params.pathId; - let {search,page,partnerList,optionss}=this.state; - let newpage=page+1; - let url='/paths/'+id+'/search_members.json?search='+search+"&page="+newpage; - - axios.post(url).then((result)=>{ - if(result.status==200){ - let list=result.data.users; - let newlist=partnerList; - for(var j=0; j{ - console.log(error); - }) - - } - - } - - render(){ - let {addPartner,search,partnerList,optionss,checkAll,partnerListid} = this.state; - - return( -

    - { - this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_add_member===true? - + 添加合作者 - :"" - } - - -
    -
    - this.searchList(search)} /> -
    -

    - - 姓名 - 昵称 - 职位 - 单位 -

    -
      - - { - partnerList && partnerList.map((item,key)=>{ - return( -
    • - - {item.user_name} - {item.nickname} - {item.identity} - {item.school_name} -
      • - ) - }) - } -       -
    -
    - 取消 - 确定 -
    -
    -     -
    - ) - } -} +import React, { Component } from 'react'; +import { Modal,Checkbox,Input } from "antd"; +import axios from 'axios'; + +const Search = Input.Search; +const CheckboxGroup = Checkbox.Group; +class addCollaborators extends Component{ + constructor(props){ + super(props); + this.state = { + addPartner:false, + page:1, + partnerList:undefined, + search:'', + partnerListid:[], + checkAll: false, + optionss:[] + } + } + addBox=()=>{ + + this.setState({ + addPartner:true, + search:"", + page:1, + partnerList:undefined, + optionss:[] + }) + this.searchList("") + + } + hideAddBox=()=>{ + this.setState({ + addPartner:false, + optionss:[], + partnerListid:[] + }) + } + // 搜索框输入 + changeSearchValue=(e)=>{ + this.setState({ + search: e.target.value + }) + } + // 回车搜索--搜索成功后page为1 + searchList=()=>{ + let id=this.props.match.params.pathId; + let {search,page}=this.state; + let url='/paths/'+id+'/search_members.json?search='+search+"&page="+page; + axios.post(url).then((result)=>{ + if(result.status==200){ + let list=result.data.users; + let optionss=[] + for(var i=0; i{ + console.log(error); + }) + } + + + SaveAddBox=()=>{ + let {partnerListid} =this.state; + let id=this.props.match.params.pathId; + let url="/paths/"+id+"/add_subject_members.json" + axios.post(url,{ + user_ids:partnerListid + }).then((response) => { + if(response.status==200){ + this.setState({ + addPartner:false, + optionss:[], + partnerListid:[] + }) + this.props.updatadetailInfoLists(); + } + }).catch((error) => { + console.log(error) + }); + } + + addCollaboratorsid=(id)=>{ + this.setState({ + partnerListid:id + }) + } + + onCheckAllChange = (e) => { + let {optionss} =this.state; + + if(e.target.checked===true){ + this.setState({ + checkAll: e.target.checked, + partnerListid:optionss + }); + }else{ + this.setState({ + checkAll: e.target.checked, + partnerListid:[] + }); + } + + } + + contentViewScroll=(e)=>{ + //滑动到底判断 + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ + // console.log("到达底部"); + + let id=this.props.match.params.pathId; + let {search,page,partnerList,optionss}=this.state; + let newpage=page+1; + let url='/paths/'+id+'/search_members.json?search='+search+"&page="+newpage; + + axios.post(url).then((result)=>{ + if(result.status==200){ + let list=result.data.users; + let newlist=partnerList; + for(var j=0; j{ + console.log(error); + }) + + } + + } + + render(){ + let {addPartner,search,partnerList,optionss,checkAll,partnerListid} = this.state; + + return( + this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_add_member===true? +
    + + 添加合作者 + +
    +
    + this.searchList(search)} /> +
    +

    + + 姓名 + 昵称 + 职位 + 单位 +

    +
      + + { + partnerList && partnerList.map((item,key)=>{ + return( +
    • + + {item.user_name} + {item.nickname} + {item.identity} + {item.school_name} +
      • + ) + }) + } +       +
    +
    + 取消 + 确定 +
    +
    +     +
    :"" + + ) + } +} export default addCollaborators; \ No newline at end of file diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 7e40b9edd..799109b9f 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -8,7 +8,7 @@ import PropTypes from 'prop-types'; // /images/educoder/icon/search.svg -import { getImageUrl, toPath } from 'educoder' +import { getImageUrl, toPath ,trigger,broadcastChannelPostMessage} from 'educoder' import axios from 'axios'; @@ -30,8 +30,6 @@ import 'antd/lib/input/style/index.css'; import './TPMIndex.css'; -import { trigger, broadcastChannelPostMessage } from 'educoder'; - const $ = window.$ // TODO 这部分脚本从公共脚本中直接调用 @@ -316,6 +314,7 @@ class NewHeader extends Component { // this.setState({ // isRender:true // }) + broadcastChannelPostMessage('refreshPage') window.location.href = "/"; } }).catch((error) => { From 12388a1f7b98fd9d9b9cbed167183cdf375edfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 10 Aug 2019 14:50:02 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TraineetraininginformationModal.js | 98 +++++++++++++------ 1 file changed, 67 insertions(+), 31 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index 53f960872..c7acf23a4 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -79,14 +79,14 @@ class TraineetraininginformationModal extends Component { return str; } render() { - console.log(83); - console.log(this.props.boolgalist); + // console.log(83); + // console.log(this.props.boolgalist); const columns = [ { title: '关卡', dataIndex: 'number', key: 'number', - width: 92, + width:"91px", align: "center", render: (text, record) => ( @@ -98,7 +98,7 @@ class TraineetraininginformationModal extends Component { title: '完成时间', dataIndex: 'name', key: 'name', - width: 130, + width:"150px", align: "center", render: (text, record) => ( @@ -113,7 +113,7 @@ class TraineetraininginformationModal extends Component { title: '', dataIndex: 'complete_status', key: 'complete_status', - width: 100, + width:"87px", align: "center", render: (text, record) => ( @@ -127,7 +127,7 @@ class TraineetraininginformationModal extends Component { title: '耗时', dataIndex: 'stduynumber', key: 'stduynumber', - width: 92, + width:"150px", align: "center", render: (text, record) => ( @@ -138,7 +138,7 @@ class TraineetraininginformationModal extends Component { { title: '经验值', key: 'classroom', - width: 92, + dataIndex: 'classroom', align: "center", render: (text, record) => ( @@ -147,7 +147,7 @@ class TraineetraininginformationModal extends Component { ), } - ] + ]; const columnss = [ { @@ -155,7 +155,7 @@ class TraineetraininginformationModal extends Component { dataIndex: 'number', key: 'number', align: "center", - width: "117px", + width:"119px", render: (text, record) => ( {record.number} @@ -166,7 +166,7 @@ class TraineetraininginformationModal extends Component { title: '完成时间', dataIndex: 'name', key: 'name', - width: "203px", + width:"174px", align: "center", render: (text, record) => ( @@ -179,7 +179,7 @@ class TraineetraininginformationModal extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: "center", - width: "117px", + width:"119px", render: (text, record) => ( {record.stduynumber} @@ -191,14 +191,14 @@ class TraineetraininginformationModal extends Component { key: 'classroom', dataIndex: 'classroom', align: "center", - width: "117px", + render: (text, record) => ( {record.classroom} ), } - ] + ]; return (
    @@ -246,13 +246,24 @@ class TraineetraininginformationModal extends Component { {this.props.boolgalist === false?
    { - this.props.game_list === undefined?"" : this.props.game_list.length<5? + this.props.game_list === undefined?"" : this.props.game_list.length<4?
    @@ -263,24 +274,33 @@ class TraineetraininginformationModal extends Component { columns={columns} loading={false} pagination={false} - onChange={this.TablePagination} />}
    :
    +
    {this.props.game_list === undefined ? "" : } @@ -296,13 +316,21 @@ class TraineetraininginformationModal extends Component {
    { - this.props.game_list === undefined?"" : this.props.game_list.length<5? + this.props.game_list === undefined?"" : this.props.game_list.length<4?
    @@ -313,24 +341,32 @@ class TraineetraininginformationModal extends Component { columns={columnss} loading={false} pagination={false} - onChange={this.TablePagination} />}
    :
    +
    {this.props.game_list === undefined ? "" :
    } From 673fb3f0bd8b8740c98a21e79b1b8eb6ea06b822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 14:59:29 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/paths/PathDetail/sendPanel.js | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js index 2f9059a18..ae7dd5b00 100644 --- a/public/react/src/modules/paths/PathDetail/sendPanel.js +++ b/public/react/src/modules/paths/PathDetail/sendPanel.js @@ -27,9 +27,27 @@ class sendPanel extends Component{ //发送至 SentToLesson =() =>{ - this.setState({ - sentShixunPath:true - }) + let id=this.props.detailInfoList.id; + let url="/paths/"+id+"/choose_course.json"; + axios.get(url).then((result)=>{ + if(result.status==200){ + + if (result.data.status === 403||result.data.status === 402||result.data.status === 407||result.data.status === 408) { + + }else{ + this.setState({ + sendToCourseList:result.data, + sentShixunPath:true + }) + } + + } + }).catch((error)=>{ + console.log(error); + }) + // this.setState({ + // sentShixunPath:true + // }) } //隐藏发送至弹框 hideSenttothevalue =()=>{ @@ -99,17 +117,17 @@ class sendPanel extends Component{ } componentDidMount(){ - let id=this.props.detailInfoList.id; - let url="/paths/"+id+"/choose_course.json"; - axios.get(url).then((result)=>{ - if(result.status==200){ - this.setState({ - sendToCourseList:result.data - }) - } - }).catch((error)=>{ - console.log(error); - }) + // let id=this.props.detailInfoList.id; + // let url="/paths/"+id+"/choose_course.json"; + // axios.get(url).then((result)=>{ + // if(result.status==200){ + // this.setState({ + // sendToCourseList:result.data + // }) + // } + // }).catch((error)=>{ + // console.log(error); + // }) } cardsModalcancel=()=>{ From d997704ed4054e288bdca2d45b012fcfc429a0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 10 Aug 2019 15:06:30 +0800 Subject: [PATCH 19/25] =?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/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index ef0d35dd1..ab814aab8 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -308,7 +308,7 @@ class MessagSub extends Component{ //记得跳评阅页面 default : // 课堂-试卷列表详情 :id = container_id - return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}`) + return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`); } case 'StudentGraduationTopic' : //课堂-毕业选题详情 :id = parent_container_id From 3d20802e041a41ed19754df6c36c0027b9838bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 15:07:15 +0800 Subject: [PATCH 20/25] =?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/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 799109b9f..b816448e0 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -880,9 +880,9 @@ submittojoinclass=(value)=>{ />:""} {/* /courses/join_course_multi_role */} - {/*
  • */} +
  • 加入项目 - {/*
    • */} + {tojoinitemtype===true? Date: Sat, 10 Aug 2019 15:20:45 +0800 Subject: [PATCH 21/25] =?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 | 30 +++++++++---------- .../TraineetraininginformationModal.js | 20 ++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index fef1bec75..7f821bde4 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2779,13 +2779,13 @@ class Listofworksstudentone extends Component { } .edu-table thead th,.edu-table tbody tr:last-child td{ border-bottom: none!important; - height: 85px; + height: 58px; } .ant-tables .ant-table-tbody > tr > td { - height: 85px; + height: 58px; } .ysltableo .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td { padding: 9px; @@ -2973,16 +2973,16 @@ class Listofworksstudentone extends Component { top: 72%;} } .edu-table .ant-table-tbody > tr > td { - height: 85px; + height: 58px; } .edu-table .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableow .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableow .ant-table-tbody > tr > td{ - height: 85px; + height: 58px; } .ysltableow .ant-table-thead > tr > th, .ant-table-tbody > tr > td { padding: 9px; @@ -3064,16 +3064,16 @@ class Listofworksstudentone extends Component { { ` .edu-table .ant-table-tbody > tr > td { - height: 85px; + height: 58px; } .edu-table .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableows .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableows .ant-table-tbody > tr > td{ - height: 85px; + height: 58px; } .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td { padding: 9px; @@ -3197,16 +3197,16 @@ class Listofworksstudentone extends Component { top: 72%;} } .edu-table .ant-table-tbody > tr > td { - height: 85px; + height: 58px; } .edu-table .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableowss .ant-table-thead > tr > th{ - height: 85px; + height: 58px; } .ysltableowss .ant-table-tbody > tr > td{ - height: 85px; + height: 58px; } .ysltableowss .ant-table-thead > tr > th, .ant-table-tbody > tr > td { padding: 9px; diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index c7acf23a4..2c861928b 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -246,7 +246,7 @@ class TraineetraininginformationModal extends Component { {this.props.boolgalist === false?
    { - this.props.game_list === undefined?"" : this.props.game_list.length<4? + this.props.game_list === undefined?"" : this.props.game_list.length<5?
    -

    + {/*

    */} -

    + {/*

    */} { - let{sort}=this.state; + let{sort,order_by}=this.state; this.setState({ - order_by: 'publish_time', tag_level: 1, tag_id:'', page: 1, @@ -129,7 +128,7 @@ class ShixunsIndex extends Component { }) let params={ - order_by: 'publish_time', + order_by:order_by, tag_level: 1, tag_id:'', page: 1, From 27e06c9ca6d520004de958b2293a9bdeb441a691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 10 Aug 2019 15:50:29 +0800 Subject: [PATCH 23/25] =?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/courses/poll/PollNew.js | 4 ++-- .../courses/shixunHomework/TraineetraininginformationModal.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 6bebb1fcd..ce602afc3 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -122,8 +122,8 @@ class PollNew extends Component { } } - - // this.getPollInfo(); + console.log("问卷返回"); + console.log(this.props); } //获取权限 diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index 2c861928b..9b86483df 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -209,6 +209,8 @@ class TraineetraininginformationModal extends Component { visible={this.props.visible} footer={null} onCancel={this.Cancel} + maskClosable={false} + destroyOnClose={true} >
    From ac14036c7433fac22f6ffb5d03195f4e95cf0695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 15:50:49 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 6 ++++++ .../shixunHomework/shixunreport/Coursesshixundetails.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 66bde2d2a..3873c6c7f 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -114,6 +114,11 @@ class ShixunWorkReport extends Component { this.props.history.push(this.props.current_user.first_category_url); } } + + goback = () => { + + this.props.history.goBack() + } render() { let{data} =this.state; console.log(data) @@ -154,6 +159,7 @@ class ShixunWorkReport extends Component { {/*className="fr color-blue font-16"*/} {/*onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}*/} {/*>导出实训报告数据 : ""}*/} + 返回
    diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js index 529a4646b..23f6d1e48 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js @@ -44,7 +44,7 @@ class Coursesshixundetails extends Component { data&&data.forEach((item,key)=>{ datas.push({ number: item.position, - name: item.output_detail + name: item.output_detail=== ""||item.output_detail===null?"暂无数据":item.output_detail }) }) From 864161022b7f84aa506299550fb222d01d0d408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 10 Aug 2019 15:58:15 +0800 Subject: [PATCH 25/25] b --- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 3873c6c7f..5a98a974d 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -159,7 +159,7 @@ class ShixunWorkReport extends Component { {/*className="fr color-blue font-16"*/} {/*onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}*/} {/*>导出实训报告数据 : ""}*/} - 返回 + {/*返回*/}