From 95e145cbc369deacd1c9b4d851a7d6677a9793a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 11 Nov 2019 09:25:30 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=B0=83=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/exercise/Studentshavecompletedthelist.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index be7871d7b..a787575e1 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -1031,10 +1031,8 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.finalscore==="--"? - - - -- + this.Adjustment(record.user_id)}>评阅 : ( {record.finalscore==="--"? - -- + this.Adjustment(record.user_id)}>评阅 : Date: Mon, 11 Nov 2019 10:46:58 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=B0=83=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coursesPublic/ModulationModal_exercise.js | 504 +++++++++++++++--- .../courses/coursesPublic/Newshixunmodel.css | 2 +- .../exercise/Studentshavecompletedthelist.js | 37 +- 3 files changed, 465 insertions(+), 78 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js b/public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js index 538b32773..a9e54a62c 100644 --- a/public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js +++ b/public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js @@ -11,21 +11,209 @@ class ModulationModal_exercise extends Component { score: 0, subjective_questions: 0, objective_questions: 0, - + subjective_score: 0, + objective_score: 0, + subool: false, + Inputsval: '', + Inputsvals: '', + Inputsvaltype: false, + Inputsvaltypes: false, + Inputsvaltest: "", + Inputsvaltests: "", } //因为主观题加客观题的和是总分 } componentDidMount = () => { - + console.log("ModulationModal_exercise"); + console.log(this.props); + this.setState({ + subjective_score: this.props.subjective_score, + objective_score: this.props.objective_score, + }) + if (this.props.subjective_score > 0 && this.props.objective_score > 0) { + this.setState({ + subool: false, + }) + } else { + this.setState({ + subool: true + }) + } } Saves = () => { - let {textareaval, subjective_questions, objective_questions, score} = this.state; + let { + textareaval, + subjective_questions, + objective_questions, + score, + subool, + Inputsval, + subjective_score, + objective_score, + Inputsvals + } = this.state; + let re = /^[0-9]+.?[0-9]*$/;//判断字符串是否为数字 //判断正整数 /^[1-9]+[0-9]*]*$/ + + if (subool === false) { + //不是总分模式 + if (Inputsval === undefined || Inputsval === null || Inputsval === "") { + this.setState({ + Inputsval: "", + Inputsvaltype: true, + Inputsvaltest: "请填写分数", + }) + return + } + + //判断主观题 + + var nubmer = Inputsval; + if (!re.test(nubmer)) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: "请输入0-100的分数", + }) + return; + } + + + if (0 > parseFloat(Inputsval)) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: "成绩不能小于零", + }) + return; + } else if (parseFloat(Inputsval) > this.props.subjective_score) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: `成绩不能大于${this.props.subjective_score}`, + }) + return; + } + //判断客观题 + if (Inputsvals === undefined || Inputsvals === null || Inputsvals === "") { + this.setState({ + Inputsvals: "", + Inputsvaltypes: true, + Inputsvaltests: "请填写分数", + }) + return + } + var nubmers = Inputsvals; + if (!re.test(nubmers)) { + this.setState({ + Inputsvals: "", + Inputsvaltypes: true, + Inputsvaltests: "请输入0-100的分数", + }) + return; + } + + if (0 > parseFloat(Inputsvals)) { + this.setState({ + Inputsvals: Inputsvals, + Inputsvaltypes: true, + Inputsvaltests: "请输入0-100的分数", + }) + return; + } else if (parseFloat(Inputsval) > 100) { + this.setState({ + Inputsvals: Inputsvals, + Inputsvaltypes: true, + Inputsvaltests: `成绩不能大于${this.props.objective_score}`, + }) + return; + } - // this.props.Saves(textareaval, Inputsval) + + } else { + //总分模式 + if (subjective_score > 0) { + //主观题 + if (Inputsval === undefined || Inputsval === null || Inputsval === "") { + this.setState({ + Inputsval: "", + Inputsvaltype: true, + Inputsvaltest: "请填写分数", + }) + return + } + + //判断主观题 + var nubmer = Inputsval; + if (!re.test(nubmer)) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: "请输入0-100的分数", + }) + return; + } + + + if (0 > parseFloat(Inputsval)) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: "成绩不能小于零", + }) + return; + } else if (parseFloat(Inputsval) > this.props.subjective_score) { + this.setState({ + Inputsval: Inputsval, + Inputsvaltype: true, + Inputsvaltest: `成绩不能大于${this.props.subjective_score}`, + }) + return; + } + } else if (objective_score > 0) { + //客观题 + if (Inputsvals === undefined || Inputsvals === null || Inputsvals === "") { + this.setState({ + Inputsvals: "", + Inputsvaltypes: true, + Inputsvaltests: "请填写分数", + }) + return + } + var nubmers = Inputsvals; + if (!re.test(nubmers)) { + this.setState({ + Inputsvals: "", + Inputsvaltypes: true, + Inputsvaltests: "请输入0-100的分数", + }) + return; + } + + if (0 > parseFloat(Inputsvals)) { + this.setState({ + Inputsvals: Inputsvals, + Inputsvaltypes: true, + Inputsvaltests: "请输入0-100的分数", + }) + return; + } else if (parseFloat(Inputsvals) > 100) { + this.setState({ + Inputsvals: Inputsvals, + Inputsvaltypes: true, + Inputsvaltests: `成绩不能大于${this.props.objective_score}`, + }) + return; + } + + } + } + + + this.props.Saves(Inputsval, Inputsvals); } @@ -35,13 +223,57 @@ class ModulationModal_exercise extends Component { }) } + //主观题 setInputs = (e) => { + console.log("主"); + console.log(e.target.value); + this.setState({ + Inputsval: e.target.value, + Inputsvaltype: false, + }) + } + //客观题 + setInputss = (e) => { + console.log("客"); + console.log(e.target.value); + this.setState({ + Inputsvals: e.target.value, + Inputsvaltypes: false, + + }) + } + //最终成绩主观题 + setInputsss = (e) => { + console.log("终主"); + console.log(e.target.value); + this.setState({ + Inputsval: e.target.value, + Inputsvaltype: false, + }) + } + //最终成绩客观题 + setInputssss = (e) => { + console.log("终客"); + console.log(e.target.value); + this.setState({ + Inputsvals: e.target.value, + Inputsvaltypes: false, + }) } render() { - let {Inputsvaltype, subjective_questions, objective_questions, score} = this.state; + let { + Inputsvaltype, + Inputsvaltypes, + Inputsvaltest, + Inputsvaltests, + subjective_score, + objective_score, + Inputsval, + Inputsvals, + } = this.state; return (
+ { + subjective_score > 0 && objective_score > 0 ? +
+ {Inputsvaltype === true ? + + : + "" -
-

主观题成绩:

- this.setInputs(e)} - value={subjective_questions === undefined || subjective_questions === null ? "" : subjective_questions}/> -

分 ,

-

总分：45.0 分

-
- -
- -

客观题成绩:

- this.setInputs(e)} - value={objective_questions === undefined || objective_questions === null ? "" : objective_questions}/> -

分 ,

-

总分：45.0 分

- -
- -
-

最终成绩:

- this.setInputs(e)} - value={score === undefined || score === null ? "" : score}/> -

