diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb index 5a0dc8a37..98afcb165 100644 --- a/app/models/user_extension.rb +++ b/app/models/user_extension.rb @@ -1,6 +1,6 @@ class UserExtension < ApplicationRecord # identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者 - enum identity: { teacher: 0, student: 1, professional: 2, developer: 3 } + enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, cnmooc: 4, unselect: -1 } belongs_to :user, touch: true belongs_to :school, optional: true diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js index 34044330d..25ae55203 100644 --- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js +++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js @@ -63,7 +63,7 @@ class TabRightComponents extends Component{ }) } }else { - this.props.slowDownload(url) + this.props.slowDownload(url); // this.props.showNotification(`正在下载中`); // window.open("/api"+url, '_blank'); } diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 3db3846fe..29e836744 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1031,8 +1031,9 @@ class Listofworksstudentone extends Component { // console.log(this.props); // console.log(this.props.isAdmin()) this.student(); - console.log("Listofworksstudentone---------------"); - console.log(this.props); + // console.log("Listofworksstudentone---------------"); + // console.log(this.props); + // console.log(JSON.stringify(this.props)); } isupdatas = () => { var homeworkid = this.props.match.params.homeworkid; @@ -2475,8 +2476,7 @@ class Listofworksstudentone extends Component { }) } }else { - this.props.showNotification(`正在下载中`); - window.open("/api"+url, '_blank'); + this.props.slowDownload(url); } }).catch((error) => { console.log(error) @@ -2498,8 +2498,9 @@ class Listofworksstudentone extends Component { let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; - console.log("Listofworksstudentone+++++++++"); - console.log(this.props); + // console.log("Listofworksstudentone+++++++++"); + // console.log(this.props); + // console.log(JSON.stringify(this.props)); return ( this.props.isAdmin() === true ? ( diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js index d8623d84b..21524e627 100644 --- a/public/react/src/modules/page/MainContent.js +++ b/public/react/src/modules/page/MainContent.js @@ -100,6 +100,9 @@ class MainContent extends Component { vnc_url={vnc_url} {...this.props} > +
+ +
: