diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb index af6305a64..2ad815fc9 100644 --- a/app/controllers/question_banks_controller.rb +++ b/app/controllers/question_banks_controller.rb @@ -18,19 +18,17 @@ class QuestionBanksController < ApplicationController # 已认证才能获取题库 if @certification_teacher sql = %Q{ - #{@objects.table_name}.is_public = 1 and concat(#{@objects.table_name}.name, course_lists.name) like - '%#{params[:search]}%' - } - @objects.joins(:course_list).where(sql) + #{@objects.table_name}.is_public = 1 and concat(#{@objects.table_name}.name, course_lists.name) like :keyword + } + @objects.joins(:course_list).where(sql, keyword: "%#{params[:search]}%") else @objects.none end else sql = %Q{ - #{@objects.table_name}.user_id = #{current_user.id} and concat(#{@objects.table_name}.name, course_lists.name) like - '%#{params[:search]}%' - } - @objects.joins(:course_list).where(sql) + #{@objects.table_name}.user_id = #{current_user.id} and concat(#{@objects.table_name}.name, course_lists.name) like :keyword + } + @objects.joins(:course_list).where(sql, keyword: "%#{params[:search]}%") end else if params[:filter] == 'public' diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js index d11511c63..e18c15930 100644 --- a/public/javascripts/educoder/edu_application.js +++ b/public/javascripts/educoder/edu_application.js @@ -769,7 +769,7 @@ function showcity(province, cityField) { var cityOptions = new Array("福州","厦门","泉州","漳州","龙岩","南平","宁德","莆田","三明"); break; case "甘肃": - var cityOptions = new Array("兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水","武都","武威","西峰","张掖"); + var cityOptions = new Array("兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水","陇南","武威","西峰","张掖"); break; case "广西": var cityOptions = new Array("南宁","百色","北海","桂林","防城港","贵港","河池","贺州","柳州","钦州","梧州","玉林"); @@ -1267,7 +1267,7 @@ function opClickString(item) { operationItem = item // setTimeout(function(){ $(item).css('background', '#4CACFF');$(item).html(value); }, 4000) } -// +// // var isOperationSending = false; $(document).bind('ajaxStop', function(event, xhr, settings) { if (settings && settings.url && (settings.url.match(/operation\?/))) { diff --git a/public/react/package.json b/public/react/package.json index e21a44df3..47e7ecddd 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -91,6 +91,7 @@ "react-router-dom": "^4.2.2", "react-split-pane": "^0.1.89", "react-url-query": "^1.4.0", + "react-zmage": "^0.8.5-beta.31", "redux": "^4.0.0", "redux-thunk": "2.3.0", "rsuite": "^4.0.1", diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 5182cb991..afed0fa9d 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -46,7 +46,7 @@ debugType = "admin"; // 老师 // debugType="teacher"; // 学生 - debugType="student"; +// debugType="student"; diff --git a/public/react/src/common/components/form/City.js b/public/react/src/common/components/form/City.js index 5ee0c080b..e5346ba3e 100644 --- a/public/react/src/common/components/form/City.js +++ b/public/react/src/common/components/form/City.js @@ -524,8 +524,8 @@ const options = [{ value: '天水', label: '天水' },{ - value: '武都', - label: '武都' + value: '陇南', + label: '陇南' },{ value: '武威', label: '武威' diff --git a/public/react/src/common/hooks/ImageLayer2.js b/public/react/src/common/hooks/ImageLayer2.js index 202a7f343..504e491ca 100644 --- a/public/react/src/common/hooks/ImageLayer2.js +++ b/public/react/src/common/hooks/ImageLayer2.js @@ -18,8 +18,8 @@ function ImageLayer2(props) { const fileName = event.target.innerHTML.trim() if (isImageExtension((imageSrc && imageSrc.trim())) || isImageExtension(fileName) || event.target.tagName == 'IMG' || (imageSrc && imageSrc.indexOf('base64,')) != -1) { // 非回复里的头像图片; 非emoticons - if (imageSrc.indexOf('/images/avatars/User') === -1 && - imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) { + if (imageSrc.indexOf('/images/avatars/User') === -1 && + imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) { setShowImage(true) setImageSrc(imageSrc) } @@ -41,7 +41,7 @@ function ImageLayer2(props) { }) return ( - + showImage?:"" ) } diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js index bb1e0bef4..fa0cbafcd 100644 --- a/public/react/src/context/TPIContextProvider.js +++ b/public/react/src/context/TPIContextProvider.js @@ -137,6 +137,9 @@ class TPIContextProvider extends Component { this.costTimeInterval && window.clearInterval(this.costTimeInterval) } componentDidMount() { + window.$(window).unload( ()=>{ + console.log(12321) + }); // TODO 登录状态的判断？ // request @@ -158,12 +161,24 @@ class TPIContextProvider extends Component { } }, 1000) - // 页面离开时存下用户的任务耗时 + // 页面离开时存下用户的任务耗时 + window.$(window).bind('beforeunload', function (e) { + console.log(111111) + this._updateCostTime(); + }) + + // // 页面离开时存下用户的任务耗时 + // window.$(window).unload( ()=>{ + // this._updateCostTime(); + + // }); - window.$(window).unload( ()=>{ - this._updateCostTime(); - }); } + + + + + // force 评测通过后，异步执行该方法，强制同步costTime到服务端 _updateCostTime(async = false, force) { const { game, loading } = this.state; diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js index 75fbaaab4..db06f0166 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js @@ -107,6 +107,15 @@ class CommonWorkAppraise extends Component{ } gotoget_next_work=(id)=>{ + + if(this.props.match.path===`/classrooms/:coursesId/common_homework/:workId/:studentWorkId/appraise`){ + this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); + } + + if(this.props.match.path===`/classrooms/:coursesId/group_homework/:workId/:studentWorkId/appraise`){ + this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); + } + if(this.props.match.path===`/classrooms/:coursesId/common_homeworks/:workId/:studentWorkId/appraise`){ this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); } @@ -114,6 +123,7 @@ class CommonWorkAppraise extends Component{ if(this.props.match.path===`/classrooms/:coursesId/group_homeworks/:workId/:studentWorkId/appraise`){ this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); } + this.setState({ get_next_worktype:false }) diff --git a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js index 004781ec0..8eca8b7de 100644 --- a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js @@ -94,12 +94,12 @@ class CoursesHomeCard extends Component{

