From 4c535a23560a2066b509de580d6330e5be6890bd 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, 20 Jul 2019 18:14:10 +0800 Subject: [PATCH 01/45] Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder # Conflicts: # public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js --- .../shixunHomework/TraineetraininginformationModal.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index 2d97e6c08..8b894db00 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -210,9 +210,9 @@ class TraineetraininginformationModal extends Component { footer={null} onCancel={this.Cancel} > -
+
-
+
{this.props.viewtrainingdata === undefined ? "" : this.LimitNumber(this.props.viewtrainingdata.shixun_name)} 经验值： {this.props.experience=== undefined?"0" :this.props.experience}/{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}
@@ -224,7 +224,7 @@ class TraineetraininginformationModal extends Component {
-
+ {/*
*/}
From 91a37a465e68c0e1d0620afcb17019933ba632d6 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 18:18:16 +0800 Subject: [PATCH 02/45] content_modified --- public/react/src/modules/page/MainContentContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js index 02bda180e..d24a5cefb 100644 --- a/public/react/src/modules/page/MainContentContainer.js +++ b/public/react/src/modules/page/MainContentContainer.js @@ -675,7 +675,7 @@ class MainContentContainer extends Component { const timeOut = time_limit; // http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993 // const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}` - const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${!!content_modified ? 1 : 0}&sec_key=${sec_key}` + const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}&sec_key=${sec_key}` // var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数 From 75cfe55863cd9f3ea9e3e21fd29b8896044b6119 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, 20 Jul 2019 18:18:36 +0800 Subject: [PATCH 03/45] Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder # Conflicts: # public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js --- .../shixunHomework/Listofworksstudentone.js | 583 +++++++++--------- 1 file changed, 296 insertions(+), 287 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 1823f43bb..1c9b22602 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -284,7 +284,7 @@ class Listofworksstudentone extends Component { { record.efficiencyscore&& record.efficiencyscore=== "--"?( - + -- ) @@ -963,32 +963,32 @@ class Listofworksstudentone extends Component { course_group: "", } axios.post(urll, data).then((result) => { - if(result === undefined){ - return - } + if(result === undefined){ + return + } // console.log("951"); // console.log(result); // debugger - this.setState({ - teacherdata: result.data, - task_status: result.data.task_status, - course_group_info: result.data.course_group_info, - student_works: result.data.student_works, - jobsettingsdata: result, - publish_immediately: result.data.publish_immediately, - end_immediately: result.data.end_immediately, - id: result.data.id, - work_efficiency: result.data.work_efficiency, - code_review: result.data.code_review, - challenges_count: result.data.challenges_count, - view_report: result.data.view_report, - }) - this.props.Getdataback(result,result.data); - if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") { - this.seacthdata(result.data); - } else { - this.seacthdatas(result.data, result.data.student_works); - } + this.setState({ + teacherdata: result.data, + task_status: result.data.task_status, + course_group_info: result.data.course_group_info, + student_works: result.data.student_works, + jobsettingsdata: result, + publish_immediately: result.data.publish_immediately, + end_immediately: result.data.end_immediately, + id: result.data.id, + work_efficiency: result.data.work_efficiency, + code_review: result.data.code_review, + challenges_count: result.data.challenges_count, + view_report: result.data.view_report, + }) + this.props.Getdataback(result,result.data); + if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") { + this.seacthdata(result.data); + } else { + this.seacthdatas(result.data, result.data.student_works); + } }).catch((error) => { console.log(error); @@ -1070,13 +1070,13 @@ class Listofworksstudentone extends Component { for(var i=0;i { console.log(error) @@ -1433,7 +1433,7 @@ class Listofworksstudentone extends Component { }) this.Getalistofworkstwo(this.state.order, "", "", "", pageNumber, this.state.limit); } - //计算成绩 + //计算成绩 setComputeTime=()=>{ let {teacherdata}=this.state; this.setState({ @@ -1497,26 +1497,26 @@ class Listofworksstudentone extends Component { limit:20, } axios.post(urll, data).then((result) => { - if (result) { - // console.log(url) - // console.log("作品列表6789077") - // console.log(JSON.stringify(result)) - this.setState({ - teacherdata: result.data, - task_status: result.data.task_status, - allow_late:result.data.allow_late, - course_group_info: result.data.course_group_info, - loadingstate: false, - jobsettingsdata: result, - publish_immediately: result.data.publish_immediately, - work_efficiency: result.data.work_efficiency, - end_immediately: result.data.end_immediately, - code_review: result.data.code_review, - challenges_count:result.data.challenges_count, - }) - this.props.Getdataback(result,result.data); - this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1); - } + if (result) { + // console.log(url) + // console.log("作品列表6789077") + // console.log(JSON.stringify(result)) + this.setState({ + teacherdata: result.data, + task_status: result.data.task_status, + allow_late:result.data.allow_late, + course_group_info: result.data.course_group_info, + loadingstate: false, + jobsettingsdata: result, + publish_immediately: result.data.publish_immediately, + work_efficiency: result.data.work_efficiency, + end_immediately: result.data.end_immediately, + code_review: result.data.code_review, + challenges_count:result.data.challenges_count, + }) + this.props.Getdataback(result,result.data); + this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1); + } }).catch((error) => { console.log(error) this.setState({ @@ -1559,22 +1559,22 @@ class Listofworksstudentone extends Component { // console.log(url) // console.log("作品列表______________________") // console.log(JSON.stringify(result)) - if (result !== undefined) { - this.setState({ - teacherdata: result.data, - task_status: result.data.task_status, - course_group_info: result.data.course_group_info, - loadingstate: false, - jobsettingsdata: result, - allow_late:result.data.allow_late, - publish_immediately: result.data.publish_immediately, - work_efficiency: result.data.work_efficiency, - end_immediately: result.data.end_immediately, - code_review: result.data.code_review, - challenges_count:result.data.challenges_count, - }) - this.props.Getdataback(result,result.data); - this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page); + if (result !== undefined) { + this.setState({ + teacherdata: result.data, + task_status: result.data.task_status, + course_group_info: result.data.course_group_info, + loadingstate: false, + jobsettingsdata: result, + allow_late:result.data.allow_late, + publish_immediately: result.data.publish_immediately, + work_efficiency: result.data.work_efficiency, + end_immediately: result.data.end_immediately, + code_review: result.data.code_review, + challenges_count:result.data.challenges_count, + }) + this.props.Getdataback(result,result.data); + this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page); // } } }).catch((error) => { @@ -1591,7 +1591,7 @@ class Listofworksstudentone extends Component { // 设置数据 seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => { - debugger + debugger let {page, limit} = this.state; let datalist = []; let columns = this.state.columns; @@ -2216,81 +2216,81 @@ class Listofworksstudentone extends Component { return ( this.props.isAdmin() === true ? -
- {visible === true ? this.saveModulationModal(value, num)} - /> : ""} - - {this.state.showmodel === true ? this.hideshowmodel()} - updatas={() => this.isupdatas()} - /> : ""} - - - {visibles === true ? -
- - this.cancelModulationModels()} - /> - -
- : "" - } - - {/*立即发布*/} - this.getcourse_groupslist(id)} - starttimes={this.state.starttimes} - typs={this.state.typs} - /> -
- - -
+ } + + this.cancelModulationModels()} + /> +
+ : "" + } - - {computeTimetype===false?
  • + + {computeTimetype===false?
  • 正在执行成绩计算，请稍后刷新页面查看结果 温馨提示：执行时间因作品数量而异 -
    • :""} - - {/*作品状态GraduationTaskssettinglist*/} -
      -
    • - 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - - {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": - {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "": - computeTimetype===true&&this.props.isNotMember()===false?
      - 计算成绩 -
      :
      - 计算成绩 -
      } -       } - -
      - this.onSearchKeywordKeyUpt(e)} - onInput={this.inputSearchValuest} - onSearch={this.searchValuest} - > -
      -
      • + :""} + + {/*作品状态GraduationTaskssettinglist*/} +
        +
      • + 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} + + {teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true? + (this.props.isNotMember()===false?
        + 计算成绩 +
        :""): + teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": + (this.props.isNotMember()===false?
        + 计算成绩 +
        :"") + } +         + +
        + this.onSearchKeywordKeyUpt(e)} + onInput={this.inputSearchValuest} + onSearch={this.searchValuest} + > +
        +
        • -
      • +
      • - 作品状态： - this.notlimiteds()}>不限 - this.funtaskstatust(e, task_status && task_status)} - style={{paddingTop: '4px'}}> + 作品状态： + this.notlimiteds()}>不限 + this.funtaskstatust(e, task_status && task_status)} + style={{paddingTop: '4px'}}> - {task_status === undefined ? "" : task_status.map((item, key) => { - return ( - + {task_status === undefined ? "" : task_status.map((item, key) => { + return ( + {item.name} ({item.count}) - ) - })} - - {/*请输入姓名或学号搜索*/} - - -
        • - - - {/*分班情况*/} - -
      • - {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : -
        - 分班情况： - this.notlimitedst()}>不限 - this.funtaskstatustwot(e, course_group_info && course_group_info)} - style={{paddingTop: '4px',width:'1017px'}}> - {course_group_info === undefined ? "" : - course_group_info.map((item, key) => { - return ( - + ) + })} + + {/*请输入姓名或学号搜索*/} + + +
        • + + + {/*分班情况*/} + +
      • + {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : +
        + 分班情况： + this.notlimitedst()}>不限 + this.funtaskstatustwot(e, course_group_info && course_group_info)} + style={{paddingTop: '4px',width:'1017px'}}> + {course_group_info === undefined ? "" : + course_group_info.map((item, key) => { + return ( + {item.group_group_name} ({item.count}) - ) - }) - } - -
        } -
        • + ) + }) + } + +
    } + - + -
    +
    -
    +
    {teacherdata === undefined ? "" : teacherdata.student_works.length}个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） - - - - + } + + +
    - { - JSON.stringify(data) === "[]" ? -
    -
    -
    - -

    没有数据可以显示.！

    -
    -
    +
    + { + JSON.stringify(data) === "[]" ? +
    +
    +
    + +

    没有数据可以显示.！

    +
    - : -
    - -
    - {data === undefined ? "" : } - +
    + {data === undefined ? "" :
    } - } - - - - { - teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
    -
    - : "" } - + + + { + teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? +
    + +
    + : "" + } - : + + + :
    { teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ? @@ -2631,15 +2633,21 @@ class Listofworksstudentone extends Component { 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": - - {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "": - computeTimetype===true&&this.props.isNotMember()===false?
    - 计算成绩 -
    :
    - 计算成绩 -
    } -     } - + {computeTimetype===true? + (this.props.isNotMember()===false? +
    + 计算成绩 +
    + :"") + : + (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": + this.props.isNotMember()===false? +
    + 计算成绩 +
    + :"") + } + }
    @@ -2792,16 +2800,17 @@ class Listofworksstudentone extends Component {
    计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": - - {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status===0?"": - this.props.isNotMember()===false&&computeTimetype===true?
    - 计算成绩 -
    :
    - 计算成绩 -
    } -     - } + {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": + {computeTimetype===true? + (this.props.isNotMember()===false?
    + 计算成绩 +
    :""): + teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": + (this.props.isNotMember()===false?
    + 计算成绩 +
    :"") + } +     }
    {/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/} From 64c934ce7ad995017ac5f92d28d68492483b50ae 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, 20 Jul 2019 19:07:14 +0800 Subject: [PATCH 04/45] =?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 | 2 +- .../react/src/modules/login/LoginDialog.css | 4 ++ .../src/modules/login/Trialapplication.js | 2 +- .../src/modules/login/Trialapplicationysl.js | 64 +++++++++---------- public/react/src/modules/tpm/NewHeader.js | 4 +- .../src/modules/user/FindPasswordComponent.js | 23 ++++--- public/react/src/modules/user/common.css | 8 +-- 7 files changed, 59 insertions(+), 48 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 1c9b22602..704e4995b 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1591,7 +1591,7 @@ class Listofworksstudentone extends Component { // 设置数据 seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => { - debugger + let {page, limit} = this.state; let datalist = []; let columns = this.state.columns; diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css index b36533154..34a711154 100644 --- a/public/react/src/modules/login/LoginDialog.css +++ b/public/react/src/modules/login/LoginDialog.css @@ -122,4 +122,8 @@ border-radius: 4px; letter-spacing: 2px; cursor: pointer; +} +.myinput{ + display: flex; + justify-content: center; } \ No newline at end of file diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index 02116ce7d..3f375eb18 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -7,7 +7,7 @@ import Dialog, { DialogTitle, } from 'material-ui/Dialog'; import axios from 'axios'; - +import './LoginDialog.css' import {broadcastChannelPostMessage} from 'educoder' import {Tabs, Input, Checkbox, Button, notification, Menu} from 'antd'; diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index f38804810..c6458e16f 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -24,7 +24,7 @@ class Trialapplicationysl extends Component { codes: "", reason: "", Phonenumberisnotcoreason: undefined, - isRenders: false, + isRenders: true, seconds: 60, getverificationcodes: true, Phonenumberisnotco: undefined, @@ -44,37 +44,37 @@ class Trialapplicationysl extends Component { Cancel = () => { // this.props.Cancel() } - - componentWillReceiveProps(nextProps) { - // console.log("46"); - // console.log(nextProps); - // console.log(this.props); - // if (nextProps.user != this.props.user) { - // // console.log("50"); - // // console.log(nextProps.user); - // if (nextProps.user !== undefined) { - // // console.log("53"); - // // console.log(nextProps.user); - // this.setState({ - // user_phone_binded: nextProps.user.user_phone_binded, - // }) - // } - // - // - // } - - - } - getipthon=()=>{ + // + // componentWillReceiveProps(nextProps) { + // // console.log("46"); + // // console.log(nextProps); + // // console.log(this.props); + // // if (nextProps.user != this.props.user) { + // // // console.log("50"); + // // // console.log(nextProps.user); + // // if (nextProps.user !== undefined) { + // // // console.log("53"); + // // // console.log(nextProps.user); + // // this.setState({ + // // user_phone_binded: nextProps.user.user_phone_binded, + // // }) + // // } + // // + // // + // // } + // + // + // } + getipthon=()=>{ // console.log("Trialapplicationysl"); // console.log("70"); let url = `/users/get_user_info.json` axios.get(url).then((result)=> { console.log(result); if(result){ - this.setState({ - user_phone_binded:result.data.user_phone_binded, - }) + this.setState({ + user_phone_binded:result.data.user_phone_binded, + }) } }).catch((error)=>{ console.log(error) @@ -86,7 +86,7 @@ class Trialapplicationysl extends Component { // console.log("53"); // // console.log(this.props.isRenders); - this.getipthon(); + this.getipthon(); if (this.props.isRenders != undefined) { this.setState({ isRenders: this.props.isRenders @@ -289,11 +289,11 @@ class Trialapplicationysl extends Component { if(result !== undefined){ this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); // if (this.state.showTrial === false) { - window.location.href = "/"; - this.setState({ - isRenders: false - }) - this.Cancel(); + window.location.href = "/"; + this.setState({ + isRenders: false + }) + this.Cancel(); // } else { // this.setState({ // isRenders: false diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 125a96e85..4e61101e3 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -18,7 +18,7 @@ import Addcourses from '../courses/coursesPublic/Addcourses'; import LoginDialog from '../login/LoginDialog'; -import Trialapplicationysl from '../login/Trialapplicationysl' +import Trialapplication from '../login/Trialapplication' import 'antd/lib/modal/style/index.css'; @@ -636,7 +636,7 @@ submittojoinclass=(value)=>{ {/* />*/} {/* :""*/} {/*}*/} - {/* this.cancelModulationModels()} >*/} + {/* this.cancelModulationModels()} >*/}
    {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js index cba049041..7df2d82c5 100644 --- a/public/react/src/modules/user/FindPasswordComponent.js +++ b/public/react/src/modules/user/FindPasswordComponent.js @@ -43,6 +43,7 @@ class LoginRegisterComponent extends Component { Whethertoverify:false, modalsType:false, pciphone:true, + boolyzm:false, } } @@ -213,7 +214,10 @@ class LoginRegisterComponent extends Component { }) return } - + if (this.state.password !== this.state.passwords==="") { + this.openNotification(`两次输入的密码不一致`); + return + } else if (this.state.password !==undefined&&this.state.password.length>0&&this.state.password.length<8){ this.setState({ Phonenumberisnotcosmmm:"密码不能少于8位", @@ -236,13 +240,6 @@ class LoginRegisterComponent extends Component { }) return } - if (this.state.password !== this.state.passwords) { - this.setState({ - Phonenumberisnotcosmmm:"两次输入的密码不一致", - Phonenumberisnotcosymmmm:"两次输入的密码不一致", - }) - return - } if (this.state.codes === undefined|| this.state.codes.length ===0 || this.state.codes === "") { this.setState({ Phonenumberisnotcosyzm:"验证码不能为空" @@ -271,6 +268,12 @@ class LoginRegisterComponent extends Component { Phonenumberisnotcosyzm:"验证码不正确", }) + return; + }else if(result.data.message==="1小时内同一手机号发送次数超过限制"){ + this.setState({ + boolyzm:true, + }) + this.openNotification(result.data.message); return; }else { this.openNotification(result.data.message); @@ -311,6 +314,7 @@ class LoginRegisterComponent extends Component { login: stirngt, Phonenumberisnotco:undefined, dragOk:false, + boolyzm:false, Whethertoverify:this.state.Whethertoverify===true?false:true, }) } @@ -505,6 +509,7 @@ class LoginRegisterComponent extends Component { codes, Whethertoverify, pciphone, + boolyzm, } = this.state // height: 346px; return ( @@ -667,11 +672,13 @@ class LoginRegisterComponent extends Component { : } diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css index f88bde127..4549fdfe9 100644 --- a/public/react/src/modules/user/common.css +++ b/public/react/src/modules/user/common.css @@ -1,7 +1,7 @@ -.login_register_content, .login_register_content .ant-tabs-tabpane { - display: flex; - justify-content: center; -} +/*.login_register_content, .login_register_content .ant-tabs-tabpane {*/ +/* display: flex;*/ +/* justify-content: center; */ +/*}*/ .login_register_content .ant-input { background:rgb(244,244,244); } From c151fa3e1b5820f5d03d941593497c9c7573a463 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, 20 Jul 2019 19:11:26 +0800 Subject: [PATCH 05/45] =?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 | 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 945d5ede9..6dc407c5f 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -138,7 +138,7 @@ class ShixunWorkReport extends Component { {/*{this.props.isAdmin()?导出实训报告数据:""}*/} {this.props.isAdmin() ? this.confirmysl(`/zip/shixun_report?homework_common_id=${homeworkid}`)} + onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} >导出实训报告数据 : ""}
    From fd7570f5718634388093ed17751a865a9e2259f6 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 19:16:35 +0800 Subject: [PATCH 06/45] sp --- public/react/src/search/SearchPage.js | 28 +++++++++++++++++---------- public/react/src/search/searchc.css | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js index 59fee95e9..37a06e8d8 100644 --- a/public/react/src/search/SearchPage.js +++ b/public/react/src/search/SearchPage.js @@ -218,10 +218,15 @@ class SearchPage extends Component{
    {/*挑战名字*/} + + {item.content.challenge_names === undefined || item.content.challenge_names===0?"": item.content.challenge_names.map((item5, key5) => { return ( - + 关卡名称： + +
    ) }) } @@ -231,8 +236,11 @@ class SearchPage extends Component{ {/*挑战标签*/} {item.content.challenge_tag_names === undefined || item.content.challenge_tag_names===0?"": item.content.challenge_tag_names.map((item6, key6) => { return ( - 1?"markdown-body tzbq ":"markdown-body tzbqx"} - dangerouslySetInnerHTML={{__html:item6}} /> +
    + 关卡标签： + 1?" tzbq ":" tzbqx"} + dangerouslySetInnerHTML={{__html:item6}} /> +
    ) }) } @@ -260,44 +268,44 @@ class SearchPage extends Component{ {/* */} - {item.author_name} + {item.author_name}    {item.author_school_name} {!!item.challenges_count && - + {/* */} 任务: {item.challenges_count} } {!!item.study_count && - + {/* */} 学习人数: {item.study_count} } {!!item.stage_shixuns_count && - + {/* */} 实训数: {item.stage_shixuns_count} } {type == 'subject' && !!item.visits_count && - + {/* */} 访问数: {item.visits_count} } {!!item.members_count && - + {/* */} 成员数: {item.members_count} } {!!item.all_replies_count && - + {/* */} 回复数:{item.all_replies_count} } diff --git a/public/react/src/search/searchc.css b/public/react/src/search/searchc.css index 4b31e7c5d..99f35738a 100644 --- a/public/react/src/search/searchc.css +++ b/public/react/src/search/searchc.css @@ -113,7 +113,7 @@ margin-left: 68px; } .tzbqx{ - margin-left: 24px; + /* margin-left: 24px; */ } .bjyss{ background: #F8F8F8; From 07919262cb7396e931f7bece18594d4bb1125ad2 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, 20 Jul 2019 19:18:28 +0800 Subject: [PATCH 07/45] =?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/login/Trialapplicationysl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index c6458e16f..a666353aa 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -24,7 +24,7 @@ class Trialapplicationysl extends Component { codes: "", reason: "", Phonenumberisnotcoreason: undefined, - isRenders: true, + isRenders: false, seconds: 60, getverificationcodes: true, Phonenumberisnotco: undefined, From 0064fe607320cabfa7b5b72bd6ca015cf1097d56 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, 20 Jul 2019 19:33:46 +0800 Subject: [PATCH 08/45] =?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/login/Trialapplicationysl.js | 40 +++++++++---------- .../modules/user/LoginRegisterComponent.js | 13 +++++- public/react/src/modules/user/common.css | 4 +- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index a666353aa..2b369ef7f 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -45,26 +45,26 @@ class Trialapplicationysl extends Component { // this.props.Cancel() } // - // componentWillReceiveProps(nextProps) { - // // console.log("46"); - // // console.log(nextProps); - // // console.log(this.props); - // // if (nextProps.user != this.props.user) { - // // // console.log("50"); - // // // console.log(nextProps.user); - // // if (nextProps.user !== undefined) { - // // // console.log("53"); - // // // console.log(nextProps.user); - // // this.setState({ - // // user_phone_binded: nextProps.user.user_phone_binded, - // // }) - // // } - // // - // // - // // } - // - // - // } + componentWillReceiveProps(nextProps) { + // console.log("46"); + // console.log(nextProps); + // console.log(this.props); + if (nextProps.user != this.props.user) { + // console.log("50"); + // console.log(nextProps.user); + if (nextProps.user !== undefined) { + // console.log("53"); + // console.log(nextProps.user); + this.setState({ + user_phone_binded: nextProps.user.user_phone_binded, + }) + } + + + } + + + } getipthon=()=>{ // console.log("Trialapplicationysl"); // console.log("70"); diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index cf93a781b..9281d228c 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -718,8 +718,17 @@ class LoginRegisterComponent extends Component { console.log(classpass); return ( -
    - +
    +
    diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css index 4549fdfe9..0e00b623d 100644 --- a/public/react/src/modules/user/common.css +++ b/public/react/src/modules/user/common.css @@ -1,6 +1,6 @@ /*.login_register_content, .login_register_content .ant-tabs-tabpane {*/ -/* display: flex;*/ -/* justify-content: center; */ +/* !*display: flex;*!*/ +/* justify-content: center;*/ /*}*/ .login_register_content .ant-input { background:rgb(244,244,244); From 7615aca84886a33f05c3cf8662074b696763376b Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 19:45:19 +0800 Subject: [PATCH 09/45] comm --- public/react/src/modules/courses/coursesHome/coursesHome.js | 4 ++-- public/react/src/modules/tpm/shixuns/ShixunCardList.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/coursesHome/coursesHome.js b/public/react/src/modules/courses/coursesHome/coursesHome.js index a0b724460..8f139c9bd 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHome.js +++ b/public/react/src/modules/courses/coursesHome/coursesHome.js @@ -114,14 +114,14 @@ class coursesHome extends Component{ onClick={ () => this.changeStatus("course_members_count")}>最热
    - + > */}
    diff --git a/public/react/src/modules/tpm/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js index 7d98c2208..2125eecea 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js +++ b/public/react/src/modules/tpm/shixuns/ShixunCardList.js @@ -214,7 +214,7 @@ class ShixunCardList extends Component { {/*enterButton*/} {/*/>*/} - this.Input_search(value)} autoComplete="off" - > + > */}
    { From 9064c9f7fab0f91abe71694361797a0b5dddc590 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, 20 Jul 2019 19:57:46 +0800 Subject: [PATCH 10/45] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/login/Trialapplication.js | 4 ++-- public/react/src/modules/login/Trialapplicationysl.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index 3f375eb18..bed10c38b 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -278,13 +278,13 @@ class Trialapplication extends Component { isRenders: false }) this.Cancel(); - + this.handleDialogClose() } else { this.setState({ isRenders: false }) this.Cancel(); - + this.handleDialogClose() } } }).catch((error) => { diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index 2b369ef7f..4ccb655b6 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -294,6 +294,7 @@ class Trialapplicationysl extends Component { isRenders: false }) this.Cancel(); + this.handleDialogClose() // } else { // this.setState({ // isRenders: false From 5b4da3d94d4d657c7412a0d41653ac2b67706272 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, 20 Jul 2019 20:04:14 +0800 Subject: [PATCH 11/45] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/login/Trialapplication.js | 6 ++---- public/react/src/modules/login/Trialapplicationysl.js | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index bed10c38b..c40f14bdc 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -216,13 +216,13 @@ class Trialapplication extends Component { this.setState({ isRenders: false }) - this.Cancel(); + this.handleDialogClose() window.location.href = "/"; } else { this.setState({ isRenders: false }) - this.Cancel(); + this.handleDialogClose() } } @@ -277,13 +277,11 @@ class Trialapplication extends Component { this.setState({ isRenders: false }) - this.Cancel(); this.handleDialogClose() } else { this.setState({ isRenders: false }) - this.Cancel(); this.handleDialogClose() } } diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index 4ccb655b6..02e7dc81b 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -293,7 +293,7 @@ class Trialapplicationysl extends Component { this.setState({ isRenders: false }) - this.Cancel(); + // this.Cancel(); this.handleDialogClose() // } else { // this.setState({ From 24133693e31262ed56e454f0812c2d09001cad58 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, 20 Jul 2019 20:27:11 +0800 Subject: [PATCH 12/45] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 46 +++++++++++++++++++ .../shixunHomework/ShixunHomeworkPage.js | 44 +++--------------- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 704e4995b..67afa0414 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2201,8 +2201,48 @@ class Listofworksstudentone extends Component { // // } + daochushixunbaogao=()=>{ + } + + + + confirmysl(url){ + axios.get(url).then((response) => { + if(response.data.status&&response.data.status===-1){ + + }else if(response.data.status&&response.data.status===-2){ + if(response.data.messages === "100"){ + // 已超出文件导出的上限数量（100 ），建议： + + this.setState({ + DownloadType:true, + DownloadMessageval:100 + }) + }else { + //因附件资料超过500M + this.setState({ + DownloadType:true, + DownloadMessageval:500 + }) + } + }else { + this.props.showNotification(`正在下载中`); + window.open("/api"+url, '_blank'); + } + }).catch((error) => { + console.log(error) + }); + } + + + Downloadcal=()=>{ + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { let {columns,course_groupysls,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; @@ -2232,7 +2272,13 @@ class Listofworksstudentone extends Component { updatas={() => this.isupdatas()} /> : ""} + {visibles === true ?
    - {datalist === undefined ? "" :
    +
    + +

    暂无数据哦~

    +
    + :
    { - datalist === undefined ? "":datalist.length<11? + datalist === undefined ? "":datalist.length===0?"":datalist.length<11?
    ; From ff40ae2b7740badfbea7d7a9a8d0d4e75f1692b5 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, 20 Jul 2019 21:49:21 +0800 Subject: [PATCH 24/45] =?UTF-8?q?=20=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 -- .../src/modules/courses/shixunHomework/ShixunStudentWork.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 112193d2e..60f84b0da 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -115,8 +115,6 @@ class ShixunHomeworkPage extends Component { const isAdmin = this.props.isAdmin(); - console.log(this.props) - console.log(this.state) return (
    diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 08cc0c1c3..d4e1855ed 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -815,7 +815,7 @@ class ShixunStudentWork extends Component { top: 72%;} } `} - + {datalist === undefined ? "" : datalist.length===0?
    From 3b43f494eadeaf4abcb3944928aca333dcbfb7ef Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 21:51:34 +0800 Subject: [PATCH 25/45] - --- public/react/src/modules/paths/ShixunPathSearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index 4ff7c6d97..c37754d62 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -117,14 +117,14 @@ class ShixunPathSearch extends Component{ this.changeStatus("updated_at")}>最新 this.changeStatus("myshixun_count")}>最热
    - + > */}
    From 5d8f27e1248e73ed9372cdf8ec89979e0117f5e4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 20 Jul 2019 21:52:09 +0800 Subject: [PATCH 26/45] =?UTF-8?q?=E5=BB=B6=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/exercise/Exercisestatisticalresulttabel.js | 3 ++- .../react/src/modules/courses/exercise/Exercisetablesmubu.js | 3 ++- .../shixunHomework/Shixunworkdetails/ShixunCustomsPass.js | 3 ++- .../shixunHomework/shixunreport/OfficialAcademicTranscript.js | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js index 2a04e1978..7f221ee55 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js @@ -141,7 +141,8 @@ class OfficialAcademicTranscript extends Component { border-radius: 12px; color: rgba(221,23,23,1); display: inline-block; - line-height: 24px; + line-height: 24px; + text-align: center; } .tasknameboxs{ diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js index 2a7bc3f13..6a62db36c 100644 --- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js +++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js @@ -100,7 +100,8 @@ class Exercisetablesmubus extends Component { border-radius: 12px; color: rgba(221,23,23,1); display: inline-block; - line-height: 24px; + line-height: 24px; + text-align: center; } .tasknameboxs{ diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js index 8d3fcabb6..10ec2e40f 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js @@ -153,7 +153,8 @@ class ShixunCustomsPass extends Component { border-radius: 12px; color: rgba(221,23,23,1); display: inline-block; - line-height: 24px; + line-height: 24px; + text-align: center; } .ant-table-tbody > tr > td{ font-size:14px; diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js index f0a7ff941..c7c3b67e4 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js @@ -142,7 +142,8 @@ class OfficialAcademicTranscript extends Component { border-radius: 12px; color: rgba(221,23,23,1); display: inline-block; - line-height: 24px; + line-height: 24px; + text-align: center; } .tasknameboxs{ From fea89bedad3d5ce666586639fc306dbb65794ca7 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, 20 Jul 2019 22:02:47 +0800 Subject: [PATCH 27/45] =?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 | 25 +++++++++++++++---- .../shixunHomework/ShixunHomeworkPage.js | 1 + .../shixunHomework/ShixunStudentWork.js | 18 +++++++++++++ .../shixunHomework/Trainingjobsetting.js | 17 +++++++++++++ .../shixunHomework/Workquestionandanswer.js | 18 +++++++++++++ 5 files changed, 74 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 0b3c1b338..4ddc71bd0 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -899,6 +899,7 @@ class Listofworksstudentone extends Component { ) }, ], + yslpros:false, } // console.log("902"); // console.log("902"); @@ -912,15 +913,26 @@ class Listofworksstudentone extends Component { } componentWillReceiveProps(nextProps) { - console.log("+++++++++913"); - console.log("+++++++++915"); - console.log("+++++++++916"); - console.log(nextProps); - console.log(this.props) + // console.log("+++++++++916"); + // console.log(nextProps); + // console.log(this.props) + // console.log(this.props.isAdmin()); + if (nextProps.code_review != this.props.code_review) { + if (nextProps.code_review !== undefined) { + console.log("diaoyonglwangluo1"); + if(this.props.isAdmin() === true){ + this.tearchar(); + }else{ + this.student(); + } + } + } } componentDidMount() { console.log("componentDidMount"); + + console.log(this.props.isAdmin()); if(this.props.isAdmin() === true){ this.tearchar(); // console.log("909"); @@ -2217,6 +2229,9 @@ class Listofworksstudentone extends Component { confirmysl(url){ axios.get(url).then((response) => { + if(response === undefined){ + return + } if(response.data.status&&response.data.status===-1){ }else if(response.data.status&&response.data.status===-2){ diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index bc20bb254..2996c794d 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -32,6 +32,7 @@ class ShixunHomeworkPage extends Component { visible: false, showmodel:false, child:undefined, + yslpros:false, } } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index ad71fc6a4..fb0c44adf 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -81,6 +81,21 @@ class ShixunStudentWork extends Component { this.props.triggerRef(this); this.getTrainingjobsettings(); } + componentWillReceiveProps(nextProps) { + // console.log("+++++++++916"); + // console.log(nextProps); + // console.log(this.props) + // console.log(this.props.isAdmin()); + if (nextProps.code_review != this.props.code_review) { + if (nextProps.code_review !== undefined) { + console.log("diaoyonglwangluo1"); + this.getTrainingjobsettings(); + } + } + + } + + getTrainingjobsettings=()=>{ this.getupdata(); this.getTrainingjobsetting(); @@ -523,6 +538,9 @@ class ShixunStudentWork extends Component { confirmysl(url){ axios.get(url).then((response) => { + if(response === undefined){ + return + } if(response.data.status&&response.data.status===-1){ }else if(response.data.status&&response.data.status===-2){ diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 16d5e2a04..3809940e2 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -141,6 +141,20 @@ class Trainingjobsetting extends Component { + } + componentWillReceiveProps(nextProps) { + // console.log("+++++++++916"); + // console.log(nextProps); + // console.log(this.props) + // console.log(this.props.isAdmin()); + if (nextProps.code_review != this.props.code_review) { + if (nextProps.code_review !== undefined) { + console.log("diaoyonglwangluo4"); + this.getTrainingjobsetting() + + } + } + } // 获取数据地方 @@ -1744,6 +1758,9 @@ class Trainingjobsetting extends Component { confirmysl(url){ axios.get(url).then((response) => { + if(response === undefined){ + return + } if(response.data.status&&response.data.status===-1){ }else if(response.data.status&&response.data.status===-2){ diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index a65346770..46f4835de 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -94,6 +94,21 @@ class Workquestionandanswer extends Component { shixuntypes: type[3] }) } + componentWillReceiveProps(nextProps) { + // console.log("+++++++++916"); + // console.log(nextProps); + // console.log(this.props) + // console.log(this.props.isAdmin()); + if (nextProps.code_review != this.props.code_review) { + if (nextProps.code_review !== undefined) { + console.log("diaoyonglwangluo2"); + var homeworkid = this.props.match.params.homeworkid; + // console.log(homeworkid) + this.Gettitleinformation(homeworkid) + } + } + + } isupdatas = () => { var homeworkid = this.props.match.params.homeworkid; @@ -333,6 +348,9 @@ class Workquestionandanswer extends Component { confirmysl(url){ axios.get(url).then((response) => { + if(response === undefined){ + return + } if(response.data.status&&response.data.status===-1){ }else if(response.data.status&&response.data.status===-2){ From 15545fab0f64aa7ea78398d1cc6767d6a1942eef Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 20 Jul 2019 22:09:15 +0800 Subject: [PATCH 28/45] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/css/Courses.css | 4 ++-- .../src/modules/user/account/AccountCertification.js | 8 +++++--- .../src/modules/user/modal/RealNameCertificationModal.js | 6 +----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 5766c571c..8b768aa88 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -801,10 +801,10 @@ a.white-btn.use_scope-btn:hover{ position: absolute; } -.ant-input{ +.ant-input,.ant-input .ant-input-suffix{ background-color: #fafafa!important; } -.ant-input:focus{ +.ant-input:focus,.ant-input:focus .ant-input-suffix{ background-color:#ffffff!important; } diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js index bd5c0ce10..c72778ced 100644 --- a/public/react/src/modules/user/account/AccountCertification.js +++ b/public/react/src/modules/user/account/AccountCertification.js @@ -16,7 +16,7 @@ class AccountCertification extends Component { showRealNameCertificationModal = (index) => { this.setState({ - certification:index + certification:index, }) this.realNameCertificationModal.setVisible(true) } @@ -25,9 +25,11 @@ class AccountCertification extends Component { let {basicInfo} = this.props; return (
    - this.realNameCertificationModal = form} certification={certification} - > + >: this.realNameCertificationModal = form} certification={certification} + >}
    -
    认证信息
    -
    -
    -
    实名认证
    -
    有些课程需要实名认证才能加入哟，还能获得500金币的奖励~
    -
    - { - basicInfo && basicInfo.authentication =="uncertified" ? - this.showRealNameCertificationModal(1)} >立即认证: - basicInfo && basicInfo.authentication =="applying" ? 待审核: - 已认证 - } -
    -
    - -
    -
    职业认证
    -
    教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..
    -
    - { - basicInfo && basicInfo.professional_certification =="uncertified" ? - this.showRealNameCertificationModal(2)} >立即认证: - basicInfo && basicInfo.professional_certification =="applying" ? 待审核: - 已认证 - } -
    -
    -
    -
    -
    * 我们确保你所提供的信息均处于严格保密状态，不会泄露
    -
    - ); - } -} - -export default AccountCertification; +import React, { Component } from 'react'; +// import { Button } from 'antd' +import { WordsBtn, getImageUrl } from 'educoder'; +import RealNameCertificationModal from '../modal/RealNameCertificationModal' +import '../../courses/css/Courses.css' +import {CNotificationHOC} from '../../courses/common/CNotificationHOC' + + +class AccountCertification extends Component { + constructor(props){ + super(props); + this.state={ + certification:1 + } + } + + showRealNameCertificationModal = (index) => { + this.setState({ + certification:index, + }) + this.realNameCertificationModal.setVisible(true) + } + render() { + let {certification}=this.state + let {basicInfo} = this.props; + return ( +
    + {this.state.certification===1? this.realNameCertificationModal = form} certification={certification} + >:""} + + {this.state.certification===2? this.realNameCertificationModal = form} certification={certification} + >:""} +
    + +
    认证信息
    +
    +
    +
    实名认证
    +
    有些课程需要实名认证才能加入哟，还能获得500金币的奖励~
    +
    + { + basicInfo && basicInfo.authentication =="uncertified" ? + this.showRealNameCertificationModal(1)} >立即认证: + basicInfo && basicInfo.authentication =="applying" ? 待审核: + 已认证 + } +
    +
    + +
    +
    职业认证
    +
    教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..
    +
    + { + basicInfo && basicInfo.professional_certification =="uncertified" ? + this.showRealNameCertificationModal(2)} >立即认证: + basicInfo && basicInfo.professional_certification =="applying" ? 待审核: + 已认证 + } +
    +
    +
    +
    +
    * 我们确保你所提供的信息均处于严格保密状态，不会泄露
    +
    + ); + } +} + +export default AccountCertification; From 98c45b524a9087a938ca2aea0d1657fc3ab124a1 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, 20 Jul 2019 22:27:06 +0800 Subject: [PATCH 31/45] =?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/Listofworksstudentone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 4ddc71bd0..82aa2eb7a 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2536,7 +2536,7 @@ class Listofworksstudentone extends Component {
    -

    没有数据可以显示.！

    +

    没有数据可以显示！

    From 8d8ee7351010a8c47aac641ae4ecf9631047ab3f 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, 20 Jul 2019 22:28:10 +0800 Subject: [PATCH 32/45] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 6 +++--- .../courses/shixunHomework/ShixunHomeworkPage.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 4ddc71bd0..c23b9b674 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -932,7 +932,7 @@ class Listofworksstudentone extends Component { componentDidMount() { console.log("componentDidMount"); - console.log(this.props.isAdmin()); + // console.log(this.props.isAdmin()); if(this.props.isAdmin() === true){ this.tearchar(); // console.log("909"); @@ -1109,7 +1109,7 @@ class Listofworksstudentone extends Component { }) } else { - console.log(teacherdata) + // console.log(teacherdata) if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") { // console.log("seacthdata设置数据1") // console.log(this.state.teacherdata ) @@ -1611,7 +1611,7 @@ class Listofworksstudentone extends Component { let columns = this.state.columns; var columns2=[]; if (teacherdata !== undefined) { - console.log("1588"); + // console.log("1588"); for (var i = 0; i < student_works.length; i++) { var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm'); datalist.push({ diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index fc8fba188..1dd814856 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -54,9 +54,9 @@ class ShixunHomeworkPage extends Component { } Getdataback = (jobsettingsdata, teacherdata) => { - console.log("56"); - console.log(jobsettingsdata); - console.log(teacherdata); + // console.log("56"); + // console.log(jobsettingsdata); + // console.log(teacherdata); this.setState({ jobsettingsdata: jobsettingsdata, @@ -72,13 +72,13 @@ class ShixunHomeworkPage extends Component { // let sum = [] // sum.push(type[1]) // console.log("componentDidMountcomponentDidMount"); - console.log(type); + // console.log(type); this.setState({ tab: type[1], }) let querys = this.props.location.pathname; const types = querys.split('/'); - console.log(types); + // console.log(types); this.setState({ shixuntypes: types[3] }) From e51192ed5f41f206ffdec4f469467970ec91808c 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, 20 Jul 2019 22:38:19 +0800 Subject: [PATCH 33/45] =?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/user/usersInfo/InfosCourse.js | 406 +++++++++--------- 1 file changed, 204 insertions(+), 202 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index 109a4d7b9..e27513963 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -1,203 +1,205 @@ -import React, { Component } from 'react'; -import { SnackbarHOC } from 'educoder'; -import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; -import {Tooltip,Menu,Pagination,Spin} from 'antd'; -import Loadable from 'react-loadable'; -import Loading from '../../../Loading'; -import axios from 'axios'; -import NoneData from '../../courses/coursesPublic/NoneData' -import {getImageUrl} from 'educoder'; -import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; -import { CNotificationHOC } from '../../courses/common/CNotificationHOC' -import "./usersInfo.css" -import Create from './publicCreatNew' - -class InfosCourse extends Component{ - constructor(props){ - super(props); - this.state={ - category:undefined, - status:undefined, - page:1, - per_page:16, - - totalCount:undefined, - data:undefined, - isSpin:false - } - } - - componentDidMount=()=>{ - this.setState({ - isSpin:true - }) - let{category,status,page}=this.state; - this.getCourses(category,status,page); - } - - getCourses=(category,status,page)=>{ - let url=`/users/${this.props.match.params.username}/courses.json`; - axios.get((url),{params:{ - category, - status, - page, - per_page: this.props.is_current && category && page ==1?17:16 - }}).then((result)=>{ - if(result){ - this.setState({ - totalCount:result.data.count, - data:result.data, - isSpin:false - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - - //切换种类 - changeCategory=(cate)=>{ - this.setState({ - category:cate, - page:1, - isSpin:true - }) - let{status}=this.state; - this.getCourses(cate,status,1); - } - //切换状态 - changeStatus=(status)=>{ - this.setState({ - status:status, - page:1, - isSpin:true - }) - let{category}=this.state; - this.getCourses(category,status,1); - } - //切换页数 - changePage=(page)=>{ - this.setState({ - page, - isSpin:true - }) - let{category,status}=this.state; - this.getCourses(category,status,page); - } - - // 进入课堂 - turnToCourses=(url,flag)=>{ - if(flag){ - this.props.history.push(url); - } - } - - render(){ - let{ - category, - status, - page, - data, - totalCount, - isSpin - } = this.state; - let isStudent = this.props.isStudent(); - let is_current=this.props.is_current; - return( -
    - - - { - is_current && - - } -

    - 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"} - 时间最新 -

    -
    - { - !isStudent && page == 1 && !category && is_current && - - } - { - (!data || data.courses.length==0) && (isStudent || category) && - } - { - data && data.courses && data.courses.map((item,key)=>{ - return( -
    this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer"}}> - { - item.is_public == 1 && - -
    - - 公开 -     - } - { - item.can_visited ==false? -
    - -

    非成员不能访问

    -
    :"" - } - -
    -

    - {item.name} -

    - 用户 -

    {item.teacher && item.teacher.real_name}

    -

    {item.teacher && item.teacher.school_name}

    -
    -
    -
    - { - item.members_count > 0 && - - - {item.members_count} - - } - { - item.homework_commons_count > 0 && - - - {item.homework_commons_count} - - } - { - item.attachments_count > 0 && - - - {item.attachments_count} - - } -
    -
    -
    - ) - }) - } -
    - { - totalCount > 15 && -
    - -
    - } -     -
    - ) - } -} +import React, { Component } from 'react'; +import { SnackbarHOC } from 'educoder'; +import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; +import {Tooltip,Menu,Pagination,Spin} from 'antd'; +import Loadable from 'react-loadable'; +import Loading from '../../../Loading'; +import axios from 'axios'; +import NoneData from '../../courses/coursesPublic/NoneData' +import {getImageUrl} from 'educoder'; +import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; +import { CNotificationHOC } from '../../courses/common/CNotificationHOC' +import "./usersInfo.css" +import Create from './publicCreatNew' + +class InfosCourse extends Component{ + constructor(props){ + super(props); + this.state={ + category:undefined, + status:undefined, + page:1, + per_page:16, + + totalCount:undefined, + data:undefined, + isSpin:false + } + } + + componentDidMount=()=>{ + this.setState({ + isSpin:true + }) + let{category,status,page}=this.state; + this.getCourses(category,status,page); + } + + getCourses=(category,status,page)=>{ + let url=`/users/${this.props.match.params.username}/courses.json`; + axios.get((url),{params:{ + category, + status, + page, + per_page: this.props.is_current && category && page ==1?17:16 + }}).then((result)=>{ + if(result){ + this.setState({ + totalCount:result.data.count, + data:result.data, + isSpin:false + }) + } + }).catch((error)=>{ + console.log(error); + }) + } + + //切换种类 + changeCategory=(cate)=>{ + this.setState({ + category:cate, + page:1, + isSpin:true + }) + let{status}=this.state; + this.getCourses(cate,status,1); + } + //切换状态 + changeStatus=(status)=>{ + this.setState({ + status:status, + page:1, + isSpin:true + }) + let{category}=this.state; + this.getCourses(category,status,1); + } + //切换页数 + changePage=(page)=>{ + this.setState({ + page, + isSpin:true + }) + let{category,status}=this.state; + this.getCourses(category,status,page); + } + + // 进入课堂 + turnToCourses=(url,flag)=>{ + if(flag){ + this.props.history.push(url); + } + } + + render(){ + let{ + category, + status, + page, + data, + totalCount, + isSpin + } = this.state; + let isStudent = this.props.isStudent(); + let is_current=this.props.is_current; + + console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + return( +
    + + + { + is_current && + + } +

    + 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"} + 时间最新 +

    +
    + { + !isStudent && page == 1 && !category && is_current && + this.props.current_user&&this.props.current_user.user_identity==="学生"?"": + } + { + (!data || data.courses.length==0) && (isStudent || category) && + } + { + data && data.courses && data.courses.map((item,key)=>{ + return( +
    this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer"}}> + { + item.is_public == 1 && + +
    + + 公开 +     + } + { + item.can_visited ==false? +
    + +

    非成员不能访问

    +
    :"" + } + +
    +

    + {item.name} +

    + 用户 +

    {item.teacher && item.teacher.real_name}

    +

    {item.teacher && item.teacher.school_name}

    +
    +
    +
    + { + item.members_count > 0 && + + + {item.members_count} + + } + { + item.homework_commons_count > 0 && + + + {item.homework_commons_count} + + } + { + item.attachments_count > 0 && + + + {item.attachments_count} + + } +
    +
    +
    + ) + }) + } +
    + { + totalCount > 15 && +
    + +
    + } +     +
    + ) + } +} export default InfosCourse; \ No newline at end of file From 70a65eec18c4e7dff33fde151c684687c28cf776 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, 20 Jul 2019 22:39:52 +0800 Subject: [PATCH 34/45] =?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/user/usersInfo/InfosCourse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index e27513963..d4c82ad2f 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -104,7 +104,7 @@ class InfosCourse extends Component{ let isStudent = this.props.isStudent(); let is_current=this.props.is_current; - console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") return(
    From 9d02a4b189f26ff5fd934cde53013a605af7b422 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, 20 Jul 2019 22:58:05 +0800 Subject: [PATCH 35/45] =?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/ShixunhomeWorkItem.js | 2 +- public/react/src/modules/user/usersInfo/InfosCourse.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index e026ad622..e87af8ec4 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -373,7 +373,7 @@ class ShixunhomeWorkItem extends Component{ width:192px !important; } .homepagePostSettingbox{ - width:121px !important; + width:139px !important; } ` } diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index d4c82ad2f..146316111 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -104,7 +104,7 @@ class InfosCourse extends Component{ let isStudent = this.props.isStudent(); let is_current=this.props.is_current; - // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") return(
    From 3d2213815e3e8633311ef0f06946dfcadefd35e3 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 22:59:31 +0800 Subject: [PATCH 36/45] 54 --- .../src/modules/comment/CommentItemMDEditor.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/react/src/modules/comment/CommentItemMDEditor.css b/public/react/src/modules/comment/CommentItemMDEditor.css index 4a714f09b..8b0eb4ab6 100644 --- a/public/react/src/modules/comment/CommentItemMDEditor.css +++ b/public/react/src/modules/comment/CommentItemMDEditor.css @@ -24,6 +24,22 @@ .panel-comment_item .editor__resize { transform: translateX(-2%); + + position: absolute; + width: 120px; + height: 4px; + left: 54%; + transform: translateX(-50%); + margin-top: 2px; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + cursor: row-resize; + text-indent: 110%; + white-space: nowrap; + overflow: hidden; + text-transform: capitalize; + + box-sizing: border-box; } /*帖子回復按鈕*/ From 9b005da451c8860176fc306d5a53272f040222d6 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, 20 Jul 2019 23:03:23 +0800 Subject: [PATCH 37/45] =?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/shixunHomework/Listofworksstudentone.js | 6 +++--- .../modules/courses/shixunHomework/ShixunhomeWorkItem.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index a774d6684..2af9d6f33 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -913,9 +913,9 @@ class Listofworksstudentone extends Component { } componentWillReceiveProps(nextProps) { - // console.log("+++++++++916"); - // console.log(nextProps); - // console.log(this.props) + console.log("+++++++++916"); + console.log(nextProps); + console.log(this.props) // console.log(this.props.isAdmin()); if (nextProps.code_review != this.props.code_review) { if (nextProps.code_review !== undefined) { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index e026ad622..9ebd5cb9e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -381,7 +381,8 @@ class ShixunhomeWorkItem extends Component{ {this.props.isAdmin?:""} From 20036d9947ffc88ac8ec2aa6a6db9717c89955cb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:06:10 +0800 Subject: [PATCH 38/45] right --- public/react/src/modules/comment/CommentItemMDEditor.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/modules/comment/CommentItemMDEditor.css b/public/react/src/modules/comment/CommentItemMDEditor.css index 8b0eb4ab6..0f9c31231 100644 --- a/public/react/src/modules/comment/CommentItemMDEditor.css +++ b/public/react/src/modules/comment/CommentItemMDEditor.css @@ -47,6 +47,11 @@ a.commentsbtn.task-btn-blue { background: #4CACFF !important; } +.commentTab a.commentsbtn.task-btn-blue { + margin-right: 22px; + margin-top: 6px; +} + .editormd-grid-table-row a.editormd-emoji-btn.selected { border-bottom: 2px solid #4CACFF!important; From 49cf04286a3fc818bf6096613f667ec41b5eea77 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:09:00 +0800 Subject: [PATCH 39/45] commentTab --- public/react/src/modules/page/main/LeftView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/page/main/LeftView.js b/public/react/src/modules/page/main/LeftView.js index 428d898cb..b00319502 100644 --- a/public/react/src/modules/page/main/LeftView.js +++ b/public/react/src/modules/page/main/LeftView.js @@ -336,7 +336,7 @@ class LeftView extends Component {
    -
    +
    { loadingComments ? : From a641062931b928c14232bc20e1833f61db4a75e8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:09:57 +0800 Subject: [PATCH 40/45] u --- public/react/src/modules/courses/members/teacherList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index 92b0e0d4b..fc6b56313 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -65,7 +65,7 @@ function buildColumns(that) { sorter: showSorter, sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order, render: (name, record) => { - return 4 ? name : ''}`}>{name} } }, { From 73c391796e2ddb456a1df3d7cf8643e8a71d0c44 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 20 Jul 2019 23:14:09 +0800 Subject: [PATCH 41/45] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosCourse.js | 7 +++---- public/react/src/modules/user/usersInfo/InfosPath.js | 6 +++--- public/react/src/modules/user/usersInfo/InfosProject.js | 6 +++--- public/react/src/modules/user/usersInfo/InfosShixun.js | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index d4c82ad2f..ce708a8f8 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -101,7 +101,6 @@ class InfosCourse extends Component{ totalCount, isSpin } = this.state; - let isStudent = this.props.isStudent(); let is_current=this.props.is_current; // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") @@ -127,11 +126,11 @@ class InfosCourse extends Component{

    { - !isStudent && page == 1 && !category && is_current && - this.props.current_user&&this.props.current_user.user_identity==="学生"?"": + page == 1 && is_current && + this.props.current_user && this.props.current_user.user_identity != "学生" ? : "" } { - (!data || data.courses.length==0) && (isStudent || category) && + (!data || data.courses.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && } { data && data.courses && data.courses.map((item,key)=>{ diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js index 6e5fa247d..a7b0b95f6 100644 --- a/public/react/src/modules/user/usersInfo/InfosPath.js +++ b/public/react/src/modules/user/usersInfo/InfosPath.js @@ -148,11 +148,11 @@ class InfosPath extends Component{
    { - !isStudent && page == 1 && !category && is_current && - + page == 1 && is_current && + this.props.current_user && this.props.current_user.user_identity != "学生" ? :"" } { - (!data || data.subjects.length==0) && (isStudent || category) && + (!data || data.subjects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && } { data && data.subjects && data.subjects.map((item,key)=>{ diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js index 06076a3cd..d308e0fd3 100644 --- a/public/react/src/modules/user/usersInfo/InfosProject.js +++ b/public/react/src/modules/user/usersInfo/InfosProject.js @@ -121,11 +121,11 @@ class InfosProject extends Component{

    { - !isStudent && page == 1 && !category && is_current && - + page == 1 && is_current && this.props.current_user && this.props.current_user.user_identity != "学生" ? + :"" } { - (!data || data.projects.length==0) && (isStudent || category) && + (!data || data.projects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && } { data && data.projects && data.projects.map((item,key)=>{ diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js index 2ccb8744c..7e911202e 100644 --- a/public/react/src/modules/user/usersInfo/InfosShixun.js +++ b/public/react/src/modules/user/usersInfo/InfosShixun.js @@ -157,11 +157,11 @@ class InfosShixun extends Component{
    { - !isStudent && page == 1 && !category && is_current && - + page == 1 && is_current && this.props.current_user && this.props.current_user.user_identity != "学生" ? + :"" } { - (!data || data.shixuns.length==0) && (isStudent || category) && + (!data || data.shixuns.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && } { data && data.shixuns && data.shixuns.map((item,key)=>{ From 28511ff80c4e90d12f12996d284c1c7c44d100dc 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, 20 Jul 2019 23:18:57 +0800 Subject: [PATCH 42/45] =?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/busyWork/CommonWorkPost.js | 2 +- .../src/modules/courses/busyWork/UseBank.js | 2 +- .../modules/courses/coursesPublic/ShixunModal.js | 16 ++++++++++------ .../courses/exercise/Ecerciseallbackagain.js | 1 + .../exercise/Exercisestatisticalresult.js | 1 + .../exercise/Studentshavecompletedthelist.js | 4 ++++ .../graduation/tasks/GraduationTasksSubmitnew.js | 2 +- .../tasks/GraduationTaskssettinglist.js | 10 +++++----- public/react/src/modules/courses/poll/PollNew.js | 2 +- .../courses/shixunHomework/Listofworks.js | 2 ++ .../shixunHomework/Listofworksstudentone.js | 2 ++ .../courses/shixunHomework/ShixunStudentWork.js | 2 +- .../src/modules/paths/PathDetail/sendPanel.js | 2 +- 13 files changed, 31 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index ae51d04a0..4c5578d2c 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -650,7 +650,7 @@ render(){ width: '375px', height: '30px' }}> -
    {item.user_name}
     diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js index 4cd1b424e..671a09fff 100644 --- a/public/react/src/modules/courses/busyWork/UseBank.js +++ b/public/react/src/modules/courses/busyWork/UseBank.js @@ -278,7 +278,7 @@ class UseBank extends Component{ */ return (

    - + diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index 1fc218908..afba47723 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -80,7 +80,7 @@ class ShixunModal extends Component{ //勾选实训 shixunhomeworkedit=(list)=>{ - +debugger let newpatheditarry=[]; if (this.props.singleChoose == true) { if (list.length > 0) { @@ -99,6 +99,7 @@ class ShixunModal extends Component{ } contentViewScrolledit=(e)=>{ + //滑动到底判断 if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ let {Searchvalue,type,page}=this.state; @@ -122,9 +123,9 @@ class ShixunModal extends Component{ this.setState({ page:1, }) - + this.props.funpatheditarry([]) this.setupdatalist(value,type,true,1) - this.props.funpatheditarry([]) + } //tag @@ -135,9 +136,9 @@ class ShixunModal extends Component{ page:1, newshixunmodallist:undefined }) - + this.props.funpatheditarry([]) this.setupdatalist(Searchvalue,types,true,1) - this.props.funpatheditarry([]) + } @@ -353,11 +354,14 @@ class ShixunModal extends Component{ { newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{ + console.log(item) return(

  • diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index b5e7ab820..f6389613b 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -122,6 +122,7 @@ class Exercisestatisticalresult extends Component { return ( {item.exercise_group_name} ({item.exercise_group_students}) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 5cd59f704..6f4cec877 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -2404,6 +2404,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodata.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) ) }) @@ -2435,6 +2436,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodatas.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts}) ) }) @@ -2464,6 +2466,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodata.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) ) }) @@ -2492,6 +2495,7 @@ class Studentshavecompletedthelist extends Component { course_groups.map((item, key) => { return ( {item.exercise_group_name}({item.exercise_group_students}) ) }) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index ee0e98f16..355a514a4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -737,7 +737,7 @@ render(){ width: '375px', height: '30px' }}> - { return parseInt(task_status[key])===item.user_id?true:false }) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index a5b6ccaa6..4aa01d44e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1188,7 +1188,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1211,7 +1211,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ return( - {item.group_group_name} + {item.group_group_name} ({item.count}) @@ -1423,7 +1423,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1456,7 +1456,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1479,7 +1479,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ return( - {item.group_group_name} + {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index e6dc94515..675e355f3 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2596,7 +2596,7 @@ class PollNew extends Component { {item.question.answers === undefined ? "" : item.question.answers.map((items, i) => { return (
    - + {items.answer_text}
    ) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 070aee271..e289918e1 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -810,6 +810,7 @@ class Listofworks extends Component { return ( {item.name} ({item.count}) @@ -841,6 +842,7 @@ class Listofworks extends Component { return ( {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index a774d6684..51af9e57e 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2451,6 +2451,7 @@ class Listofworksstudentone extends Component { return ( {item.name} ({item.count}) @@ -2482,6 +2483,7 @@ class Listofworksstudentone extends Component { return ( {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index cf9374f08..fa549d403 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -780,7 +780,7 @@ class ShixunStudentWork extends Component { {data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => { return ( - + {item.name}({item.members_count}) diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js index edbe083b1..8aedc2770 100644 --- a/public/react/src/modules/paths/PathDetail/sendPanel.js +++ b/public/react/src/modules/paths/PathDetail/sendPanel.js @@ -181,7 +181,7 @@ class sendPanel extends Component{ item.shixuns.map((items,keys)=>{ return(
    - {items.shixun_name} + {items.shixun_name}
    ) }) From 0087d407ecbd75f5cd7c10717a3c9a68508716eb 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, 20 Jul 2019 23:31:16 +0800 Subject: [PATCH 43/45] =?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/exercise/Testpapersettinghomepage.js | 4 ++-- .../modules/courses/shixunHomework/ShixunHomeworkPage.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index f5b8750d4..fd2a56253 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -334,8 +334,8 @@ class Testpapersettinghomepage extends Component{ 导出
    • :""}
    diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 1dd814856..7aa763f4e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -203,9 +203,9 @@ class ShixunHomeworkPage extends Component {
  • 导出
      -
    • this.confirmysl(this.child,1)}>实训报告 -
      • + {/*
    • this.confirmysl(this.child,1)}>实训报告*/} + {/*
      • */}
    • this.confirmysl(this.child,2)}>学生成绩
      • From 005235a1661bbe0a152ef47f13ab374bc9d7ce58 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, 20 Jul 2019 23:35:01 +0800 Subject: [PATCH 44/45] =?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/App.js | 4 ++-- .../modules/courses/shixunHomework/ShixunWorkReport.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 8743aff8f..d7aa0a540 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -333,8 +333,8 @@ class App extends Component { */} - - + {/**/} + {/**/} {/*实训课程（原实训路径）*/} diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 2f32283bc..afdd5ce37 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -136,10 +136,10 @@ class ShixunWorkReport extends Component {

      {data&&data.shixun_name}

      {/*{this.props.isAdmin()?导出实训报告数据:""}*/} - {this.props.isAdmin() ? this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} - >导出实训报告数据 : ""} + {/*{this.props.isAdmin() ? this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}*/} + {/*>导出实训报告数据 : ""}*/}
      From 75425d8532678a59fbf74cf718a9a412a5dda447 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, 20 Jul 2019 23:58:59 +0800 Subject: [PATCH 45/45] =?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/login/Trialapplication.js | 2 +- public/react/src/modules/login/Trialapplicationysl.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index c40f14bdc..ebb4b98c2 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -271,7 +271,7 @@ class Trialapplication extends Component { // console.log(result); // this.onTabChange("1"); if(result !== undefined){ - this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); + // this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); if (this.state.showTrial === false) { window.location.href = "/"; this.setState({ diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index b65725cef..e2afac010 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -287,7 +287,7 @@ class Trialapplicationysl extends Component { // console.log(result); // this.onTabChange("1"); if(result !== undefined){ - this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); + // this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); // if (this.state.showTrial === false) { window.location.href = "/"; this.setState({