From f8cb72653a64173809107162d9a0a495ecb2f953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:01:34 +0800 Subject: [PATCH 1/3] =?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/groupjobbank/Groupjobbandetails.js | 3 +-- .../courses/groupjobbank/Groupjobquesanswer.js | 10 ++++++++-- .../courses/questionbank/Generaljobanswer.js | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js index 027c12d04..418d0ded6 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -67,7 +67,7 @@ class Groupjobbandetails extends Component {
{ - datas&&(datas.description===null? + ddatas.description===null? :datas.description==="null"? @@ -77,7 +77,6 @@ class Groupjobbandetails extends Component { : //
- ) } {/*
*/} {/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/} diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js index 8e114722a..aeb0dde7b 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -64,7 +64,7 @@ class Groupjobquesanswer extends Component {
{ - datas&&(datas.reference_answer===null? + datas.reference_answer===null? "" :datas.reference_answer==="null"? "" : @@ -72,7 +72,6 @@ class Groupjobquesanswer extends Component { "" : - ) } {datas.reference_attachments === undefined ? @@ -82,6 +81,13 @@ class Groupjobquesanswer extends Component { "" ) : + datas.reference_attachments === "" ? + (datas.reference_answer===undefined || datas.reference_answer===null? + + : + "" + ) + : datas.reference_attachments === null ? (datas.reference_answer===undefined || datas.reference_answer===null? diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index e821845b3..2aeb04f7f 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -57,7 +57,10 @@ class Generaljobanswer extends Component { render() { - let{datas}=this.props + let{datas}=this.props; + console.log("Generaljobanswer"); + console.log(datas.reference_attachments); + console.log(datas.reference_answer); return (
@@ -82,7 +85,7 @@ class Generaljobanswer extends Component { {/*
*/} { - datas&&(datas.reference_answer===null? + datas.reference_answer===null? "" :datas.reference_answer==="null"? "" : @@ -90,7 +93,7 @@ class Generaljobanswer extends Component { "" : - ) + } {datas.reference_attachments === undefined ? @@ -100,6 +103,13 @@ class Generaljobanswer extends Component { "" ) : + datas.reference_attachments === "" ? + (datas.reference_answer===undefined || datas.reference_answer===null? + + : + "" + ) + : datas.reference_attachments === null ? (datas.reference_answer===undefined || datas.reference_answer===null? From f736ed6ebd62a65c8d805d772362fbbbaefecf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:04:58 +0800 Subject: [PATCH 2/3] =?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/groupjobbank/Groupjobquesanswer.js | 8 ++++---- .../src/modules/courses/questionbank/Generaljobanswer.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js index aeb0dde7b..3d41ccb79 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -75,28 +75,28 @@ class Groupjobquesanswer extends Component { } {datas.reference_attachments === undefined ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments === "" ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments === null ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments.length === 0 ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index 2aeb04f7f..278cdd691 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -97,28 +97,28 @@ class Generaljobanswer extends Component { } {datas.reference_attachments === undefined ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments === "" ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments === null ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments.length === 0 ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" From fff84abfd27aa4f59507932862746a632f99d249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 17:05:20 +0800 Subject: [PATCH 3/3] =?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/InfosTopics.js | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index dd1bf0378..382abdd47 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -73,11 +73,21 @@ class InfosTopics extends Component{ this.setState({ isSpin:true }) - let user_id=this.props.match.params&&this.props.match.params.username; + let types=this.props.match.params.topicstype; + let user_id=""; + + if(types==="publicly"){ + user_id=this.props.current_user&&this.props.current_user.login; + }else{ + user_id=this.props.match.params&&this.props.match.params.username; + } + if(user_id!=undefined){ + console.log(user_id) let {per_page}=this.state; let url=`/users/${user_id}/question_banks.json`; - axios.get(url,{params:{ + + axios.get(encodeURI(url),{params:{ type, object_type:category, course_list_id, @@ -396,6 +406,13 @@ class InfosTopics extends Component{ .marright0{ margin-right: 0px !important; } + + .gongkais{ + min-width: 50px; + height: 22px !important; + line-height: 22px !important; + color: #fff !important; + } ` } @@ -404,7 +421,7 @@ class InfosTopics extends Component{
{types==="publicly"?
我的题库 + href={`/users/${this.props.current_user&&this.props.current_user.login}/topics/personal`}>我的题库
公共题库
:
@@ -455,7 +472,7 @@ class InfosTopics extends Component{
- {isshowprofes===false?
+ {isshowprofes===false?data&&data.count===undefined?"":data&&data.count===0?"":

共 {data&&data.count===undefined?0:data&&data.count} 个 已选择 {checkBoxValues.length} 个 (不支持跨页勾选) @@ -513,7 +530,7 @@ class InfosTopics extends Component{ {item.name} - {item.is_public===true?types==="publicly"?"":公开:""} + {item.is_public===true?types==="publicly"?"":公开:""}