分 ,

-

总分：45.0 分

- -
- - -
- {this.props.Cancelname || '取消'} - {this.props.Savesname || '保存'} -
+ } +
+

主观题成绩:

+ +

分 ,

+

总分：{subjective_score}分

+
+ { + Inputsvaltype === true ? +

{Inputsvaltest}

+ : "" + } + {Inputsvaltypes === true ? + + : + "" -
+ } +
+ +

客观题成绩:

+ +

分 ,

+

总分：{objective_score} 分

+ +
+ { + Inputsvaltypes === true ? +

{Inputsvaltests}

+ : "" + } +
+ : +
+ { + subjective_score > 0 && objective_score === 0 ? +
+ {Inputsvaltype === true ? + + : + "" + + } +
+

最终成绩:

+ +

分 ,

+

+ 总分：{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}分

+
+ { + Inputsvaltype === true ? +

{Inputsvaltest}

+ : "" + } +
+ : + "" + } + { + objective_score > 0 && subjective_score === 0 ? +
+ {Inputsvaltypes === true ? + + : + "" + } +
+

最终成绩:

+ +

分 ,

+

+ 总分：{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}分

+ +
+ { + Inputsvaltypes === true ? +

{Inputsvaltests}

+ : "" + } +
+ : + "" + } + + +
+ {this.props.Cancelname || '取消'} + {this.props.Savesname || '保存'} +
+
+ + } + ) diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css index 34721fa21..30cb300c8 100644 --- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css +++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css @@ -361,7 +361,7 @@ .minbuttionte { /* display: flex; */ - margin-top: 27px; + margin-top: 20px; width: 100%; /* align-items: center; */ margin-bottom: 17px; diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index a787575e1..5b2150457 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -2598,9 +2598,11 @@ class Studentshavecompletedthelist extends Component { } // 调分 Adjustment = (e) => { + console.log("Adjustment"); + console.log(e); this.setState({ testpapergradingboll: true, - exeuserid: e.user_id, + exeuserid: e, }) } @@ -2615,12 +2617,13 @@ class Studentshavecompletedthelist extends Component { //试卷调分 Testpapergrading = (v, n) => { + // debugger var exercise_id = this.props.match.params.Id; let url = `/exercises/${exercise_id}/adjust_score.json`; axios.post(url, { user_id: this.state.exeuserid, - subjective_score: n, - objective_score: v, + subjective_score: v, + objective_score: n, }) .then((response) => { if (response.data.status == '0') { @@ -2629,7 +2632,7 @@ class Studentshavecompletedthelist extends Component { this.Teacherliststudentlist(); } }) - .catch(function (error) { + .catch((error) => { console.log(error); this.setState({testpapergradingboll: false}) }); @@ -2666,18 +2669,20 @@ class Studentshavecompletedthelist extends Component { :
- {testpapergradingboll === true ? this.Adjustments()} - Saves={(value, num) => this.Testpapergrading(value, num)} - /> : ""} - {/*{*/} - {/* testpapergradingboll === true ? this.Adjustments()}*/} - {/* Saves={(value, num) => this.Testpapergrading(value, num)}*/} - {/* /> : ""*/} - {/*}*/} + {/*{testpapergradingboll === true ? this.Adjustments()}*/} + {/* Saves={(value, num) => this.Testpapergrading(value, num)}*/} + {/*/> : ""}*/} + { + testpapergradingboll === true ? this.Adjustments()} + Saves={(value, num) => this.Testpapergrading(value, num)} + /> : "" + }
    From ce97442fbc075018b221a25ba6415b58d4a9e156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 11 Nov 2019 13:46:26 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E7=8F=AD?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/statistics/Statistics.css | 14 ++++++++++++++ .../src/modules/courses/statistics/Statistics.js | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/statistics/Statistics.css b/public/react/src/modules/courses/statistics/Statistics.css index cc6a7a34a..8c495307e 100644 --- a/public/react/src/modules/courses/statistics/Statistics.css +++ b/public/react/src/modules/courses/statistics/Statistics.css @@ -132,3 +132,17 @@ font-size: 16px; margin-left:15px; } +.maxnamewidth200 { + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; +} +.maxnamewidth180 { + max-width: 180px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; +} diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 31f897c21..bb1ed9a09 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -201,15 +201,17 @@ class Statistics extends Component{ { title: '姓名', dataIndex:'user_name', + className: 'maxnamewidth180', render: (text, record) => ( - {record.user_name} + {record.user_name} ) }, { title: '分班', dataIndex: 'course_group', + className: 'maxnamewidth200', render: (text, record) => ( - {record.course_group} + {record.course_group} ) }, { From 0ee2c7a6963818e75149dd3a0e716f48f6c0ab77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 11 Nov 2019 14:26:43 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E6=AF=95?= =?UTF-8?q?=E8=AE=BE=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE=E8=A1=A5=E4=BA=A4?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/CommonWorkSetting.js | 25 ++++++++++++----- .../tasks/GraduationTaskssetting.js | 27 ++++++++++--------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 1e3ced6d3..9e4b9f4b8 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -46,6 +46,7 @@ function disabledDateFunc(current) { return current && current < moment().endOf('day').subtract(1, 'days'); } // 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting +//普通作业分组作业设置 class CommonWorkSetting extends Component{ constructor(props){ @@ -411,10 +412,11 @@ class CommonWorkSetting extends Component{ } // 补交设置 允许补交 allow_late_change=(e)=>{ + // console.log(e.target.checked ); this.setState({ - allow_late: e.target.value + allow_late: e.target.checked }) - if (e.target.value) { + if (e.target.checked) { this.setState({ late_penalty: 5 }) @@ -1155,12 +1157,16 @@ class CommonWorkSetting extends Component{
    补交设置 - （选中，则允许学生延时提交作品） +
    - - 允许补交 + + + 开启补交 （选中，则允许学生延时提交作品）
    迟交扣分： @@ -1205,9 +1211,7 @@ class CommonWorkSetting extends Component{
    - 禁止补交 -
    @@ -1539,3 +1543,10 @@ class CommonWorkSetting extends Component{ const CommonWorkSettingForm = Form.create({ name: 'commonworkSettingForm' })(CommonWorkSetting); export default CommonWorkSettingForm; + +// {/**/} +// +// {/* 允许补交*/} +// {/* 禁止补交*/} +// +// {/**/} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 967303e5e..57851a9dd 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -31,7 +31,7 @@ function disabledDate(current) { return current && current < moment().endOf('day').subtract(1, 'days'); } - +//毕设任务设置 class GraduationTaskssettingapp extends Component{ constructor(props){ @@ -315,17 +315,17 @@ class GraduationTaskssettingapp extends Component{ allowlatefun=(e)=>{ let {end_time}=this.state; - if(e.target.value===true||e.target.value===1){ + if(e.target.checked===true||e.target.checked===1){ this.setState({ latepenalty:5, - allowlate:e.target.value, + allowlate:e.target.checked, latetime:end_time===null||end_time === ""?"":moment(moment(handleDateString(end_time))).add(1, 'months').format("YYYY-MM-DD HH:mm"), }) }else{ this.setState({ latepenalty:0, - allowlate:e.target.value, + allowlate:e.target.checked, latetime:"" }) } @@ -1120,10 +1120,10 @@ debugger
    补交设置
    - - - - 开启补交（选中，则允许学生延时提交作品） + 开启补交 （选中，则允许学生延时提交作品）
    迟交扣分： @@ -1163,11 +1163,6 @@ debugger {latetimetype===true?
    {this.state.latetimetypeval}
    :""}
    - - 禁止补交 - -     -
    @@ -1308,3 +1303,9 @@ debugger const GraduationTaskssetting = Form.create({ name: 'coursesNew' })(GraduationTaskssettingapp); export default GraduationTaskssetting; +// {/**/} +// +// {/* 开启补交（选中，则允许学生延时提交作品）*/} +// {/* 禁止补交*/} +// +// {/**/} From 9b4abaa6637415f6c13db817dfe039de23c0c2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 11 Nov 2019 14:47:28 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8D=E6=89=A3=E5=88=86=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index c2d78f83e..1efb4c1cd 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -45,6 +45,7 @@ const {Option} = Select; //作品列表(学生) let allow_lates=false; +let answer_open_evaluation=false; class Listofworksstudentone extends Component { //unifiedsetting 统一设置 //allowreplenishment 允许补交 @@ -1173,7 +1174,7 @@ class Listofworksstudentone extends Component {
    {record.late_penalty === "--" ? 迟交扣分：0分 : 迟交扣分：{record.late_penalty}分}
    - {record.view_answer_count===null?"":
    查看参考答案：{record.view_answer_count}关
    } + {record.view_answer_count===null?"":answer_open_evaluation===true?
    查看参考答案：{record.view_answer_count}关
    :""}
    {record.finalscore === "--" ? 最终成绩：0分 : 最终成绩：{record.finalscore}分}
    @@ -1510,7 +1511,7 @@ class Listofworksstudentone extends Component {
    {record.late_penalty === "--" ? 迟交扣分：0分 : 迟交扣分：{record.late_penalty}分}
    - {record.view_answer_count===null?"":
    查看参考答案：{record.view_answer_count}关
    } + {record.view_answer_count===null?"":answer_open_evaluation===true?
    查看参考答案：{record.view_answer_count}关
    :""}
    {record.finalscore === "--" ? 最终成绩：0分 : 最终成绩：{record.finalscore}分}
    @@ -1749,9 +1750,11 @@ class Listofworksstudentone extends Component { loadingstate: false, computeTimetype: true, homework_status: result.data.homework_status, - update_score: result.data.update_score + update_score: result.data.update_score, }); allow_lates=result.data.allow_late; + answer_open_evaluation=result.data.answer_open_evaluation; + //老师 this.seacthdatat(result.data, result.data.student_works, result.data.work_efficiency, result.data.course_group_info, 1); if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") { @@ -2491,8 +2494,11 @@ class Listofworksstudentone extends Component { code_review: result.data.code_review, challenges_count: result.data.challenges_count, homework_status: result.data.homework_status, + answer_open_evaluation:result.data.answer_open_evaluation, }); - allow_lates=result.data.allow_late + allow_lates=result.data.allow_late; + answer_open_evaluation=result.data.answer_open_evaluation; + //老师 this.seacthdatat(result.data, result.data.student_works, result.data.work_efficiency, result.data.course_group_info, page); this.props.Getdataback(result, result.data); // } From 8243616eee2d5195c2842efc71c6a69cdd4f529e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 10:04:38 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfpeopledata.js | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index aa550c0c5..05cd680ce 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -340,6 +340,10 @@ class CompetitionContentspdfpeopledata extends Component { render() { + const admins=this.props.user.admin; + if(admins===undefined||admins===null){ + admins===false + } const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state return (
    @@ -528,7 +532,21 @@ class CompetitionContentspdfpeopledata extends Component { }
    - : "" + : +
    + { + admins===true? + this.hideUpdating(i)} + getdata={() => this.getdata()} + GetawardinformationAPI={() => this.GetawardinformationAPI()} + bank_account={this.state.bank_account} + > + :"" + } +
    + + } From 8b63f82ee02a601b7b715e6fae6c14376c17f5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 10:49:22 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionCommonChild/CompetitionContentspdf.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js index a379f2607..b41a3a837 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js @@ -17,6 +17,15 @@ class CompetitionContentspdf extends Component{ componentDidMount(){ window.document.title = '竞赛'; + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + let userid; + if(types[1]===undefined){ + }else{ + this.setState({ + Tabskey:"2" + }) + } } @@ -54,4 +63,4 @@ class CompetitionContentspdf extends Component{ ) } } -export default CompetitionContentspdf; \ No newline at end of file +export default CompetitionContentspdf; From 178cc9e01730b093417cd12a1ba2e993d04aaa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:54:48 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 0f75154cf..e43bea73a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -40,7 +40,30 @@ class Bankcardnumberverification extends Component { } } + componentDidUpdate = (prevProps) => { + if (prevProps.bank_account != this.props.bank_account) { + console.log("componentDidUpdate"); + console.log(this.props); + console.log(prevProps); + ////console.log("Registration"); + ////console.log("componentDidUpdate"); + ////console.log(this.props.user.admin); + try { + if(this.props.bank_account){ + this.props.form.setFieldsValue({ + openingbank: this.props.bank_account.bank, + subbranch: this.props.bank_account.second_bank, + subbranchs: this.props.bank_account.card_no, + }) + } + }catch (e) { + + } + + } + + } yhBankstrue = () => { this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { From d496f104223d3962a8fcf25704c32656b7fd12a1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Tue, 12 Nov 2019 13:55:26 +0800 Subject: [PATCH 09/17] competition prize account api --- .../competitions/prize_leader_accounts_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/competitions/prize_leader_accounts_controller.rb b/app/controllers/competitions/prize_leader_accounts_controller.rb index 0c01e2738..490c5fb6d 100644 --- a/app/controllers/competitions/prize_leader_accounts_controller.rb +++ b/app/controllers/competitions/prize_leader_accounts_controller.rb @@ -2,7 +2,7 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController before_action :require_prize_team_leader! def update - Competitions::SavePrizeTeamAccountService.call(current_competition, current_user, update_params) + Competitions::SavePrizeTeamAccountService.call(current_competition, current_prize_user, update_params) render_ok rescue ApplicationService::Error => ex render_error(ex.message) @@ -13,8 +13,8 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController def require_prize_team_leader! prize_user = current_competition.competition_prize_users.joins(:competition_prize) .where(competition_prizes: { category: :bonus }) - .find_by(leader: true, user_id: current_user.id) - return if prize_user.present? + .find_by(leader: true, user_id: current_prize_user.id) + return if prize_user.present? && (current_user.admin_or_business? || current_user.id == current_prize_user.id) render_forbidden end @@ -22,4 +22,8 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController def update_params params.permit(:bank, :second_bank, :card_no) end + + def current_prize_user + @_current_prize_user ||= User.find(params[:user_id]) + end end \ No newline at end of file From 87dd1d7766fb83334806863184378ae11e3263b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:57:36 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfpeopledata.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index e4c149fa3..4588accaf 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -321,11 +321,19 @@ class CompetitionContentspdfpeopledata extends Component { //撤销认证 Cancellationofapplication = (index) => { + let userid; + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + if(types[1]===undefined){ + userid=this.props.user&&this.props.user.user_id; + }else{ + userid=types[1]; + } let url = "" if (index === 1) { - url = `/users/accounts/${this.props.user.user_id}/authentication_apply.json`; + url = `/users/accounts/${userid}/authentication_apply.json`; } else if (index === 2) { - url = `/users/accounts/${this.props.user.user_id}/professional_auth_apply.json`; + url = `/users/accounts/${userid}/professional_auth_apply.json`; } axios.delete(url) .then((response) => { From 03221119613b468754faff62cb417bbf96a988b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:58:11 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfpeopledata.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 4588accaf..19469bb87 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -344,7 +344,11 @@ class CompetitionContentspdfpeopledata extends Component { } else if (index === 2) { this.props.showNotification('撤销职业认证成功') } - this.getdata(this.state.userdata.id); + try { + this.getdata(this.state.userdata.id); + }catch (e) { + + } } } catch (e) { From 12140b7fc7f7486ce3463cc2c31cb26d349f39bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:05:05 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfChild/Bankcardnumberverification.js | 1 + .../CompetitionContentspdfpeopledata.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index e43bea73a..27db5d3db 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -69,6 +69,7 @@ class Bankcardnumberverification extends Component { if (!err) { let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`; axios.patch(url, { + user_id:this.props.userdata.id, bank: values.openingbank, second_bank: values.subbranchs, card_no: values.subbranch diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 19469bb87..3fc03dfe4 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -288,6 +288,7 @@ class CompetitionContentspdfpeopledata extends Component { if (!err) { let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`; axios.patch(url, { + user_id:this.state.userdata.id, bank: values.openingbank, second_bank: values.subbranchs, card_no: values.subbranch @@ -296,7 +297,7 @@ class CompetitionContentspdfpeopledata extends Component { try { if (result.data.status == 0) { // console.log(JSON.stringify(result)); - this.props.showNotification(`提交成功成功`); + this.props.showNotification(`提交成功`); this.getdata(this.state.userdata.id); this.GetawardinformationAPI(); } From 851164ff4672c1aa8571ef9324775ee22f569844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:09:19 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 18 +++++++++++++++--- .../CompetitionContentspdfpeopledata.js | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 27db5d3db..4d9279546 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -60,6 +60,18 @@ class Bankcardnumberverification extends Component { } + try { + if(prevProps.bank_account){ + this.props.form.setFieldsValue({ + openingbank:prevProps.bank_account.bank, + subbranch: prevProps.bank_account.second_bank, + subbranchs: prevProps.bank_account.card_no, + }) + } + }catch (e) { + + } + } @@ -176,7 +188,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('openingbank', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.openingbank, required: true, message: '请输入开户行', }], @@ -191,7 +203,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranch', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.subbranch, required: true, message: '请输入支行', }], @@ -206,7 +218,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranchs', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.subbranchs, required: true, message: '请输入账号', }], diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 3fc03dfe4..3f015a3bc 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -528,6 +528,7 @@ class CompetitionContentspdfpeopledata extends Component {
    { bank_account_editable === true ? + this.hideUpdating(i)} getdata={(id) => this.getdata(id)} From 376fd15c58b1662178e694b87bbda4cc396c82ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:12:40 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfChild/Phonenumberverification.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js index 4a9718032..fa0b20b7a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js @@ -47,7 +47,7 @@ class Phonenumberverification extends Component { }).then((result) => { if (result) { this.props.showNotification("手机号码绑定成功!"); - this.props.hideUpdating() + this.props.hideUpdating(1) this.props.getdata(id); } }).catch((error) => { From 25e07ae21d19eac2015d35849c4f2a135727bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:24:10 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 4d9279546..d376cefa2 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -188,7 +188,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('openingbank', { rules: [{ - initialValue: this.state.openingbank, + initialValue: this.state.openingbank&&this.state.openingbank, required: true, message: '请输入开户行', }], @@ -203,7 +203,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranch', { rules: [{ - initialValue: this.state.subbranch, + initialValue: this.props.subbranch&&this.props.subbranch, required: true, message: '请输入支行', }], @@ -218,7 +218,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranchs', { rules: [{ - initialValue: this.state.subbranchs, + initialValue: this.props.subbranchs&&this.props.subbranchs, required: true, message: '请输入账号', }], From 3ad42ececcb73b7d360340123d3abb54ca937a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 12 Nov 2019 14:30:35 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitions/Competitioncommon/CompetitionCommon.css | 8 ++++++++ .../CompetitionCommonChild/CompetitionContentsChart.js | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index 5693fcc2e..9b7edae1c 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -245,6 +245,7 @@ height: 60px; border-radius: 50% !important; box-shadow: 0px 0px 12px rgba(0,0,0,0.2); + border: 2px solid #459BE5; } .Competitioncenter{ @@ -308,6 +309,7 @@ width: 64px; height: 63px; border-radius: 50%; + border: 2px solid #459BE5; } .CompetitionsListzhezhao{ @@ -418,4 +420,10 @@ cursor: default; max-width: 100px; display: inherit; +} + +.competimgabsolute{ + position: absolute; + left: 106px; + bottom: -10px; } \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index 45b7fd3d2..1bf8f3ffa 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -201,7 +201,10 @@ class CompetitionContents extends Component{ From d7f8602227cda7395bebc06a3876a9746609461a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 12 Nov 2019 14:31:09 +0800 Subject: [PATCH 17/17] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 376d08221..8a313a904 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1224,7 +1224,7 @@ submittojoinclass=(value)=>{ } { this.props.Headertop && this.props.Headertop.laboratory_user && -
  • 后台管理
    • +
  • 后台管理
    • }
  • 账号管理