调整

public/react/src/modules/message/js/MessagSub.js

@@ -6,6 +6,7 @@ import {
 import axios from 'axios';
 import {getImageUrl, markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
+
 //消息页面
 class MessagSub extends Component {
 	constructor(props) {
@@ -19,6 +20,7 @@ class MessagSub extends Component{
 			data: undefined,
 		}
 	}
+
 	// 初始化数据
 	componentDidMount() {
 		// console.log("初始化数据了MessagSub");
@@ -48,11 +50,13 @@ class MessagSub extends Component{
 		})
 		let {limit} = this.state;
 		let url = `/users/tidings.json`;
-		axios.get((url),{params:{
+		axios.get((url), {
+			params: {
 				type: types,
 				page: page,
 				per_page: limit,
-			}}).then((result) => {
+			}
+		}).then((result) => {
 			if (result) {
 				// if (result.data.status === 0) {
 
@@ -78,11 +82,13 @@ class MessagSub extends Component{
 		})
 		let {typeysl, page, limit} = this.state;
 		let url = `/users/tidings.json`;
-		axios.get((url),{params:{
+		axios.get((url), {
+			params: {
 				type: typeysl,
 				page: page,
 				per_page: limit,
-			}}).then((result) => {
+			}
+		}).then((result) => {
 			if (result) {
 				// if (result.data.status === 0) {
 
@@ -481,11 +487,17 @@ class MessagSub extends Component{
 				return window.open(`/courses/${item.container_id}/informs`);
 			case "SubjectStartCourse":
 				return window.open(`/paths/${item.container_id}`);
+			case "ResubmitStudentWork":
+				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}/appraise`);
+			case "AdjustScore":
+				//belong_container_id course的id
+				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`);
 			default :
 				return window.open("/")
 		}
 
 	}
+
 	render() {
 		let {page, limit, typeysl, count, isSpin, data} = this.state;
 		// console.log("6868686868");
@@ -496,19 +508,23 @@ class MessagSub extends Component{
 				<ul className="pl10 ridingNav clearfix edu-back-white">
 					<li className={typeysl === "" ? "active" : ""}><a onClick={(s, i) => this.getdata("", 1)}>全部</a></li>
 
-			 <li className={typeysl&&typeysl==="course"?"active":""} ><a onClick={(s,i)=>this.getdata("course",1)}>课堂提醒</a></li>
-
-			 <li className={typeysl&&typeysl==="project"?"active":""} ><a onClick={(s,i)=>this.getdata("project",1)}>项目提醒</a></li>
+					<li className={typeysl && typeysl === "course" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("course", 1)}>课堂提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="project_package"?"active":""}><a onClick={(s,i)=>this.getdata("project_package",1)}>众包提醒</a></li>
+					<li className={typeysl && typeysl === "project" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("project", 1)}>项目提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="interaction"?"active":""}><a onClick={(s,i)=>this.getdata("interaction",1)}>互动提醒</a></li>
+					<li className={typeysl && typeysl === "project_package" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("project_package", 1)}>众包提醒</a></li>
 
-			 <li className={typeysl&&typeysl==="apply"?"active":""}><a onClick={(s,i)=>this.getdata("apply",1)}>审核</a></li>
-
-			 <li className={typeysl&&typeysl==="notice"?"active":""}><a onClick={(s,i)=>this.getdata("notice",1)}>通知</a></li>
+					<li className={typeysl && typeysl === "interaction" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("interaction", 1)}>互动提醒</a></li>
 
+					<li className={typeysl && typeysl === "apply" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("apply", 1)}>审核</a></li>
 
+					<li className={typeysl && typeysl === "notice" ? "active" : ""}><a
+						onClick={(s, i) => this.getdata("notice", 1)}>通知</a></li>
 
 
 				</ul>
@@ -562,11 +578,16 @@ class MessagSub extends Component{
 
 										return (
 											<div className="pl25 ridinglist edu-back-white" key={key}>
-										 <div className={boolps===true?"ridinglist-sub clearfix df tiding_item":"ridinglist-subs 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={boolps === true ? "ridinglist-sub clearfix df tiding_item" : "ridinglist-subs 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>
-													 <a className="mr20 private_message_a" onMouseDown={()=>this.myCome(item)}>{item.trigger_user.name}</a>
+															<a className="mr20 private_message_a"
+																 onMouseDown={() => this.myCome(item)}>{item.trigger_user.name}</a>
 															<span className="color-grey-c">{item.time}</span>
 															{item.tiding_type === "Apply" ? (
 																item.status === 0 ?
@@ -586,7 +607,8 @@ class MessagSub extends Component{
 													 	`
 															}
 														</style>
-												 <p className="color-grey-6 yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
+														<p className="color-grey-6 yslspansk markdown-body mt10" style={{wordBreak: "break-word"}}
+															 dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}></p>
 													</div>
 
 													<span className={item.new_tiding === true ? "new-point fr mr40 mt22" : ""}></span>
@@ -618,4 +640,5 @@ class MessagSub extends Component{
 		)
 	}
 }
+
 export default MessagSub;