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

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_cs_new
cxt 6 years ago
parent 7d34d8ea3c 2eb8948aa6
commit a8a6374c67
5 changed files with 447 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/modules/message/js/MessagChat.js
Unescape View File

@ -48,6 +48,7 @@ class MessagChat extends Component{
// console.log(this.props);
// console.log(this.props.match.params.userid);
this.scrollToBottom();
this.props.triggerRef(this)
}
componentDidUpdate() {
@ -109,6 +110,7 @@ class MessagChat extends Component{
// }
};
shuaxingetChatList=(page,listl,target_ids,bool)=>{
this.setState({
isSpin:true,
@ -384,7 +386,9 @@ class MessagChat extends Component{
// console.log(i);
this.props.Modifyur(i);
};
getdatas2=()=>{
}
// 点击了用户
Clickedontheuser=(user)=>{
// debugger

381
public/react/src/modules/message/js/MessagSub.js
Unescape View File

@ -30,6 +30,7 @@ class MessagSub extends Component{
}catch (e) {
}
this.props.triggerRef(this)
}
//塞选页数
@ -70,6 +71,36 @@ class MessagSub extends Component{
isSpin:false,
})
})
};
getdatas=()=>{
this.setState({
isSpin:true,
})
let{typeysl,page,limit}=this.state;
let url = `/users/tidings.json`;
axios.get((url),{params:{
type:typeysl,
page:page,
per_page:limit,
}}).then((result) => {
if (result) {
// if (result.data.status === 0) {
this.setState({
page: page,
count: result.data.count,
typeysl: typeysl,
isSpin: false,
data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings,
})
// }
}
}).catch((error) => {
console.log(error);
this.setState({
isSpin:false,
})
})
}
componentWillUnmount(){
@ -78,6 +109,343 @@ class MessagSub extends Component{
return;
}
}
gettourl=(item)=>{
switch (item.container_type) {
case "ApplyUserAuthentication" :
if(item.tiding_type==="Apply"){
if(item.auth_type===1){
//系统管理页面
return window.location.href="/managements/identity_authentication";
}
if(item.auth_type===2){
//系统管理页面
return window.location.href="/managements/professional_authentication";
}
}
if(item.tiding_type ==="System"){
// 账号管理页-认证信息
return window.location.href="/account/certification";
}
case "CancelUserAuthentication" :
// 账号管理页-认证信息
return window.location.href="/account/certification";
case "CancelUserProCertification" :
// 账号管理页-认证信息
return window.location.href="/account/certification";
case "ApplyAddDepartment" :
if(item.tiding_type==="Apply"){
//部门审批
return window.location.href="/managements/depart";
}
if(item.tiding_type==="System"){
// 账号管理页/account/profile
return window.location.href="/account/profile";
}
case "ApplyAddSchools" :
if(item.tiding_type==="Apply"){
// 单位审批
return window.location.href=" /managements/unit";
}
if(item.tiding_type==="System"){
// 账号管理页
return window.location.href="/account/profile";
}
case "ApplyAction" :
switch (item.parent_container_type) {
case "ApplyShixun" :
if(item.tiding_type==="Apply"){
return window.location.href="/managements/shixun_authorization";
}
if(item.tiding_type==="System"){
// 实训详情页 :identifier = identifier
return window.location.href=`/shixuns/${item.identifier}/challenges`;
}
case "ApplySubject" :
if(item.tiding_type==="Apply"){
// 实训课程发布
return window.location.href="/managements/subject_authorization";
}
if(item.tiding_type==="System"){
// 实践课程详情页 :identifier = identifier
return window.location.href=`/paths/${item.identifier}`;
}
case "TrialAuthorization" :
if(item.tiding_type==="Apply"){
// 试用授权页面
return window.location.href="/managements/trial_authorization";
}
if(item.tiding_type==="System"){
// 账号管理页
return window.location.href="/account/profile";
}
}
case 'JoinCourse' :
// 课堂详情页 :id =
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case 'StudentJoinCourse':
// 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case 'DealCourse':
// 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case 'TeacherJoinCourse':
// 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case 'Course' :
// 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case 'ArchiveCourse' :
// 课堂详情页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case "Shixun" :
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`;
case "Subject" :
// 实践课程详情页 :id = container_id
return window.location.href=`/paths/${item.identifier}`;
case "JournalsForMessage" :
switch (item.parent_container_type) {
case "Principal" :
// 反馈页 :id = parent_container_id
// 不用跳了
return '';
case "HomeworkCommon" :
//学生作业页 homework = parent_container_id
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
return '';
case "GraduationTopic" :
// 毕业目标页 parent_container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`;
case "StudentWorksScore" :
//学生作业页
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
}
case "Memo" :
// 交流问答页 :id = parent_container_id
return window.location.href="/forums/categories/all?order=newest";
case "Watcher" :
// 用户个人中心页 :id = item.trigger_user.login
return window.location.href=`/users/${item.trigger_user.login}/courses`;
case "PraiseTread" :
// 这块太复杂 不好处理
return '';
case "Grade" :
//个人中心页 :id = item.trigger_user.login
return window.location.href=`/users/${item.trigger_user.login}/courses`;
case "JoinProject" :
//项目详情-申请加入项目审核页 :id = container_id
return window.location.href=`/projects/${item.container_id}`;
case 'ReporterJoinProject':
//项目详情页 :id = container_id
return window.location.href=`/projects/${item.container_id}`;
case 'DealProject':
//项目详情页 :id = container_id
return window.location.href=`/projects/${item.container_id}`;
case 'ManagerJoinProject':
//项目详情页 :id = container_id
return window.location.href=`/projects/${item.container_id}`;
case "Poll":
switch (item.parent_container_type) {
case "CommitPoll" :
// 课堂id belong_container_id
//课堂-学生已提交问卷列表 :id = container_id
return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`;
default :
// 课堂-问卷列表 :id = container_id
return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`;
}
case "Exercise" :
switch (item.parent_container_type) {
case "CommitExercise":
// 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id
return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`;
case "ExerciseScore":
// 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id
return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`;
default :
// 课堂-试卷列表详情 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/exercises/${item.container_id}`;
}
case 'StudentGraduationTopic' :
//课堂-毕业选题详情 :id = parent_container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`;
case 'DealStudentTopicSelect' :
//课堂-毕业选题详情 :id = parent_container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`;
case 'GraduationTask' :
//课堂-毕业任务页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`;
case "GraduationWork" :
//课堂-毕业xx页 :id = container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`;
case "GraduationWorkScore" :
// 课堂-毕业xx页 :id = parent_container_id
return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`;
case "HomeworkCommon" :
switch (item.parent_container_type) {
case "AnonymousCommentFail" :
// 课堂-作业列表 homework = container_id
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
case "HomeworkPublish" :
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
case "AnonymousAppeal" :
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
default :
// 课堂-作业列表 homework = container_id
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
}
case "StudentWork" :
//课堂-作业 :id = container_id
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
case "StudentWorksScore" :
//课堂-作业 :id = parent_container_id
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
case "StudentWorksScoresAppeal" :
if(item.homework_type===1){
//普通作业
return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===3){
//分组作业
return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`;
}
if(item.homework_type===4){
//实训作业
return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`;
}
case "ChallengeWorkScore" :
return '';
case "SendMessage" :
// /managements/mirror_repository
return window.location.href=`/managements/mirror_repository`;
case "Journal" :
//项目Issue页 :id = parent_container_id
return window.location.href=`/projects/${item.parent_container_id}/issues?remote=true`;
case "Issue" :
//项目Issue页 :id = container_id
return window.location.href=`/projects/${item.container_id}/issues?remote=true`;
case "PullRequest" :
// 项目pull request页 :id = parent_container_id
return window.location.href=`/projects/${item.parent_container_id}/pull_requests`;
case "Department" :
//账号管理页
return window.location.href=`/account/profile`;
case "Library" :
if (item.tiding_type === 'Apply') {
// /managements/library_applies
return window.location.href=`/managements/library_applies`;
}
if(item.tiding_type === 'System'){
//教学案例详情 :id = container_id
return window.location.href=`/moop_cases/${item.container_id}`;
}
case "ProjectPackage" :
if(item.tiding_type==="Destroyed_end"){
return ;
}else {
// if (item.tiding_type === 'Apply') {
// ///managements/project_package_applies
// return window.location.href=`/managements/project_package_applies`;
// }
// if(item.tiding_type === 'System'){
//众包详情 :id = container_id
return window.location.href=`/crowdsourcing/${item.container_id}`;
// }
}
default :
return window.location.href="/";
}
}
render() {
let{page,limit,typeysl,count,isSpin,data}=this.state;
// console.log("6868686868");
@ -120,7 +488,7 @@ class MessagSub extends Component{
console.log(data)
return(
<div className="pl25 ridinglist edu-back-white" key={key}>
<div className="ridinglist-sub clearfix df tiding_item">
<div className="ridinglist-sub clearfix df tiding_item" onClick={()=>this.gettourl(item)}>
<img onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>
<div className="fl flex1">
<p>
@ -136,12 +504,15 @@ class MessagSub extends Component{
):""}
</p>
<p className="color-grey-6 break_word_firefox" style={{wordBreak: "break-word"}}>
<style>
{
item.content
`.yslspansk span{
color: #FF9966!important;
}
`
}
</p>
</style>
<p className="color-grey-6 break_word_firefox yslspansk" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html:item.content}}></p>
</div>
<span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>

35
public/react/src/modules/message/js/MessagePrivate.js
Unescape View File

@ -31,6 +31,7 @@ class MessagePrivate extends Component{
}catch (e) {
}
this.props.triggerRef(this)
// console.log("MessagePrivate");
// console.log(this.props);
// console.log(this.props.match.params.userid);
@ -80,6 +81,40 @@ class MessagePrivate extends Component{
})
})
};
getdatas2=()=>{
this.setState({
isSpin:true,
});
let{limit,page}=this.state;
let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`;
// let url = `/users/71519/private_messages.json`;
axios.get((url),{params:{
page:page,
per_page:limit,
}}).then((result) => {
if (result) {
// console.log(types);
// console.log(result);
// console.log("调用了消失的方法");
// console.log("5454545454");
// if (result.data.status === 0) {
this.setState({
page: page,
count: result.data.count,
isSpin: false,
data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages,
})
// }
}
}).catch((error) => {
console.log(error);
this.setState({
isSpin:false,
})
})
};
paginationonChanges=(pageNumber)=>{
this.setState({

38
public/react/src/modules/message/js/Messagerouting.js
Unescape View File

@ -46,6 +46,7 @@ class Messagerouting extends Component{
}
componentDidUpdate(prevProps) {
// console.log("11111111111");
// console.log(prevProps);
@ -74,17 +75,21 @@ class Messagerouting extends Component{
})
};
SwitchonClick=(value)=>{
SwitchonClick=(value,child)=>{
this.setState({
routing:value,
});
this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
if(value===1){
this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`);
this.homeworkendss1(child);
}
if(value===2){
this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);;
this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);
this.homeworkendss2(child);
}
};
@ -145,6 +150,21 @@ class Messagerouting extends Component{
routing:3,
});
}
};
bindRef = ref => { this.child = ref };
homeworkendss1(child){
// console.log(child);
// // console.log(this.refs.childModel);
// console.log(child);
child.getdatas();
//
}
homeworkendss2(child){
// console.log(child);
// // console.log(this.refs.childModel);
// console.log(child);
child.getdatas2();
//
}
render() {
let{routing,unread_message_count,unread_tiding_count} =this.state;
@ -171,12 +191,12 @@ class Messagerouting extends Component{
{/*路由跳转*/}
<ul className="edu-back-white">
<li className={routing ===1?"nav pr active":"nav pr"}>
<a onClick={(value)=>this.SwitchonClick(1)}>消息</a>
{unread_tiding_count>0?<span className="new-info">{unread_message_count}</span>:""}
<a onClick={(value,child)=>this.SwitchonClick(1,this.child)}>消息</a>
{unread_message_count===0?"":unread_message_count>0?<span className="new-info">{unread_message_count}</span>:""}
</li>
<li className={routing ===2?"nav pr active":routing ===3?"nav pr active":"nav pr"}>
<a onClick={(value)=>this.SwitchonClick(2)}>私信</a>
{unread_tiding_count>0?<span className="new-info">{unread_tiding_count}</span>:""}
<a onClick={(value,child)=>this.SwitchonClick(2,this.child)}>私信</a>
{unread_tiding_count===0?"":unread_tiding_count>0?<span className="new-info">{unread_tiding_count}</span>:""}
</li>
</ul>
</div>
@ -197,19 +217,19 @@ class Messagerouting extends Component{
{/*/!*消息自路由*! name 是 /message/info/:userid/*/}
<Route path="/message/:userid/user_tidings"
render={
(props) => (<MessagSub {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagSub>)
(props) => (<MessagSub triggerRef={this.bindRef} {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagSub>)
}
></Route>
{/*/!*私信*! name 是letter/*/}
<Route path="/message/:userid/private_messages"
render={
(props) => (<MessagePrivate {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagePrivate> )
(props) => (<MessagePrivate triggerRef={this.bindRef} {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagePrivate> )
}
></Route>
{/*/!*私信聊天页面*! letters/*/}
<Route path="/message/:userid/message_detail"
render={
(props) => (<MessagChat {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagChat>)
(props) => (<MessagChat triggerRef={this.bindRef} {...this.state} {...this.props} {...props} Message2={()=>this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}></MessagChat>)
}
></Route>

6
public/react/src/search/SearchPage.js
Unescape View File

@ -150,9 +150,9 @@ class SearchPage extends Component{
<div className="tabtitle">
<div className="tabtitles2">
<Menu mode="horizontal" className="tabtitless" selectedKeys={tab} onClick={this.changeTab}>
<Menu.Item className={"tabtitle1"} key="0">开发社区</Menu.Item>
<Menu.Item className={"tabtitle2"} key="1">实践课程</Menu.Item>
<Menu.Item className={"tabtitle2"} key="2">翻转课堂</Menu.Item>
<Menu.Item className={"tabtitle1"} key="1">实践课程</Menu.Item>
<Menu.Item className={"tabtitle2"} key="2">翻转课堂</Menu.Item>
<Menu.Item className={"tabtitle2"} key="0">开发社区</Menu.Item>
<Menu.Item className={"tabtitle2"} key="3">交流问答</Menu.Item>
</Menu>
</div>

Write Preview
Loading…
Cancel
Save