m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_static
杨树明 5 years ago
parent 2c7e7f1422
commit d76bd34340
14 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File

7
public/react/src/modules/courses/busyWork/CommonWorkItem.js
Unescape View File

@ -216,6 +216,9 @@ class CommonWorkItem extends Component{
{/* item.status.indexOf('匿评申诉中') != -1 ? '匿评申诉剩余时间' : ''}>*/}
{/*</Tooltip>*/}
{isAdmin && <div className="fr">
<WordsBtn style="blue" className={"fl font-16 ml28"}
onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
>查看详情</WordsBtn>
<WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑</WordsBtn>
<WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置</WordsBtn>
</div>}
@ -273,6 +276,10 @@ class CommonWorkItem extends Component{
//
item.work_status && item.work_status.indexOf('查看作品') != -1 &&
<WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkDetailPage(this.props.match.params, item.homework_id, item.work_id)}>查看作品</WordsBtn> }
<WordsBtn style="blue" className={"fl font-16 ml28"}
onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
>查看详情</WordsBtn>
</li>
}
</p>

10
public/react/src/modules/courses/busyWork/UseBank.js
Unescape View File

@ -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 = <Icon type="loading" style={{ fontSize: 24 }} spin />;
console.log("题库选用2222");
console.log("UseBank");
console.log(this.props);
// console.log("题库选用2222");
// console.log("UseBank");
// console.log(this.props);
return(
<a>
<style>{`

6
public/react/src/modules/courses/busyWork/commonWork.js
Unescape View File

@ -218,7 +218,7 @@ class commonWork extends Component{
this.getList(1,search,order);
this.props.updataleftNavfun()
}
console.log(response)
}).catch((error) => {
console.log(error)
})
@ -254,7 +254,7 @@ class commonWork extends Component{
let {search,order, page}=this.state;
this.getList(page,search,order);
}
console.log(response)
}).catch((error) => {
console.log(error)
})
@ -296,7 +296,7 @@ class commonWork extends Component{
let {search,order}=this.state;
this.getList(1,search,order);
}
console.log(response)
}).catch((error) => {
console.log(error)
})

2
public/react/src/modules/courses/common/courseMessage.css
Unescape View File

@ -14,7 +14,7 @@
/* 改宽度 */
.course-message .panel-comment_item .comment_orig_content {
/* width: 1024px; */
width: 1046px;
width: 1040px;
}
/* 子回复按钮 */
.course-message .reply_to_message a.commentsbtn.task-btn-blue {

10
public/react/src/modules/courses/coursesPublic/NewShixunModel.js
Unescape View File

@ -18,7 +18,7 @@ class NewShixunModel extends Component{
keyword:undefined,
order:'desc',
diff:0,
limit:15,
limit:20,
sort:"myshixuns_count",
belongtoindex:0,
}
@ -229,9 +229,9 @@ class NewShixunModel extends Component{
status:'all',
order:'desc',
diff:0,
limit:15,
limit:20,
})
this.getdatalist(1,undefined,'all',value,'desc',0,15)
this.getdatalist(1,undefined,'all',value,'desc',0,20)
}
showNotification = (description, message = "提示", icon) => {
@ -692,11 +692,11 @@ class NewShixunModel extends Component{
}
</Checkbox.Group>
{shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>15?<div className={" edu-txt-center pd303010 newshixunmodels"}>
{shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>20?<div className={" edu-txt-center pd303010 newshixunmodels"}>
<Pagination
showQuickJumper
defaultCurrent={1}
pageSize={15}
pageSize={20}
total={shixuns_count===undefined?"":shixuns_count}
current={page}
onChange={this.PaginationCourse}

2
public/react/src/modules/courses/members/ChangeRolePop.js
Unescape View File

@ -53,7 +53,7 @@ function ChangeRolePop({ member_roles = [], record, courseId, onChangeRoleSucces
}
}
console.log(response)
}
const isAdmin = checkBoxRoles.indexOf('CREATOR') != -1
const isTeacher = checkBoxRoles.indexOf('PROFESSOR') != -1

2
public/react/src/modules/courses/members/CourseGroupList.js
Unescape View File

@ -55,7 +55,7 @@ function CourseGroupList(props) {
const response = await axios.get(url, { params: {
search: searchValue
}});
console.log(response)
setIsSpin(false)
if (response) {
setListRes(response.data)

51
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -68,7 +68,7 @@ class ShixunhomeWorkItem extends Component{
})
// w.close()
}else if(response.data.status===-1){
console.log(response)
}else if(response.data.status===-3){
this.setState({
shixunsmessage:response.data.message,
@ -304,11 +304,11 @@ class ShixunhomeWorkItem extends Component{
<div className="clearfix ds pr pt5 contentSection" >
<style>{`
.maxwidth422{
max-width: 422px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
.maxwidth333{
max-width: 333px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
`}</style>
<h6>
@ -317,21 +317,21 @@ class ShixunhomeWorkItem extends Component{
{
this.props.isAdmin?<a onClick={()=>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}</a>:""
className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
}
{
this.props.isStudent? <a onClick={()=>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}</a>:""
className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
}
{
this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
<span className="fl mt3 font-16 font-bd color-dark maxwidth422 pointer" title={"私有属性，非课堂成员不能访问"}>{discussMessage.name}</span>
<span className="fl mt3 font-16 font-bd color-dark maxwidth333 pointer" title={"私有属性，非课堂成员不能访问"}>{discussMessage.name}</span>
: <a onClick={()=>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}</a>:""
className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
}
@ -349,30 +349,43 @@ class ShixunhomeWorkItem extends Component{
<style>
{
`
.homepagePostSettingname{
width:192px !important;
}
.homepagePostSettingbox{
width:139px !important;
width:207px !important;
}
.colorfff{
color:#fff !important;
}
.newhomepagePostSettingname{
width: 274px !important;
}
.newwidthSettin{
width:255px !important;
}
`
}
</style>
{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}>
{discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:
<a className={"btn colorfff font-16 fontweight400"}>实训详情</a>}
{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16 fontweight400"}>重命名</a>:""}
{this.props.isAdmin?<span onClick={(event)=>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?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情</a>:""}
{discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400 mr20" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:
<a className={"btn colorfff font-16 fontweight400"}>实训详情</a>
}
{discussMessage&&discussMessage.shixun_status>1?"":<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情</a>}
{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue font-16 fontweight400"}>重命名</a>:""}
{/*<WordsBtn className="btn colorblue ml20 font-16" to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>*/}
<WordsBtn className="btn colorblue font-16 ml15 fontweight400" to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>
</span>:""}
{this.props.isStudent===true?this.props.course_identity===5?
<a onClick={()=>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">查看详情</a>
:"":""
}
{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
discussMessage.time_status<5?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt10">
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt2 ">
{startbtn===false?
(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
<a className="btn colorblue" href={getTaskUrlById(discussMessage.task_operation[1])}>

12
public/react/src/modules/forums/MemoDetail.js
Unescape View File

@ -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)

2
public/react/src/modules/forums/MemoDetailMDEditor.js
Unescape View File

@ -57,7 +57,7 @@ class MemoDetailMDEditor extends Component {
errorMsg: ''
})
})
commentMDEditor.cm.focus()
// commentMDEditor.cm.focus()
}, {
watch: false,
dialogLockScreen: false,

3
public/react/src/modules/page/Index.js
Unescape View File

@ -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('该任务已评过星了！')

2
public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
Unescape View File

@ -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,

2
public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
Unescape View File

@ -719,7 +719,7 @@ export default class TPMchallengesnew extends Component {
shixunsskillvaluelist===undefined?"":shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => {
return (
<li key={key} className={"fl ml10 mr10"}>
<Badge className={"tpmpointer"} count={"x"} onClick={(key) => this.delshixunsskilllist(key)}>
<Badge className={"tpmpointer"} count={"x"} onClick={() => this.delshixunsskilllist(key)}>
<Button type="primary" ghost className={"Permanentban "}>
{itme}
</Button>

2
public/react/src/modules/user/usersInfo/banks/banksMenu.js
Unescape View File

@ -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){

Write Preview
Loading…
Cancel
Save