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

Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_home
杨树明 5 years ago
parent f3d6ead7ca b7b017cd27
commit 95b85c542a
6 changed files with 106 additions and 107 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/coursesPublic/NoneData.js
Unescape View File

@ -8,7 +8,7 @@ class NoneData extends Component{
render(){
const { style } = this.props;
return(
<div className="edu-tab-con-box clearfix edu-txt-center" style={style}>
<div className="edu-tab-con-box clearfix edu-txt-center" style={ style || { width:"100%" }}>
<style>
{`
.edu-tab-con-box{

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

@ -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`);
}
@ -545,7 +545,7 @@ 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}>
{
@ -641,10 +641,6 @@ class MessagSub extends Component {
})}
</Spin>
</div>
</div>
{/*页数*/}
{data === undefined ? ""
:
@ -660,6 +656,9 @@ class MessagSub extends Component {
}
</div>
</div>
</div>
)
}
}

5
public/react/src/modules/user/usersInfo/InfosCourse.js
Unescape View File

@ -313,10 +313,11 @@ class InfosCourse extends Component{
{/* 289 */}
{
page == 1 && is_current && !category &&
this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
this.props.current_user && this.props.current_user.user_identity != "学生" ?
<Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
}
{
(!data || (data && data.courses.length==0)) && category && <NoneData></NoneData>
(!data || (data && data.courses.length === 0)) && (category || (!category && this.props.current_user && this.props.current_user.user_identity == "学生")) && <NoneData></NoneData>
}
{
data && data.courses && data.courses.map((item,key)=>{

3
public/react/src/modules/user/usersInfo/InfosPath.js
Unescape View File

@ -327,8 +327,7 @@ class InfosPath extends Component{
<div className="square-list clearfix">
{/* 295 */}
{
page == 1 && is_current && !category &&
this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
}
{
(!data || (data && data.subjects.length==0)) && category && <NoneData></NoneData>

2
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -313,7 +313,7 @@ class InfosProject extends Component{
<div className="square-list clearfix">
{/* 289 */}
{
page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ?
page == 1 && is_current ?
<Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
{...this.props} {...this.state}
></Create>:""

2
public/react/src/modules/user/usersInfo/InfosShixun.js
Unescape View File

@ -335,7 +335,7 @@ class InfosShixun extends Component{
<div className="square-list clearfix">
{/* 298 */}
{
page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
page == 1 && is_current && !category ?
<Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
}
{

Write Preview
Loading…
Cancel
Save