{
- projects && !!projects.length &&
+ (projects && !!projects.length || this.state.keyword) &&
{this.setState({keyword: e.target.value})}}
@@ -145,7 +149,11 @@ class ConnectProject extends Component{
}
{
- (!projects || projects.length == 0) &&
+ haveProjects && projects.length == 0 &&
+
*/}
+
您当前尚未管理任何项目，请先创建项目 再关联
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index 9f3d8dda0..b0b80d147 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -9,6 +9,7 @@ import '../css/busyWork.css'
import CoursesListType from '../coursesPublic/CoursesListType'
import CommonWorkItem from './CommonWorkItem'
import PublishRightnow from './PublishRightnow'
+import ConnectProject from './ConnectProject'
import { WordsBtn } from 'educoder'
import Modals from '../../modals/Modals'
@@ -53,7 +54,9 @@ class commonWork extends Component{
let {page,search,order}=this.state;
this.getList(page,search,order);
}
-
+ openConnectionProject = (work) => {
+ this.refs['connectProject'].openConnectionProject(work)
+ }
// 新建
createCommonWork=(type)=>{
@@ -338,6 +341,8 @@ class commonWork extends Component{
}/images/edu_user/anony.png`})
+ }/images/${item.image_url}`})
+
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index d1b077bbf..74e79b172 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -9,7 +9,6 @@ import '../css/Courses.css';
import Modals from "../../modals/Modals";
import AddStudentModal from '../members/modal/AddStudentModal'
import AddTeacherModal from '../members/modal/AddTeacherModal'
-import Trialapplication from "../../login/Trialapplication";
// 点击按钮复制功能
// function jsCopy(){
@@ -44,35 +43,14 @@ class CoursesBanner extends Component {
modalsBottomval: "",
antIcon:false,
coursedata:undefined,
- user_phone_binded:false,
- isRenders:false,
- showTrial:false,
}
}
componentDidMount() {
this.onloadupdatabanner()
- try {
- if(this.props.current_user!==undefined){
- this.setState({
- user_phone_binded :this.props.current_user.user_phone_binded,
- })
- }
- }catch (e) {
- console.log("CoursesBanner 60")
- console.log(e)
- }
}
- componentDidUpdate = (prevProps) => {
- if(prevProps.current_user!=this.props.current_user){
- if(this.props.current_user!==undefined){
- this.setState({
- user_phone_binded :this.props.current_user.user_phone_binded,
- })
- }
- }
- }
+
onloadupdatabanner=()=>{
this.updatabanner()
}
@@ -82,19 +60,10 @@ class CoursesBanner extends Component {
axios.get(url).then((result) => {
if( result!=undefined){
let data = result.data;
- if(result.data.status === 407){
- this.setState({
- isRenders:true,
- coursedata: data,
- showTrial:false,
- })
- }else{
this.setState({
coursedata: data,
- showTrial:true,
})
- }
}else{
this.onloadupdatabanner()
}
@@ -352,11 +321,10 @@ class CoursesBanner extends Component {
}
render() {
- let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,user_phone_binded} = this.state;
+ let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon} = this.state;
return (
-
@@ -390,7 +358,7 @@ class CoursesBanner extends Component {
{
coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":
-
+
{coursedata.name}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 7421170d6..b68458e3f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -83,7 +83,7 @@ class GraduationTasksSubmitnew extends Component{
}
handleSubmit=(e) => {
-
+ console.log("86");
let {fileList,selectmemberslist,workslist}=this.state;
if(fileList.length === 0){
@@ -91,7 +91,7 @@ class GraduationTasksSubmitnew extends Component{
Modalstype:true,
Modalstopval:'请上传附件!',
Loadtype:true,
- ModalCancel:this.cancelAttachment
+ ModalSave:this.cancelAttachment,
})
@@ -119,7 +119,7 @@ class GraduationTasksSubmitnew extends Component{
listid.push(list.response.id)
}
- e.preventDefault();
+ // e.preventDefault();
if( GraduationTasksnewtype===true){
this.props.form.validateFields((err, values) => {
if (!err) {
@@ -408,7 +408,27 @@ class GraduationTasksSubmitnew extends Component{
selectmemberslist:selects
})
}
+ onSearchKeywordKeyUp = (e) => {
+ if (e.keyCode === 13) {
+ }
+ }
+ onSearckeyd=(e)=>{
+ if(e.keyCode){
+
+ let {search} = this.state;
+ this.searchList(search,1,10)
+ }
+ }
+ onSearchKeywordKeyUps= (e)=>{
+ if(e.keyCode=== 13){
+ }
+ }
+ onKeywordSearchKeyDown = (e) => {
+ if(e.keyCode == 13) {
+ return false;
+ }
+ }
gocannel=()=>{
window.history.go(-1)
}
@@ -483,7 +503,8 @@ render(){
返回
-