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 (
{/*头部筛选数据*/} @@ -529,7 +529,7 @@ class MessagSub extends Component { onClick={(s, i) => this.getdata("project", 1)}>项目提醒 {/*
  • this.getdata("project_package", 1)}>众包提醒
  • */} + {/*onClick={(s, i) => this.getdata("project_package", 1)}>众包提醒*/}
  • this.getdata("interaction", 1)}>互动提醒
  • @@ -545,123 +545,122 @@ class MessagSub extends Component { {/*下面内容页面*/}
    {/*这里可以进行数据处理*/} -
    +
    { data === undefined ? : data.length === 0 ? - - : 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") { + + : 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 ( -
    -
    this.gettourl(item)}> - this.myCome(item)} - src={getImageUrl("images/" + item.trigger_user.image_url)} - className="radius mr10 fl myimgw48 myimgh48"/> -
    -

    - this.myCome(item)}>{item.trigger_user.name} - {item.time} - {item.tiding_type === "Apply" ? ( - item.status === 0 ? - 待处理 : "" - ) : ""} - {item.tiding_type === "Apply" ? ( - item.status === 1 ? - 已处理 : "" - ) : ""} + return ( +

    +
    this.gettourl(item)}> + this.myCome(item)} + src={getImageUrl("images/" + item.trigger_user.image_url)} + className="radius mr10 fl myimgw48 myimgh48"/> +
    +

    + this.myCome(item)}>{item.trigger_user.name} + {item.time} + {item.tiding_type === "Apply" ? ( + item.status === 0 ? + 待处理 : "" + ) : ""} + {item.tiding_type === "Apply" ? ( + item.status === 1 ? + 已处理 : "" + ) : ""} -

    - -

    + } + +

    +
    + +
    -
    - -
    - ) - })} + ) + })} + {/*页数*/} + {data === undefined ? "" + : + (count > 10 ? +
    +
    + +
    +
    : "" + ) + }
    - {/*页数*/} - {data === undefined ? "" - : - (count > 10 ? -
    -
    - -
    -
    : "" - ) - - }
    ) } } -export default MessagSub; \ No newline at end of file +export default MessagSub;