From d76bd3434049915c3ddb12f62b325325c88f76f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 8 Jan 2020 14:56:12 +0800 Subject: [PATCH] =?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/busyWork/CommonWorkItem.js | 7 +++ .../src/modules/courses/busyWork/UseBank.js | 10 ++-- .../modules/courses/busyWork/commonWork.js | 6 +-- .../modules/courses/common/courseMessage.css | 2 +- .../courses/coursesPublic/NewShixunModel.js | 10 ++-- .../modules/courses/members/ChangeRolePop.js | 2 +- .../courses/members/CourseGroupList.js | 2 +- .../shixunHomework/ShixunhomeWorkItem.js | 51 ++++++++++++------- public/react/src/modules/forums/MemoDetail.js | 12 ++--- .../src/modules/forums/MemoDetailMDEditor.js | 2 +- public/react/src/modules/page/Index.js | 3 +- .../PackageIndexNEIBannerConcent.js | 2 +- .../tpm/challengesnew/TPMchallengesnew.js | 2 +- .../modules/user/usersInfo/banks/banksMenu.js | 2 +- 14 files changed, 66 insertions(+), 47 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 82e2d2d96..10321142b 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -216,6 +216,9 @@ class CommonWorkItem extends Component{ {/* item.status.indexOf('匿评申诉中') != -1 ? '匿评申诉剩余时间' : ''}>*/} {/**/} {isAdmin &&
+ {} : () => this.onItemClick(item)} + >查看详情 { this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑 { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置
} @@ -273,6 +276,10 @@ class CommonWorkItem extends Component{ // item.work_status && item.work_status.indexOf('查看作品') != -1 && this.props.toWorkDetailPage(this.props.match.params, item.homework_id, item.work_id)}>查看作品 } + + {} : () => this.onItemClick(item)} + >查看详情 }

diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js index f72b71990..6c98695ba 100644 --- a/public/react/src/modules/courses/busyWork/UseBank.js +++ b/public/react/src/modules/courses/busyWork/UseBank.js @@ -35,8 +35,8 @@ class UseBank extends Component{ } } componentDidMount() { - console.log("UseBank"); - console.log(this.props); + // console.log("UseBank"); + // console.log(this.props); } onCheckBoxChange = (checkBoxValues) => { @@ -190,9 +190,9 @@ class UseBank extends Component{ let { flag, nav_my, loading, hasMore, object_list, search, checkBoxValues,isChecked,page,is_teacher }=this.state let { object_type }=this.props; const antIcon = ; - console.log("题库选用2222"); - console.log("UseBank"); - console.log(this.props); + // console.log("题库选用2222"); + // console.log("UseBank"); + // console.log(this.props); return(
@@ -317,21 +317,21 @@ class ShixunhomeWorkItem extends Component{ { this.props.isAdmin?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} title={discussMessage.name} - className="fl mt3 font-16 font-bd color-dark maxwidth422">{discussMessage.name}:"" + className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}:"" } { this.props.isStudent? this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)} title={discussMessage.name} - className="fl mt3 font-16 font-bd color-dark maxwidth422">{discussMessage.name}:"" + className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}:"" } { this.props.isNotMember===true? this.props.discussMessage.private_icon===true? - {discussMessage.name} + {discussMessage.name} : this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)} title={discussMessage.name} - className="fl mt3 font-16 font-bd color-dark maxwidth422">{discussMessage.name}:"" + className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}:"" } @@ -349,30 +349,43 @@ class ShixunhomeWorkItem extends Component{ - {this.props.isAdmin?this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}> - {discussMessage&&discussMessage.shixun_status>1?实训详情: - 实训详情} - {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16 fontweight400"}>重命名:""} + {this.props.isAdmin?this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?"homepagePostSetting newhomepagePostSettingname":"homepagePostSetting homepagePostSettingbox":"homepagePostSetting newwidthSettin"} style={{"right":"-2px","top":"6px","display":"block"}}> + {discussMessage&&discussMessage.shixun_status>1?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情:""} + {discussMessage&&discussMessage.shixun_status>1?实训详情: + 实训详情 + } + {discussMessage&&discussMessage.shixun_status>1?"":this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情} + + {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue font-16 fontweight400"}>重命名:""} {/* 设置*/} 设置 :""} + {this.props.isStudent===true?this.props.course_identity===5? + this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} + className="btn colorblue colorblue font-16 mr20 fr mt2">查看详情 + :"":"" + } {this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1? discussMessage.time_status<5? - + {startbtn===false? (discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ? diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index db00bdf6f..b3e0e121e 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -175,7 +175,7 @@ class MemoDetail extends Component { // withCredentials: true } ).then((response) => { - console.log(response); + const newMemo = Object.assign({}, this.props.memo) newMemo.praise_count = response.data.praise_count newMemo.user_praise = !newMemo.user_praise @@ -309,7 +309,7 @@ class MemoDetail extends Component { memo: newMemo2 }) } - console.log(response) + }).catch((error) => { console.log(error) }) @@ -352,7 +352,7 @@ class MemoDetail extends Component { memo: newMemo }) } - console.log(response) + }).catch((error) => { console.log(error) }) @@ -382,7 +382,7 @@ class MemoDetail extends Component { comments }) } - console.log(response) + }).catch((error) => { console.log(error) }) @@ -471,7 +471,7 @@ class MemoDetail extends Component { } // {"message":"Couldn't find Discuss with id=911","status":-1} - console.log(response) + }).catch((error) => { console.log(error) }) @@ -546,7 +546,7 @@ class MemoDetail extends Component { this.props.initForumState({ memo: newMemo2 }) - console.log(response) + } }).catch((error) => { console.log(error) diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js index fb89f5bca..f00b4aeae 100644 --- a/public/react/src/modules/forums/MemoDetailMDEditor.js +++ b/public/react/src/modules/forums/MemoDetailMDEditor.js @@ -57,7 +57,7 @@ class MemoDetailMDEditor extends Component { errorMsg: '' }) }) - commentMDEditor.cm.focus() + // commentMDEditor.cm.focus() }, { watch: false, dialogLockScreen: false, diff --git a/public/react/src/modules/page/Index.js b/public/react/src/modules/page/Index.js index aa395e5cf..1e31449c6 100644 --- a/public/react/src/modules/page/Index.js +++ b/public/react/src/modules/page/Index.js @@ -104,7 +104,6 @@ class Index extends Component { // withCredentials: true, }) .then((response) => { - console.log(response); if (response.data.status == -1) { console.error('获取任务列表失败！') @@ -146,7 +145,7 @@ class Index extends Component { // } ) .then((response) => { - console.log(response); + // {"reward_code":86} TODO 金币数量变化 if (response.data.reward_code === -1) { this.props.showSnackbar('该任务已评过星了！') diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index ae4983b33..ac82e9ca0 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -80,7 +80,7 @@ class PackageIndexNEIBannerConcent extends Component { let url=`/project_packages/${this.props.match.params.id}.json` axios.get((url)).then((response) => { - console.log(response) + let data=response.data this.setState({ category:data.category_id, diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js index 70fb5d306..b0deafd95 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js +++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js @@ -719,7 +719,7 @@ export default class TPMchallengesnew extends Component { shixunsskillvaluelist===undefined?"":shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => { return (
  • - this.delshixunsskilllist(key)}> + this.delshixunsskilllist(key)}> diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js index aa2491ae8..571af8b64 100644 --- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js +++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js @@ -92,7 +92,7 @@ class BanksMenu extends Component{ object_type:type }}) .then((response) => { - console.log(response); + if(response){ if(response.data){ if(response.data.status===0){