-
+
{item.teacher_users.length===0?'': 协作老师： {item.teacher_users.map((iem,idx)=>{ return( - {idx<3?iem:''} + {idx<3?iem:''} ) }) } diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index e14ad1408..64a956d28 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -547,8 +547,9 @@ class Trainingjobsetting extends Component { } } else { + //不是统一设置 //分班设置 - // console.log("分班设置"); + console.log("分班设置"); // console.log(this.$pollDetailTabForthRules); const result=this.$pollDetailTabForthRules.notUnifiedSettingCheck(this.state.rules); @@ -561,11 +562,79 @@ class Trainingjobsetting extends Component { return false; } let rulesdata = this.state.rulesdata; + if (rulesdata.length === 0) { this.props.showNotification(`分班发布设置不能为空`); return; } + + + + } + }else{ + // console.log("分班设置"); + var mylate_times=false; + if (this.state.unifiedsetting === false) { + ///非统一设置 + let rulesdata = this.state.rulesdata; + //开启了补交 + if(this.state.allowreplenishment===true){ + //补交结束时间不为空 + if(this.state.late_time){ + // 分班设置数组不为空 + if(rulesdata){ + for(var i=0;i { - if (result.data.status == 0) { - // console.log(JSON.stringify(result)); - this.getTrainingjobsetting(true); - this.props.showNotification(`更新成功`); - this.setState({ - flagPageEditsbox: false, - flagPageEdit: false, - flagPageEditstwo: false, - flagPageEditsthrees: false, - flagPageEditsfor: false, - whethertopay: false, - completionefficiencyscore: false, - }) - this.refs.targetElementTrainingjobsetting.scrollIntoView() + if(result){ + if(result.data){ + if (result.data.status == 0) { + // console.log(JSON.stringify(result)); + this.getTrainingjobsetting(true); + this.props.showNotification(`更新成功`); + this.setState({ + flagPageEditsbox: false, + flagPageEdit: false, + flagPageEditstwo: false, + flagPageEditsthrees: false, + flagPageEditsfor: false, + whethertopay: false, + completionefficiencyscore: false, + }) + this.refs.targetElementTrainingjobsetting.scrollIntoView() + } + } } + }).catch((error) => { console.log(error); }) @@ -2577,7 +2651,7 @@ class Trainingjobsetting extends Component {
{/*补交设置*/} -
+
补交设置
@@ -2660,7 +2734,7 @@ class Trainingjobsetting extends Component {

{ this.state.hand__e_tip && this.state.hand__e_tip != "" ? - {this.state.hand__e_tip} : "" + {this.state.hand__e_tip} : "" }

@@ -2929,75 +3003,3 @@ class Trainingjobsetting extends Component { } export default Trainingjobsetting; -//
-//
-// this.ChangeTab(0)}>作品列表 -// this.ChangeTab(1)}>作业问答 -// {this.props.isAdmin()?this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"": this.ChangeTab(2)}>代码查重 : ""} -// -// this.ChangeTab(3)} -// >设置 -// -// {this.props.isAdmin() ?
  • -// 导出 -// -//
    • : ""} -// {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true? -// 立即截止 -// : "": ""} -// {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true? -// 立即发布: "" : ""} -// {this.props.isAdmin()? -// jobsettingsdata&&jobsettingsdata.data.code_review===true? -// 代码查重: "":""} -// { -// jobsettingsdata&& jobsettingsdata&&jobsettingsdata.data === undefined ? "" -// : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : -// { jobsettingsdata&& jobsettingsdata.data.commit_des} -// } -// { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } -{/*
    */ -} -{/*
    */ -} diff --git a/public/react/src/modules/page/LeftNav.js b/public/react/src/modules/page/LeftNav.js index d1a7b1a11..63628d7ff 100644 --- a/public/react/src/modules/page/LeftNav.js +++ b/public/react/src/modules/page/LeftNav.js @@ -59,7 +59,7 @@ class LeftNav extends Component {
    -
    退出实训 +
    退出实训1
    diff --git a/public/react/src/modules/page/layers/ImageLayer.js b/public/react/src/modules/page/layers/ImageLayer.js index b1adc5b6b..17f40bdf9 100644 --- a/public/react/src/modules/page/layers/ImageLayer.js +++ b/public/react/src/modules/page/layers/ImageLayer.js @@ -1,26 +1,63 @@ import React, { Component } from 'react'; import ReactDOM from 'react-dom' -import { Redirect } from 'react-router'; - -import PropTypes from 'prop-types'; -import Rate from 'rc-rate'; - +import { Button,Icon} from 'antd'; import './TaskResultLayer.css' class ImageLayer extends Component { - + + constructor(props) { + super(props); + this.state = { + visible: false, + previewImage: '', + current: 90, + transStyle: '' + } + } + translate = () => { + this.setState({ + current:(this.state.current+90)%360, + transStyle:'rotate('+this.state.current+'deg)' + }); + } + + render() { let { showImage, imageSrc, onImageLayerClose } = this.props; - + // 语法介绍 https://reactjs.org/docs/portals.html // 将html渲染都指定的element下 return ReactDOM.createPortal(
    - {showImage ? -
    -
    - -
    + {showImage ? +
    +
    + + + + + +
    +
    + +
    + +
    :
    diff --git a/public/react/src/modules/page/layers/TaskResultLayer.css b/public/react/src/modules/page/layers/TaskResultLayer.css index 25f570a56..962aed0db 100644 --- a/public/react/src/modules/page/layers/TaskResultLayer.css +++ b/public/react/src/modules/page/layers/TaskResultLayer.css @@ -7,7 +7,7 @@ background:rgba(0,0,0,0.8); top: 0px; overflow: hidden; -} +} .taskResultLayer .closeIcon{ position: absolute; right: 100px; @@ -40,7 +40,7 @@ justify-content: center; align-items: center; display: -webkit-flex; - height: 100%; + height: 90%; text-align: center; } .passImg{ @@ -137,4 +137,11 @@ .vertical4{ vertical-align: -4px; +} + +.ImageLayerbutton{ + position: absolute; + top: 0px; + right: 10px; + z-index: 10; } \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index d2510d8a2..e475907ea 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -346,7 +346,7 @@ class InfosCourse extends Component{ 用户

    {item.teacher && item.teacher.real_name}

    {item&&item.school}

    -
    +
    {item.teacher_users.length===0?'': 协作老师： {item.teacher_users.map((iem,idx)=>{