From 3defc533a22993f7b3cec1b17a161ff74ec4eb39 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 22 Sep 2019 17:52:18 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 4a087ae7a..d72c534a0 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -477,6 +477,10 @@ class GamesController < ApplicationController tip_exception("代码获取异常，请检查实训模板的评测设置是否正确") else # 报错继续retry + if params[:retry].to_i == 1 + # 如果报错了，并且retry 为1的时候，则fork一个新的仓库 + project_fork(@myshixun, @shixun.repo_path, current_user.login) + end tip_exception(-3, "#{e.message}") end end From a241477100e9e255301952d036cf837256a7e3eb Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 22 Sep 2019 18:02:29 +0800 Subject: [PATCH 02/26] .. --- app/controllers/games_controller.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index d72c534a0..be8173b2f 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -476,14 +476,13 @@ class GamesController < ApplicationController if @myshixun.shixun.try(:status) < 2 tip_exception("代码获取异常，请检查实训模板的评测设置是否正确") else - # 报错继续retry - if params[:retry].to_i == 1 - # 如果报错了，并且retry 为1的时候，则fork一个新的仓库 - project_fork(@myshixun, @shixun.repo_path, current_user.login) - end tip_exception(-3, "#{e.message}") end end + # 如果报错了，并且retry 为1的时候，则fork一个新的仓库 + if params[:retry].to_i == 1 + project_fork(@myshixun, @shixun.repo_path, current_user.login) + end tip_exception(0, e.message) end end From a5e6ad081af2ce173ce7557f618ee21ddd0b5cc4 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 23 Sep 2019 08:49:57 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 30 +++++++++++------------ app/controllers/application_controller.rb | 16 ++++++++++++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 46b3964c2..ef30dac83 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -127,21 +127,21 @@ class AccountsController < ApplicationController # UserDayCertification.create(user_id: user.id, status: 1) end - def set_autologin_cookie(user) - token = Token.get_or_create_permanent_login_token(user, "autologin") - cookie_options = { - :value => token.value, - :expires => 1.month.from_now, - :path => '/', - :secure => false, - :httponly => true - } - if edu_setting('cookie_domain').present? - cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) - end - cookies[autologin_cookie_name] = cookie_options - logger.info("cookies is #{cookies}") - end + # def set_autologin_cookie(user) + # token = Token.get_or_create_permanent_login_token(user, "autologin") + # cookie_options = { + # :value => token.value, + # :expires => 1.month.from_now, + # :path => '/', + # :secure => false, + # :httponly => true + # } + # if edu_setting('cookie_domain').present? + # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + # end + # cookies[autologin_cookie_name] = cookie_options + # logger.info("cookies is #{cookies}") + # end def logout UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b6bba1f34..459ba5384 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -620,6 +620,22 @@ class ApplicationController < ActionController::Base cookies[:fileDownload] = true end + def set_autologin_cookie(user) + token = Token.get_or_create_permanent_login_token(user, "autologin") + cookie_options = { + :value => token.value, + :expires => 1.month.from_now, + :path => '/', + :secure => false, + :httponly => true + } + if edu_setting('cookie_domain').present? + cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + end + cookies[autologin_cookie_name] = cookie_options + logger.info("cookies is #{cookies}") + end + # 149课程的评审用户数据创建（包含创建课堂学生） def open_class_user user = User.find_by(login: "OpenClassUser") From eea5a1986f68bf4e1db0f2f2ac1b635ca172d93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 23 Sep 2019 08:52:10 +0800 Subject: [PATCH 04/26] https --- public/javascripts/educoder/edu_application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js index 7f8f8ac4d..d11511c63 100644 --- a/public/javascripts/educoder/edu_application.js +++ b/public/javascripts/educoder/edu_application.js @@ -1,4 +1,4 @@ -document.write(""); +document.write(""); /*! * JavaScript Cookie v2.2.0 From 35197154249b098ecbb05c4bd6cd77c07dcedbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 09:11:23 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index e9c100648..cec7a3cda 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -660,6 +660,7 @@ class Trainingjobsetting extends Component { flagPageEditsthrees:false, flagPageEditsfor:false, whethertopay:false, + completionefficiencyscore:true, }) this.refs.targetElementTrainingjobsetting.scrollIntoView() @@ -1736,7 +1737,7 @@ class Trainingjobsetting extends Component { hand__e_tip: "", hand_flags: false, handclass: undefined, - completionefficiencyscore:false, + completionefficiencyscore:true, latedeductiontwo:0, unit_e_tip: "", }) From 33a0bb83ceaedea437ead60bf839077812438fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 09:16:11 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index cec7a3cda..e44f75beb 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1069,7 +1069,7 @@ class Trainingjobsetting extends Component { // //占比分 changeTopicNametwo = (value) => { - // console.log("2e.target.value", value) + console.log("TrainingjobsettingTrainingjobsetting", value) if (value === "" || value === undefined) { return } From ae3155785fe281460908510bd83285f01d157097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 09:17:04 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index e44f75beb..4d07ae307 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1069,7 +1069,7 @@ class Trainingjobsetting extends Component { // //占比分 changeTopicNametwo = (value) => { - console.log("TrainingjobsettingTrainingjobsetting", value) + // console.log("TrainingjobsettingTrainingjobsetting", value) if (value === "" || value === undefined) { return } @@ -1704,7 +1704,6 @@ class Trainingjobsetting extends Component { flagPageEditsthrees:deadline, flagPageEditsfor:endtime, completionefficiencyscore:true, - latedeductiontwo:20, unifiedsetting:this.state.unifiedsetting, }) if(this.state.proportion === "自定义分值"){ From 4adfa10fd9b1b7d55ff290b32cc0cadb4747519e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 23 Sep 2019 09:17:53 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=91=E8=AF=BE?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/paths/PathDetail/DetailTop.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index 43bb5e1dd..d42de474b 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -348,7 +348,8 @@ class DetailTop extends Component{ let applypath=this.props.detailInfoList&&this.props.detailInfoList.participant_count!=undefined&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false; let coursestypes=this.props.courses!=undefined&&this.props.courses.length===0; - console.log(coursestypes) + let isadminallow_statistics=this.props.courses&&this.props.courses.length===0&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===true; + return(
@@ -485,7 +486,7 @@ class DetailTop extends Component{
- {this.props.courses===undefined?"":
+ {this.props.courses===undefined||isadminallow_statistics===true?"":
- {this.props.courses===undefined||this.props.courses.length===0?"":
  • + {this.props.courses===undefined||this.props.courses.length===0?"":
  • {/* @@ -659,27 +665,32 @@ class DetailTop extends Component{ return(
    + {applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + this.props.detailInfoList&&this.props.detailInfoList.has_participate===false? + getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名: + 预约报名成功:""} + {/*{item.course_status.status===0?
    即将开课
    :""}*/} {item.course_status.status===1?
    {item.course_status.time}
    :""} {item.course_status.status===2&&item.course_identity<6?
    已结束
    :""} {/*
    已结束
    */} {item.course_status.status===0? - item.course_identity<5? + item.course_identity<5? 进入课堂 - :item.course_identity<6?
    报名成功
    - :this.JoinnowCourse(item.course_id)}>立即报名:""} + :item.course_identity<6?
    报名成功
    + :this.JoinnowCourse(item.course_id)}>立即报名:""} {item.course_status.status===1? - item.course_identity<5? + item.course_identity<5? 进入课堂 - :item.course_identity<6? + :item.course_identity<6? 立即学习 - :this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入:""} + :this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入:""} {item.course_status.status===2? - item.course_identity<6? + item.course_identity<6? 进入课堂 - :
    已结束
    :""} + :
    已结束
    :""}
    )})} @@ -687,15 +698,27 @@ class DetailTop extends Component{
    • } + + {applypath===false?"":this.state.MenuItemskey===this.props.courses.length?
    :""} - {applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + {applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人 + 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课 + {/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/} + {/*getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名:*/} + {/*预约报名成功}*/} + + :""} + + {applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true? 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课 {this.props.detailInfoList&&this.props.detailInfoList.has_participate===false? getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名: 预约报名成功} - :""} + :"":""} +
    } From 438eceed42f8580c24bb86ff422b406b8398cb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 10:27:19 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- public/react/src/modules/user/usersInfo/InfosBanner.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 064a482c9..992c77fac 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -865,7 +865,7 @@ submittojoinclass=(value)=>{
  • 我的实训项目
  • 我的实践课程
  • 我的开发项目
    • -
  • 我的众包
    • + {/*
  • 我的众包
    • */}
  • 客户管理
    • diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js index 5e79a9b2b..23037f360 100644 --- a/public/react/src/modules/user/usersInfo/InfosBanner.js +++ b/public/react/src/modules/user/usersInfo/InfosBanner.js @@ -111,11 +111,11 @@ class InfosBanner extends Component{ onClick={() => this.setState({moduleName: 'projects'})} to={`/users/${username}/projects`}>开发项目 -
  • - this.setState({moduleName: 'package'})} - to={`/users/${username}/package`}>众包 -
    • + {/*
  • */} + {/* this.setState({moduleName: 'package'})}*/} + {/* to={`/users/${username}/package`}>众包*/} + {/*
    • */} {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) &&
  • Date: Mon, 23 Sep 2019 11:06:14 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=A4=B4=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/page/MainContent.js | 6 +----- public/react/src/modules/page/MainContentContainer.js | 3 ++- public/react/src/modules/page/main/CodeRepositoryView.js | 6 +++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js index 596da84af..a1b7566d0 100644 --- a/public/react/src/modules/page/MainContent.js +++ b/public/react/src/modules/page/MainContent.js @@ -144,11 +144,7 @@ class MainContent extends Component { {/* readRepoTimeout 如果读取代码超时，显示重新加载按钮，重新拉取代码 */} { st === 0 - ? - readRepoTimeout === true ?
    - 代码加载失败， this.props.fetchRepositoryCode(this.props, null, null, true, true)}>重试 -
    : + ?
    9) { this.setState({ - readRepoTimeout: true + readRepoTimeout: true, + codeLoading: false }) readingRepoTimes = 0; showSnackbar(`网络异常，请稍后重试。`); diff --git a/public/react/src/modules/page/main/CodeRepositoryView.js b/public/react/src/modules/page/main/CodeRepositoryView.js index ee2017ab3..758550d89 100644 --- a/public/react/src/modules/page/main/CodeRepositoryView.js +++ b/public/react/src/modules/page/main/CodeRepositoryView.js @@ -510,6 +510,10 @@ class CodeRepositoryView extends Component {
    + {this.props.readRepoTimeout === true ? :
    {/* 没必要显示这个，注释掉了 */} {/* { !isEditablePath && @@ -526,7 +530,7 @@ class CodeRepositoryView extends Component { {/* cm monaco 切换 */} {/* */} -
    +
    }
    {/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && } */} From bbe5c4856413d6f4d278ba5968ce439708a3f19e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 23 Sep 2019 11:14:42 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/page/main/CodeRepositoryView.js | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/page/main/CodeRepositoryView.js b/public/react/src/modules/page/main/CodeRepositoryView.js index 758550d89..74a170406 100644 --- a/public/react/src/modules/page/main/CodeRepositoryView.js +++ b/public/react/src/modules/page/main/CodeRepositoryView.js @@ -510,10 +510,7 @@ class CodeRepositoryView extends Component {
    - {this.props.readRepoTimeout === true ? : +
    {/* 没必要显示这个，注释掉了 */} {/* { !isEditablePath && @@ -523,14 +520,21 @@ class CodeRepositoryView extends Component {
    } */} -
    - {/**/} - {/* cm monaco 切换 */} - {/* */} - -
    } + {this.props.readRepoTimeout === true ? : + +
    + {/**/} + {/* cm monaco 切换 */} + {/* */} + +     + } +
    • {/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && } */} From 663443b57771cd1c619ea8c3c4206bb841fab18e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 23 Sep 2019 11:22:10 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/page/main/CodeRepositoryView.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/page/main/CodeRepositoryView.js b/public/react/src/modules/page/main/CodeRepositoryView.js index 74a170406..bae058dcd 100644 --- a/public/react/src/modules/page/main/CodeRepositoryView.js +++ b/public/react/src/modules/page/main/CodeRepositoryView.js @@ -474,7 +474,9 @@ class CodeRepositoryView extends Component { - { challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 && + { challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 && + this.props.readRepoTimeout !== true && + @@ -482,7 +484,7 @@ class CodeRepositoryView extends Component { } { - challenge.pathIndex !== -1 && tabIndex === 0 && + challenge.pathIndex !== -1 && tabIndex === 0 && this.props.readRepoTimeout !== true && @@ -491,7 +493,7 @@ class CodeRepositoryView extends Component { } { - tabIndex === 0 && + tabIndex === 0 && this.props.readRepoTimeout !== true && showSettingDrawer(true)}> From 000a503a7e507553683dc9695eaeaa796c0dd666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 11:27:49 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/gradinforms/Bullsubdirectory.js | 2 +- .../react/src/modules/courses/gradinforms/myysleduinforms.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js index 496423f73..db4f89bfc 100644 --- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js +++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js @@ -233,7 +233,7 @@ class Bullsubdirectory extends Component{ { whethertoeditysl === false?
    -
    +
    {myname} diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css index 8376c63c8..a05dc9a63 100644 --- a/public/react/src/modules/courses/gradinforms/myysleduinforms.css +++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css @@ -70,6 +70,10 @@ .fudonyingxiangysl{ width: 100%; } +.fudonyingxiangysls{ + display: flex; + flex-direction:column; +} .yslbianji{ padding-top: 31px; From ed607d743726dfd620c5a77cd34b89683db63ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 13:55:33 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index a5423b6e9..c2af8b331 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -3491,12 +3491,12 @@ class Listofworksstudentone extends Component { } { - homework_status.length===0? + homework_status&&homework_status.length&&homework_status.length===0?
    : - homework_status.length>0 && homework_status[0]==="未发布"? + homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
    @@ -3651,12 +3651,12 @@ class Listofworksstudentone extends Component { } { - homework_status.length===0? + homework_status&&homework_status.length===0?
    : - homework_status.length>0 && homework_status[0]==="未发布"? + homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
    From 587c0c3130174a51933c1d10b91e341b7e7b345a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 14:09:21 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index c2af8b331..c600e01ff 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -3059,20 +3059,20 @@ class Listofworksstudentone extends Component { // console.log(this.props.isAdmin()); let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; - try { - if(this.props.isAdmin() === false){ - if(teacherdata&&teacherdata.student_works){ - if(teacherdata&&teacherdata.student_works.length>0){ - console.log("这是双层页面。。。。"); - - } - } - - } - }catch (e) { - console.log("Listofworksstudentone123"); - console.log(e); - } + // try { + // if(this.props.isAdmin() === false){ + // if(teacherdata&&teacherdata.student_works){ + // if(teacherdata&&teacherdata.student_works.length>0){ + // console.log("这是双层页面。。。。"); + // + // } + // } + // + // } + // }catch (e) { + // console.log("Listofworksstudentone123"); + // console.log(e); + // } return ( @@ -3151,12 +3151,12 @@ class Listofworksstudentone extends Component { typs={this.state.typs} /> { - homework_status.length===0? + homework_status&&homework_status.length===0?
    : - homework_status.length>0 && homework_status[0]==="未发布"? + homework_status&&homework_status.length>0 && homework_status[0]==="未发布"?