From abe56a30366117171980cfbef158d399e0b1ce0d Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Sat, 21 Mar 2020 01:23:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?360=E5=AE=89=E5=85=A8=E6=B5=8F=E8=A7=88?=
=?UTF-8?q?=E5=99=A8=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/coursesHome/CoursesHomeCard.js | 4 ++--
public/react/src/modules/user/usersInfo/InfosCourse.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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{
</Tooltip>
</p>
- <div className="mb15 task-hide mt10" style={{height:20}}>
+ <div className="task-hide" style={{height:25,marginBottom:10}}>
{item.teacher_users.length===0?'':
<span className="color-grey-98" >协作老师：
{item.teacher_users.map((iem,idx)=>{
return(
- <span className="mb15 task-hide mt10" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span>
+ <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span>
)
})
}
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{
<span><img alt="用户" className="radius mt15" height="50" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="50"/></span>
<p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
<p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
- <div className="task-hide" style={{height:20,marginBottom:10}}>
+ <div className="task-hide" style={{height:30 }}>
{item.teacher_users.length===0?'':
<span className="color-grey-98">协作老师：
{item.teacher_users.map((iem,idx)=>{
From 603b3dd270384018cc93f127ba5153f18dbac4e6 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 Mar 2020 11:51:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=8E=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/educoder/edu_application.js | 4 ++--
public/react/src/common/components/form/City.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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/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: '武威'
From 96928934cf5b6b9cc7fdb0a3f90a27ad4460917a 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 Mar 2020 17:48:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/package.json | 1 +
public/react/src/AppConfig.js | 2 +-
.../src/modules/courses/busyWork/CommonWorkAppraise.js | 10 ++++++++++
public/react/src/modules/page/layers/ImageLayer.js | 10 +++-------
4 files changed, 15 insertions(+), 8 deletions(-)
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..2d04baa58 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/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/page/layers/ImageLayer.js b/public/react/src/modules/page/layers/ImageLayer.js
index b1adc5b6b..af9359fe4 100644
--- a/public/react/src/modules/page/layers/ImageLayer.js
+++ b/public/react/src/modules/page/layers/ImageLayer.js
@@ -1,22 +1,18 @@
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 './TaskResultLayer.css'
class ImageLayer extends Component {
-
+
render() {
let { showImage, imageSrc, onImageLayerClose } = this.props;
-
+
// 语法介绍 https://reactjs.org/docs/portals.html
// 将html渲染都指定的element下
return ReactDOM.createPortal(
<div>
- {showImage ?
+ {showImage ?
<div className="taskResultLayer" onClick={onImageLayerClose} style={{overflow: 'auto'}}>
<div className="passContent">
<img src={ imageSrc } className="passImg" unselectable="on" alt=""/>