diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index ff8e3e3a2..a300e73dc 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -136,7 +136,7 @@ class CommonWorkDetailIndex extends Component{
DownloadMessageval:undefined
})
}
-
+ bindRef = ref => { this.child = ref };
render() {
@@ -171,8 +171,10 @@ class CommonWorkDetailIndex extends Component{
let params = {}
if (isListModule) {
// TODO
- // params = this.refs.commonWorkList._getRequestParams()
+ params =this.child._getRequestParams()!==undefined?this.child._getRequestParams():{};
}
+ // console.log("普通作业176176176");
+ // console.log(params);
let exportUrl = `/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`
let exportResultUrl = `/homework_commons/${workId}/works_list.xlsx?${queryString.stringify(params)}`
return (
@@ -356,7 +358,7 @@ class CommonWorkDetailIndex extends Component{
{/* 作品列表 */}
()
+ (props) => ()
}
>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 5938d037a..f9deeebb4 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -401,7 +401,7 @@ class CommonWorkList extends Component{
this.fetchList()
on('commonwork_fetch_all', this.fetchAllListener)
$("html").animate({ scrollTop: $('html').scrollTop() - 100 })
-
+ this.props.triggerRef(this);
}
componentWillUnmount() {
off('commonwork_fetch_all', this.fetchAllListener)
@@ -767,7 +767,7 @@ class CommonWorkList extends Component{
-
没有数据可以显示!
+
暂时还没有相关数据哦!
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 6f4cec877..fffadccf6 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2565,7 +2565,7 @@ class Studentshavecompletedthelist extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
@@ -2630,7 +2630,7 @@ class Studentshavecompletedthelist extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
@@ -2692,7 +2692,7 @@ class Studentshavecompletedthelist extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index 0f8930a8a..60fbd5ac2 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -7,7 +7,7 @@ import {
} from 'antd';
import axios from 'axios'
import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML} from 'educoder';
+import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml } from 'educoder';
import QestionDisplayHeader from './QestionDisplayHeader'
const { TextArea } = Input;
const confirm = Modal.confirm;
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 1e0fb3071..6c7085ca2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -190,7 +190,7 @@ export default ImageLayerOfCommentHOC() (GraduationTasksappraiseReply);
{/*className="edu-tab-con-box clearfix edu-txt-center">*/}
{/**/}
- {/*没有数据可以显示!
*/}
+ {/*暂时还没有相关数据哦!
*/}
{/**/}
{/**/}
{/**/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index d773d8411..7d421da4b 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1307,7 +1307,7 @@ class GraduationTaskssettinglist extends Component{
-
没有数据可以显示!
+
暂时还没有相关数据哦!
@@ -1573,7 +1573,7 @@ class GraduationTaskssettinglist extends Component{
className="edu-tab-con-box clearfix edu-txt-center">
- 没有数据可以显示!
+ 暂时还没有相关数据哦!
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 363d06c54..6780948ef 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -36,8 +36,10 @@ const buildColumns = (that) => {
key: 'login',
align:'center',
className:"color-grey-6",
- render: (name, record) => {
- return {name}
+ render: (login, record) => {
+ return 10 ? login : ''}
+ >{login}
}
}, {
title: '姓名',
@@ -57,8 +59,8 @@ const buildColumns = (that) => {
align:'center',
className:"color-grey-6",
render: (student_id, record) => {
- return {student_id}
+ return 10 ? student_id : ''}
+ style={{maxWidth: '160px'}} >{student_id}
}
}];
if (course_groups && course_groups.length) {
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 8ec2ffcbc..4dc41fcf7 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2528,7 +2528,7 @@ class Listofworksstudentone extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
@@ -2747,7 +2747,7 @@ class Listofworksstudentone extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
@@ -2945,7 +2945,7 @@ class Listofworksstudentone extends Component {
-
没有数据可以显示!
+
暂时还没有相关数据哦!
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index f1d1c43f3..cc9586577 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -258,7 +258,7 @@ class ShixunWorkModal extends Component{
-
没有数据可以显示!
+
暂时还没有相关数据哦!
diff --git a/public/react/src/modules/forums/MemoList.js b/public/react/src/modules/forums/MemoList.js
index fae728542..26cad1448 100644
--- a/public/react/src/modules/forums/MemoList.js
+++ b/public/react/src/modules/forums/MemoList.js
@@ -31,7 +31,7 @@ class MemoList extends Component {
{!memo_list || memo_list.length === 0 ?
-
没有数据可以显示!
+
暂时还没有相关数据哦!
: renderMemoList()
}
diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
index cef643094..76a1a2ebe 100644
--- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
@@ -151,7 +151,7 @@ class ChangeHeaderPicModal extends Component{
text-align: center;
width: 120px;
height: 120px;
- border: 1px solid #eee;
+ /* border: 1px solid #eee; */
}
.previewWrap {
flex-direction: column;
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index ff5321a9f..2f7d206b8 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -130,7 +130,7 @@ class InfosCourse extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ? : ""
}
{
- (!data || data.courses.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) &&
+ (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
}
{
data && data.courses && data.courses.map((item,key)=>{
@@ -147,7 +147,7 @@ class InfosCourse extends Component{
{
item.can_visited ==false?
-
+
非成员不能访问
:""
}
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index 759527a6e..d23739280 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -152,7 +152,7 @@ class InfosPath extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ? :""
}
{
- (!data || data.subjects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) &&
+ (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
}
{
data && data.subjects && data.subjects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 6c1f4a666..195e98b73 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -125,7 +125,7 @@ class InfosProject extends Component{
:""
}
{
- (!data || data.projects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) &&
+ (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
}
{
data && data.projects && data.projects.map((item,key)=>{
@@ -142,7 +142,7 @@ class InfosProject extends Component{
{
item.can_visited ==false?
-
+
非成员不能访问
:""
}
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index bac60fe6f..1550230ab 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -161,7 +161,7 @@ class InfosShixun extends Component{
:""
}
{
- (!data || data.shixuns.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) &&
+ (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
}
{
data && data.shixuns && data.shixuns.map((item,key)=>{
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 32d88b392..ccdb9e12a 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -164,7 +164,7 @@ class SearchPage extends Component{
-
没有数据可以显示!
+
暂时还没有相关数据哦!