diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index 6c3e7997a..6521d2add 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -139,9 +139,10 @@ class CommonWorkItem extends Component{
}
this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
+ {/* 放开点击进入,进入后弹框,canNotLink ? () => {} : */}
{} : () => this.onItemClick(item)}
+ onClick={() => this.onItemClick(item)}
>{item.name}
{/* 只有非课堂成员且作业是私有的情况下才会为true */}
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 8e6198eae..898b296f0 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -35,15 +35,13 @@ class PollListItem extends Component{
}
+ {item.polls_name}
{
- //非课堂成员(未登录的用户)且课堂未公开
- courseType && courseType.user_permission == 0 && item.lock_status == 0 ?
- {item.polls_name}
- :
- {item.polls_name}
- }
- {
- item.lock_status === 0 ? :""
+ item.lock_status === 0 ?
+
+
+
+ :""
}
{
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 36a9530b9..1275cf4a0 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -316,7 +316,7 @@ class LoginDialog extends Component {
// // return Promise.reject(error);
});
}
- handleDialogClose() {
+ handleDialogClose = () => {
if(this.props.match.path==="/"){
this.setState({
isRender: false
diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
index b05732e31..f9f56a90d 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
@@ -25,7 +25,7 @@ class ShixunSearchBar extends Component {
super(props)
this.state = {
status: undefined,
- diff: undefined,
+ diff: 0,
InputValue: undefined,
shixunhoverData: [],
shixunchildValues:'',
@@ -238,6 +238,7 @@ render() {
全部
{
shixunhoverData.map((item,key)=>{
+
return(
{item.name}
@@ -269,21 +270,48 @@ render() {
筛选:
-
- {/*
*/}
{/*
*/}
{/*
{
- isRenders && this.cancelModulationModels()}/>
+ isRenders && this.cancelModulationModels()}/>
}