From df6c397db1d1974322d3f78e64c9d25203ff60a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 19 Nov 2019 17:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=A3=E5=BC=8F=E7=89=88?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/message/js/MessagSub.js | 199 +++++++++---------
1 file changed, 99 insertions(+), 100 deletions(-)
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 791b5c063..f4c768cd3 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -122,11 +122,11 @@ class MessagSub extends Component {
if (item.tiding_type === "Apply") {
if (item.auth_type === 1) {
//系统管理页面
- return window.open("/managements/identity_authentication");
+ return window.open("/admins/identity_authentications");
}
if (item.auth_type === 2) {
//系统管理页面
- return window.open("/managements/professional_authentication")
+ return window.open("/admins/professional_authentications")
}
}
if (item.tiding_type === "System") {
@@ -143,7 +143,7 @@ class MessagSub extends Component {
case "ApplyAddDepartment" :
if (item.tiding_type === "Apply") {
//部门审批
- return window.open("/managements/depart")
+ return window.open("/admins/department_applies")
}
if (item.tiding_type === "System") {
// 账号管理页/account/profile
@@ -153,7 +153,7 @@ class MessagSub extends Component {
case "ApplyAddSchools" :
if (item.tiding_type === "Apply") {
// 单位审批
- return window.open(" /managements/unit")
+ return window.open("admins/unit_applies")
}
if (item.tiding_type === "System") {
// 账号管理页
@@ -164,7 +164,7 @@ class MessagSub extends Component {
switch (item.parent_container_type) {
case "ApplyShixun" :
if (item.tiding_type === "Apply") {
- return window.open("/managements/shixun_authorization")
+ return window.open("/admins/shixun_authorizations")
}
if (item.tiding_type === "System") {
// 实训详情页 :identifier = identifier
@@ -173,10 +173,10 @@ class MessagSub extends Component {
case "ApplySubject" :
if (item.tiding_type === "Apply") {
// 实训课程发布
- return window.open("/managements/subject_authorization")
+ return window.open("/admins/subject_authorizations")
}
if (item.tiding_type === "System") {
- // 实践课程详情页 :parent_container_id = parent_container_id
+ // 课程汇总详情页 :parent_container_id = parent_container_id
return window.open(`/paths/${item.parent_container_id}`)
}
@@ -222,7 +222,7 @@ class MessagSub extends Component {
case "Shixun" :
return window.open(`/shixuns/${item.identifier}/challenges`)
case "Subject" :
- // 实践课程详情页 :id = container_id
+ // 课程汇总详情页 :id = container_id
return window.open(`/paths/${item.container_id}`)
case "JournalsForMessage" :
switch (item.parent_container_type) {
@@ -452,7 +452,7 @@ class MessagSub extends Component {
case "Library" :
if (item.tiding_type === 'Apply') {
// /managements/library_applies
- return window.open(`/managements/library_applies`)
+ return window.open(`/admins/library_applies`)
}
if (item.tiding_type === 'System') {
//教学案例详情 :id = container_id
@@ -467,7 +467,7 @@ class MessagSub extends Component {
} else {
if (item.tiding_type === 'Apply') {
///managements/project_package_applies
- return window.open(`/managements/project_package_applies`)
+ return window.open(`/admins/project_package_applies`)
}
// if(item.tiding_type === 'System'){
//众包详情 :id = container_id
@@ -478,7 +478,7 @@ class MessagSub extends Component {
return window.open(`/shixuns/${item.identifier}/shixun_discuss`);
case "Video":
if (item.tiding_type === "Apply") {
- return window.open(`/managements/video_applies`);
+ return window.open(`/admins/video_applies`);
} else if (item.tiding_type === "System") {
return window.open(`/users/${this.props.current_user.login}/videos`);
}
@@ -515,7 +515,7 @@ class MessagSub extends Component {
render() {
let {page, limit, typeysl, count, isSpin, data} = this.state;
// console.log("6868686868");
- console.log(data);
+ console.log(data);
return (
<div className="clearfix ml20">
{/*头部筛选数据*/}
@@ -529,7 +529,7 @@ class MessagSub extends Component {
onClick={(s, i) => this.getdata("project", 1)}>项目提醒</a></li>
{/*<li className={typeysl && typeysl === "project_package" ? "active" : ""}><a*/}
- {/*onClick={(s, i) => this.getdata("project_package", 1)}>众包提醒</a></li>*/}
+ {/*onClick={(s, i) => this.getdata("project_package", 1)}>众包提醒</a></li>*/}
<li className={typeysl && typeysl === "interaction" ? "active" : ""}><a
onClick={(s, i) => this.getdata("interaction", 1)}>互动提醒</a></li>
@@ -545,123 +545,122 @@ class MessagSub extends Component {
{/*下面内容页面*/}
<div className="bor-top-greyE mycenter">
{/*这里可以进行数据处理*/}
- <div className="myw100baifenbi edu-back-white">
+ <div className="myw100baifenbi">
<Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
{
data === undefined ?
<NoneData></NoneData> :
data.length === 0 ?
- <NoneData></NoneData>
- : data.map((item, key) => {
- // console.log(data)
- // ridinglist-subs
- var boolps = true;
- if (item.container_type === "PraiseTread" || item.container_type === "Grade" || item.container_type === "ChallengeWorkScore") {
- boolps = false;
- }
- if (item.container_type === "JournalsForMessage") {
- if (item.parent_container_type === "Principal") {
+ <NoneData></NoneData>
+ : data.map((item, key) => {
+ // console.log(data)
+ // ridinglist-subs
+ var boolps = true;
+ if (item.container_type === "PraiseTread" || item.container_type === "Grade" || item.container_type === "ChallengeWorkScore") {
boolps = false;
}
- if (item.parent_container_type === "HomeworkCommon") {
- if (item.homework_type === null || item.homework_type === undefined) {
+ if (item.container_type === "JournalsForMessage") {
+ if (item.parent_container_type === "Principal") {
boolps = false;
}
+ if (item.parent_container_type === "HomeworkCommon") {
+ if (item.homework_type === null || item.homework_type === undefined) {
+ boolps = false;
+ }
+ }
}
- }
- // if(item.container_type==="HomeworkCommon"){
- // if(item.parent_container_type==="AnonymousAppeal"){
- // boolps=false;
- // }
- // }
- if (item.container_type === "ProjectPackage") {
- if (item.tiding_type === "Destroyed_end") {
- boolps = false;
- }
- if (item.tiding_type === "Destroyed") {
- boolps = false;
+ // if(item.container_type==="HomeworkCommon"){
+ // if(item.parent_container_type==="AnonymousAppeal"){
+ // boolps=false;
+ // }
+ // }
+ if (item.container_type === "ProjectPackage") {
+ if (item.tiding_type === "Destroyed_end") {
+ boolps = false;
+ }
+ if (item.tiding_type === "Destroyed") {
+ boolps = false;
+ }
}
- }
- if (item.container_type === "Course") {
- if (item.tiding_type === "Delete") {
- boolps = false;
+ if (item.container_type === "Course") {
+ if (item.tiding_type === "Delete") {
+ boolps = false;
+ }
}
- }
- if (item.container_type === "DeleteCourse") {
- if (item.tiding_type === "System") {
- boolps = false;
+ if (item.container_type === "DeleteCourse") {
+ if (item.tiding_type === "System") {
+ boolps = false;
+ }
}
- }
- if (item.container_type === "DeleteCourseMember") {
- if (item.tiding_type === "System") {
- boolps = false;
+ if (item.container_type === "DeleteCourseMember") {
+ if (item.tiding_type === "System") {
+ boolps = false;
+ }
}
- }
- 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="fl flex1">
- <p>
- <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 ?
- <span className="edu-filter-btn ml20 edu-filter-btn-red">待处理</span> : ""
- ) : ""}
- {item.tiding_type === "Apply" ? (
- item.status === 1 ?
- <span className="edu-filter-btn ml20 edu-filter-btn-green">已处理</span> : ""
- ) : ""}
+ 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="fl flex1">
+ <p>
+ <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 ?
+ <span className="edu-filter-btn ml20 edu-filter-btn-red">待处理</span> : ""
+ ) : ""}
+ {item.tiding_type === "Apply" ? (
+ item.status === 1 ?
+ <span className="edu-filter-btn ml20 edu-filter-btn-green">已处理</span> : ""
+ ) : ""}
- </p>
- <style>
- {
- `.yslspansk span{
+ </p>
+ <style>
+ {
+ `.yslspansk span{
color: #FF9966!important;
}
`
- }
- </style>
- <p className="color-grey-6 yslspansk markdown-body mt10" style={{wordBreak: "break-word"}}
- dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}></p>
+ }
+ </style>
+ <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>
</div>
- <span className={item.new_tiding === true ? "new-point fr mr40 mt22" : ""}></span>
</div>
-
- </div>
- )
- })}
+ )
+ })}
</Spin>
+ {/*页数*/}
+ {data === undefined ? ""
+ :
+ (count > 10 ?
+ <div style={{textAlign: "center"}} className="new_expand mt10">
+ <div className="edu-txt-center mt30">
+ <Pagination showQuickJumper current={page}
+ onChange={this.paginationonChanges} pageSize={limit}
+ total={count}></Pagination>
+ </div>
+ </div> : ""
+ )
+ }
</div>
</div>
- {/*页数*/}
- {data === undefined ? ""
- :
- (count > 10 ?
- <div style={{textAlign: "center"}} className="new_expand mt10">
- <div className="edu-txt-center mt30">
- <Pagination showQuickJumper current={page}
- onChange={this.paginationonChanges} pageSize={limit}
- total={count}></Pagination>
- </div>
- </div> : ""
- )
-
- }
</div>
)
}
}
-export default MessagSub;
\ No newline at end of file
+export default MessagSub;