diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js index 6869b6b71..788ce8ac8 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js +++ b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js @@ -40,8 +40,8 @@ class coursesHomeCard extends Component{ className="mt80 mb25"/>

非成员不能访问

- {/**/} - + + {/**/} {/*target="_blank"*/} { item.is_public===1&&item.id===1309? diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js index 9019fe7a1..6808ded8a 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js @@ -119,7 +119,7 @@ class AccessoryModal2 extends Component{ } } Saves=()=>{ - debugger + // debugger let {fileList,description} =this.state; let newfileList=[]; for(var list of fileList){ diff --git a/public/react/src/modules/courses/coursesPublic/Associationmodel.js b/public/react/src/modules/courses/coursesPublic/Associationmodel.js index f792fc63b..a1f5a9e70 100644 --- a/public/react/src/modules/courses/coursesPublic/Associationmodel.js +++ b/public/react/src/modules/courses/coursesPublic/Associationmodel.js @@ -59,7 +59,7 @@ class Associationmodel extends Component{ goback=()=>{ - debugger + // debugger this.setState({ Modalstype:false, }) @@ -70,7 +70,7 @@ class Associationmodel extends Component{ setSaves=()=>{ - debugger + // debugger let {projectvalue}=this.state; let taskid=this.props.taskid; let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json"; diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index 6fa082f59..b5e7ab820 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -86,7 +86,7 @@ class Exercisestatisticalresult extends Component { page:pageNumber }) - debugger + // debugger $('html').animate({ scrollTop: 10 }, 1000); diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 60fc8e21b..044d0a3ae 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -122,6 +122,11 @@ class GraduationTasksSubmitedit extends Component{ let fileList = info.fileList; this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); } + + if (info.file.status === 'done') { + let fileList = info.fileList; + this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); + } } //onAttachmentRemove = (file) => { @@ -393,7 +398,7 @@ class GraduationTasksSubmitedit extends Component{ // console.log(fileList); if(values.description===undefined||values.description===""){ this.scrollToAnchor("valuestypes"); - debugger + // debugger return } if(workslist.task_type===2){ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index d0cedb487..ee0e98f16 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -117,10 +117,17 @@ class GraduationTasksSubmitnew extends Component{ } // 附件相关 START handleChange = (info) => { + debugger if (info.file.status === 'uploading') { let fileList = info.fileList; this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); } + + if (info.file.status === 'done') { + let fileList = info.fileList; + this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); + } + } onAttachmentRemove = (file) => { @@ -358,7 +365,7 @@ class GraduationTasksSubmitnew extends Component{ //公用数据 Commoninterface = (fileList,selectmemberslist,workslist)=>{ - debugger + // debugger let userids=[]; for(var list of selectmemberslist){ @@ -384,7 +391,7 @@ class GraduationTasksSubmitnew extends Component{ // console.log(fileList); if(values.description===undefined||values.description===""){ this.scrollToAnchor("valuestypes"); - debugger + // debugger return } if(workslist&&workslist.task_type===2){ @@ -460,7 +467,7 @@ class GraduationTasksSubmitnew extends Component{ //确认 hidestartshixunsreplace=()=>{ - debugger + // debugger let {fileList,selectmemberslist,workslist}=this.state; this.Commoninterface(fileList,selectmemberslist,workslist); diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 637a4f3c6..2e9efba0c 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -145,7 +145,7 @@ class GraduationTasksedit extends Component{ } onAttachmentRemove = (file) => { - debugger + // debugger this.cancelAttachment(); const url = `/attachments/${file.response ? file.response.id : file.uid}.json` // const url = `/attachments/${file}.json` diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index 7bf9b690b..493fc1916 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -37,7 +37,7 @@ class GraduationTasks extends Component{ } } fetchAll = (search,page,order,count) => { -debugger +// debugger const cid = this.props.match.params.coursesId @@ -554,7 +554,7 @@ debugger } // 题库选用成功后刷新页面 useBankSuccess=(checkBoxValues,object_ids)=>{ - debugger + // debugger let {search,page,order,all_count} = this.state; this.fetchAll(search,page,order,all_count) } diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index f3442b8b7..e126027ec 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -40,6 +40,8 @@ class CoursesNew extends Component { } componentDidMount() { + + let coursesId = this.props.match.params.coursesId; let user_school=this.props.current_user&&this.props.current_user.user_school; @@ -85,7 +87,13 @@ class CoursesNew extends Component { this.Searchvalue("") } - + componentDidUpdate(prevProps){ + if(prevProps.current_user!=this.props.current_user){ + if(this.props.current_user.user_identity==="学生"){ + window.location.href ="/403" + } + } + } onChangeTimepublishs = (date, dateString) => { if(dateString===""){ this.setState({ diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js index ac0417f39..292830fb8 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -115,7 +115,7 @@ class PollDetailTabForthRules extends Component{ } //修改发布规则里面的发布时间 changeRulePublishTime=(e,date,index)=>{ - debugger + // debugger let arr=Object.assign({}, this.state.rules[parseInt(index)]); arr.publish_time=date=== ""?"":moment(handleDateString(date)).format("YYYY-MM-DD HH:mm"); if(!arr.end_time){ diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index 8e8bfd112..ed967134e 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/public/react/src/modules/login/EducoderLogin.js @@ -72,7 +72,8 @@ class EducoderLogin extends Component { showbool: 3, logini:3, namezh:"", - passmm:"" + passmm:"", + loginstatus:true, } }else { if(props.match.url === "/login"){ @@ -98,8 +99,8 @@ class EducoderLogin extends Component { showbool: 1, logini:1, namezh:"", - passmm:"" - + passmm:"", + loginstatus:true, } } @@ -162,7 +163,7 @@ class EducoderLogin extends Component {
this.Setshowbool(e,name,pass)} > + Setshowbool={(e)=>this.Setshowbool(e)} >
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index a5f0529e0..7e072e2bf 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -7,7 +7,7 @@ import Dialog, { DialogContentText, DialogTitle, } from 'material-ui/Dialog'; - +import {notification } from 'antd'; import axios from 'axios'; @@ -346,10 +346,19 @@ class LoginDialog extends Component { if(response===undefined){ return } + if(response.data.identity === null || response.data.identity === undefined){ + this.props.history.push("/interesse"); + return; + } if(response.status===200){ if (response.data.status === 402) { window.location.href = response.data.url; - }else{ + }else if (response.data.status === -2) { + notification.open({ + message: '提示', + description:response.data.message, + }); + }else{ broadcastChannelPostMessage('refreshPage') this.setState({ isRender:false diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js index 0cac533d1..115f7066c 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCards.js +++ b/public/react/src/modules/paths/PathDetail/DetailCards.js @@ -228,7 +228,7 @@ class DetailCards extends Component{ isSpin:true, }) axios.get(url).then((response) => { - debugger + // debugger if(response.status===200){ // let path="/shixuns/"+response.data.shixun_identifier+"/challenges"; // this.props.history.push(path); diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 43152a074..f53159c7c 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -635,7 +635,7 @@ submittojoinclass=(value)=>{ 高校智能化教学与实训平台 -
+
@@ -792,9 +792,7 @@ submittojoinclass=(value)=>{