-
- {/*提示*/}
-
-
-
-
-
-
-
-
- 还未上传附件
-是否确认提交作品?
-
-
-
-
-
-
- {/*
-
-
- {description&&description?
- { workslist && workslist.task_name }
- 返回 -
-
-
- :""}
-
-
- {/*提示*/}
-
-
-
-
-
-
-
-
-
-
- 还未上传附件
-是否确认提交作品?
-
- {/*提示*/}
-
-
-
-
-
-
-
-
-
- - {datalist&&datalist.course_name} - > - {datalist&&datalist.graduation_name} - > - 任务详情 - > - {datalist&&datalist.author_name} -
- - - -
-
-
-
- {datalist&&datalist.task_name}
-
-
-
-
-
-
-
-
-
- {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":
-
- 内容
-
-
-
-
-
-
- {/**/}
- {/*15M*/}
- {/*文件包名称*/}
- {/*15M*/}
- {/*
*/}
-
- {datalist&& datalist.attachments && datalist.attachments.map((item,key)=>{
- return(
-
-
-
-
-
- {item.title}
-
- {item.filesize}
- {/*{item.delete===true?this.onAttachmentRemove(item.id)}>:""}*/}
-
-
- )
- })}
-
-
-
-
- {/*更新*/}
- {/*{datalist&&datalist.update_user_name}*/}
- {/**/}
- {/*{moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}*/}
- {/**/}
- 提交
- {datalist&&datalist.author_name}
-
- {moment(datalist&&datalist.commit_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.commit_time).format('YYYY-MM-DD HH:mm:ss')}
-
-
-
-
-
-
}
- {datalist&&datalist.project_info===undefined?"":
-
- 补交附件
-
-
- 补交原因：{firelistdata&&firelistdata.revise_reason}
-
-
-
-
- {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{
-
- return(
-
-
-
-
-
- {item.title}
-
- {item.filesize}
- {item.delete===true?this.onAttachmentRemove(item.id)}>:""}
-
- )
- })}
-
-
-
-
-
- 更新
- {firelistdata&&firelistdata.atta_update_user}
-
- {moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')}
-
-
-
-
-
-
-
}
- {/*{*/}
- { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"":
-
- 关联项目
-
-
- {datalist&&datalist.project_info.name}
-
-
-
- }
-
- 其他组员
-
-
- {datalist.work_members.map((item,key)=>{
- return(
-
- {item.user_name}
-
- )
- })}
-
-
- {isStudent===true?
- this.showModulationtype(id)}
- saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}
- addSuccess={this.addSuccess}
- onDelete={this.onDelete}
- />
- : this.showModulationtype(id)}
- saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}
- addSuccess={this.addSuccess}
- onDelete={this.onDelete}
- />
- }
-
- }
- */}
- {/*
*/}
-{/**/}
\ No newline at end of file
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
deleted file mode 100644
index 62012237..00000000
--- a/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import React,{ Component } from "react";
-import { Pagination } from "antd";
-import {ImageLayerOfCommentHOC} from '../../../page/layers/ImageLayerOfCommentHOC'
-import GraduationTasksappraiseMainEditor from './GraduationTasksappraiseMainEditor'
-import Graduationtaskitem from './Graduationtaskitem'
-import '../../../comment/Comment.css'
-import '../../common/courseMessage.css'
-import './GraduationTasksappraiseReply.css'
-import ModulationModal from "../../coursesPublic/ModulationModal";
-import Modals from '../../../modals/Modals';
-const REPLY_PAGE_COUNT = 10
-const $ = window.$;
-
-class GraduationTasksappraiseReplyChild extends Component{
- constructor(props){
- super(props);
- this.state={
-
- }
- }
-
- render(){
- let { total_count, comments, pageCount, comment_scores} = this.props;
-
- const isAdmin = this.props.isAdmin();
- const isStudent=this.props.isStudent();
-
-
- return(
- */}
- {/**/}
- {/*![]()
*/}
- {/*
*/}
- {/*暂时还没有相关数据哦！
*/} - {/*
-
- this.props.saveModulationModal(value,num)}
- closable={false}
- footer={null}
- destroyOnClose={true}
- centered={true}
- />:""}
-
- {/* this.props.addSuccess()}
- showSameScore={this.props.task_type == 2}
- > }
-
-
- {!!comment_scores.length && */}
- {/*
*/}
- {this.props.ultimate===true? isAdmin &&
-
- :""}
- {this.props.ultimate===true?"":{datalist&&datalist.task_name}
*/} - {/*返回*/} - {/*{this.props.isStudent()?补交附件:""}*/} - {/*
- 全部评阅
- { !!comment_scores.length &&
- {comment_scores.length===0?"":`(${comment_scores.length})`}
- }
-
}
-
- {this.props.ultimate===true ? "": isAdmin &&
-
-
}
-
-
-
-
-
-
- { comment_scores.map(item => {
- return
-
- {/*提示*/}
-
-
-
-
-
-
-
- 还未上传附件
-是否确认提交作品?
-
-
-
-
-
-
-
-
-
- {description===undefined?"":
- 编辑毕设任务
- 返回 -
-
-
-
- {/**/}
-
- }
-
-
-
-
- {getFieldDecorator('tasktype', {
- rules: [{ required: true, message: "请选择任务类型" }],
- })()}
-
- （选择确认后，无法修改）
-
-
-
- {getFieldDecorator('name', {
- rules: [{ required: true, message: "请输入标题" }],
- })()}
-
-
-
-
-
-
-
-
- {getFieldDecorator('description', {
- rules: [{
- required: true, message: '请输入内容',
- },{
- max:5000,message:'最大限制5000个字符'
- }],
- })(
-
-
- {/*
-
- (单个文件150M以内)
-
- {/**/}
- {/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
- {/*return(*/}
- {/*
-
-
- */}
- {/**/}
- {/**/}
- {/**/}
- {/**/}
- {/*{item.title}*/}
-
- {/**/}
- {/**/}
- {/*{item.filesize}*/}
-
- {/**/}
- {/*{item.delete===true?*/}
- {/*this.onAttachmentRemove(item.id)}*/}
- {/*aria-hidden="true">*/}
- {/*:""}*/}
- {/*
*/}
- {/*)*/}
- {/*})}*/}
- */} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.name}*/} - {/**/} - {/**/} - {/*{item.response===undefined?"":bytesToSize(item.size)}*/} - {/**/} - {/*this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}>*/} - {/*
*/} - {/*)*/} - {/*})}*/} - {/*{attachments&&attachments.map((item,key)=>{*/} - - {/*return(*/} - {/**/}
- {/**/}
- {/**/}
- {/**/}
- {/**/}
- {/*{item.title}*/}
-
- {/**/}
- {/**/}
- {/*{item.filesize}*/}
-
- {/**/}
- {/*{item.delete===true?*/}
- {/*this.onAttachmentRemove(item)}*/}
- {/*aria-hidden="true">*/}
- {/*:""}*/}
- {/*
*/}
- {/*)*/}
- {/*})}*/}
-
-
-
-
- 取消
-
-
- {/*提示*/}
-
-
-
-
-
-
-
- 还未上传附件
-是否确认提交作品?
-
-
-
-
- */}
-
- {/*内容*/}
-
-
- {/**/}
-
-
-
-
-
-
-
- {/*新建毕设任务
- 返回 -
-
-
- {getFieldDecorator('tasktype', {
- rules: [{required: true, message: "请选择任务类型"}],
- })()}
-
- （选择确认后，无法修改）
-
-
-
- {getFieldDecorator('name', {
- rules: [{required: true, message: "不能为空"}],
- })(
-
-
-
- )}
-
-
-
-
-
-
-
-
- {getFieldDecorator('description', {
- rules: [{
- required: true, message: '请输入内容',
- },{
- max:5000,message:'最大限制5000个字符'
- }]
- })(
-
-
-
-
-
- (单个文件150M以内)
-
-
-
- {/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
- {/*return(*/}
- {/*
-
-
- */} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.name}*/} - {/**/} - {/**/} - {/*{item.response===undefined?"":bytesToSize(item.size)}*/} - {/**/} - {/*this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}>*/} - {/*
*/} - {/*)*/} - {/*})}*/} - -
-
- 取消
-
-
- {/*提示*/}
- this.getcourse_groupslist(id)}
- />
-
-
-
- {this.props.isAdmin()===true?flagPageEdit===true?
:""}
-
-
- {/*取消*/}
- 取消
-
:"":""}
-
-
-
-
- { total_count > REPLY_PAGE_COUNT &&
-
- 全部回复
- {total_count}
-
-
-
-
} */}
- 写评论
-
-
-
}
- 写评论
- {record.name}
-
- ),
- }, {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- className:'edu-txt-center',
- sorter: true,
- sortDirections: sortDirections,
- render: (text, record) => (
-
- {record.stduynumber}
-
- ),
- }, {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- className:'edu-txt-center',
- render: (text, record) => (
-
- {record.classroom==="未分班"?"--":record.classroom}
-
- ),
- }, {
- title: '分组',
- key: 'grouping',
- dataIndex: 'grouping',
- className:'edu-txt-center',
- render: (text, record) => (
-
- {record.grouping}
- )
- },{
- title: '关联项目',
- dataIndex: 'associationitems',
- key: 'associationitems',
- className:'edu-txt-center',
- render: (text, record) => (
-
- ),
- },{
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- className:'edu-txt-center',
- render: (text, record) => (
-
- {record.submitstate}
-
- ),
- }, {
- title: '更新时间',
- dataIndex: 'turnovertime',
- key: 'turnovertime',
- className:'edu-txt-center',
- sorter: true,
- defaultSortOrder: 'descend',
- sortDirections: sortDirections,
- render: (text, record) => (
-
-
- {record.turnovertime===""?"--":moment(record.turnovertime).format('YYYY-MM-DD HH:mm')}
-
-
- ),
- }, {
- title: '教师评分',
- key: 'teacherrating',
- dataIndex: 'teacherrating',
- className:'edu-txt-center',
- render: (text, record) => (
-
- - 有效平均分：{record.crossrating.cross_comment_score}分 - }> - 90?'#DD1717':parseInt(record.crossrating.cross_comment_score)>60&&parseInt(record.crossrating.cross_comment_score)<90?"#FF6800":'#747A7F'}}>{record.crossrating.cross_comment_score==="--"||record.crossrating.cross_comment_score==="未批阅"?"--":record.crossrating.cross_comment_score} -
- {record.finalscore.ultimate_score===true?"":"教师评分："+record.finalscore.teacher_comment_score+"分"}
- {record.finalscore.cross_comment_score===undefined||record.finalscore.cross_comment_score==="未批阅"?"交叉评分：--":"交叉评分："+record.finalscore.cross_comment_score+"分"}
- {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"}
- 最终成绩：{record.finalscore.work_score}分
- }> - 90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score} -
- {this.props.isAdmin()?operation.map((tag,key) => {
- return(
-
- {
- tag.name &&
- 调整学生最终成绩
其它历史评分将全部失效:""}> - {tag.name==="评阅"? - {tag.name} - - : - this.showModulationtype(tag.id):tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":""}> - {tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":tag.name} - - } -
- }
-
- )
- }):""}
- {
- this.props.isStudent()?
- operation.map((tag,key) => {
- return(
-
-
- ),
- }];
-
- let courseId=this.props.match.params.coursesId;
- let position=this.props.match.params.position;
- let category_id=this.props.match.params.category_id;
- let task_Id = this.props.match.params.task_Id;
-
- if(this.props.isStudent()===true){
-
- columns.some((item,key)=> {
- if (item.title === "学号") {
- columns.splice(key, 1)
- return true
- }
- }
- )
-
- }
-
- if(taskslistdata&&taskslistdata.course_group_count<=0){
-
- columns.some((item,key)=> {
- if (item.title === "分班") {
- columns.splice(key, 1)
- return true
- }
- }
- )
-
- }
-
- if(taskslistdata&&taskslistdata.cross_comment===false){
-
- columns.some((item,key)=> {
- if (item.title === "交叉评分") {
- columns.splice(key, 1)
- return true
- }
- }
- )
-
- }
- if(taskslistdata&&taskslistdata.have_project===false){
-
- columns.some((item,key)=> {
- if (item.title === "关联项目") {
- columns.splice(key, 1)
- return true
- }
- }
- )
-
- }
-
-
- if(taskslistdata&&taskslistdata.have_grouping===false){
-
-
- columns.some((item,key)=> {
- if (item.title === "分组") {
- columns.splice(key, 1)
- return true
- }
- }
- )
-
- }
-
-
- return(
- 其它历史评分将全部失效:""}> - {tag.name==="评阅"? - {tag.name} - - : - this.showModulationtype(tag.id):tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":""}> - {tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":tag.name} - - } -
- {tag.view_work===false?"--":查看}
-
- )}
- ):""
- }
-
-
-
- {taskslistdata&&taskslistdata.have_grouping===true||
- taskslistdata&&taskslistdata.have_project===true||
- taskslistdata&&taskslistdata.cross_comment===true?:""}
- {/*提示*/}
- this.getcourse_groupslist(id)}
- />
-
-
-
- {Allocationtype===true?this.saveAllocationModal(value)}
- closable={false}
- footer={null}
- destroyOnClose={true}
- centered={true}
- />:""}
-
- {Modulationtype===true?this.saveModulationModal(value,num)}
- closable={false}
- footer={null}
- destroyOnClose={true}
- centered={true}
- />:""}
-
- {/*关联项目*/}
- {visibles===true?
- this.Cancel()}
- taskid={taskslistdata&&taskslistdata.task_id}
- funlist={()=>this.searchValue()}
- />
- :""}
-
- {this.state.avisible===true?
-
-
-
- :
- // 学生列表
- this.props.isStudent()||this.props.isNotMember()?
-
-
- {this.props.questionslist&&this.props.questionslist.status===0?"":
- {
- taskslistdata && taskslistdata.work_count && taskslistdata.work_count > limit ?
- -
-
-
-
- 教师评阅：
-
-
- 全部
-
-
this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}> - {taskslistdata.search_assistants && taskslistdata.search_assistants.teacher_comment && taskslistdata.search_assistants.teacher_comment.map((item,key)=>{ - return( - - -{item.name} - ({item.count}) - - - ) - })} --- --
-
-
- -
- 作品状态：
-
-
- this.funtaskstatus([])}>全部
-
-
-
this.funtaskstatus(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.length)} style={{ paddingTop: '4px'}}> - {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ - return( - - - - -{item.name} - ({item.count}) - - - ) - })} -
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0? -
- 分班情况：
-
- -- -
this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}> - - - {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ - return( - - -{item.group_group_name} - ({item.count}) - - - ) - })} - :""}
-
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.length===0?"": -
- 交叉评阅：
-
-
- 全部
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.map((item,key)=>{
- return(
-
-
{item.name} - ({item.count}) - - - ) - })} - - }
-
-
-
-
}
-
- {
- JSON.stringify(data)==="[]" ?
-
- {this.props.isAdmin()===true?
- {taskslistdata&&taskslistdata.work_count}
- 个检索结果（{taskslistdata&&taskslistdata.all_work_count} 学生）:""}
-
-
-
- {this.props.isStudent()===true?
-
-
- {taskslistdata&&taskslistdata.commit_count}
- 已交
-
- {taskslistdata&&taskslistdata.uncommit_count}
- 未交
- {taskslistdata&&taskslistdata.left_time.status===null?"":
-
- {taskslistdata&&taskslistdata.left_time.status} :
-
- {taskslistdata&&taskslistdata.left_time.time}
-
- }
-
- :""}
-
-
-
-
- }
-
-
- {data===undefined?"":
}
-
-
-
- : ""
- }
-
-
-
- :""
- :""}
-
-
-
-
- {this.props.isNotMember()?
- {
- taskslistdata && taskslistdata.work_count && taskslistdata.work_count > limit ?
- -
-
-
-
- 教师评阅：
-
-
- 全部
-
-
-
this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}> - {taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{ - return( - - - -{item.name} - ({item.count}) - - - ) - })} --- --
-
-
- -
- 作品状态：
-
-
- this.funtaskstatus([])}>全部
-
-
-
this.funtaskstatus(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.length)} style={{ paddingTop: '4px'}}> - {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ - return( - - - - -{item.name} - ({item.count}) - - - ) - })} -
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0? -
- 分班情况：
-
-
- this.groupgroup([])}>全部
-
-
-
this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{ paddingTop: '4px'}}> - {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ - return( - - -{item.group_group_name} - ({item.count}) - - - ) - })} - :""}
-
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.length===0?"": -
- 交叉评阅：
-
-
- 全部
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.map((item,key)=>{
- return(
-
-
{item.name} - ({item.count}) - - - ) - })} - - }
-
-
- {this.props.isStudent()===true?
-
- {
- JSON.stringify(data) === "[]" ?
-
-
-
- {taskslistdata&&taskslistdata.commit_count}
- 已交
-
- {taskslistdata&&taskslistdata.uncommit_count}
- 未交
- {taskslistdata&&taskslistdata.left_time.status===null?"":
-
- {taskslistdata&&taskslistdata.left_time.status} :
-
- {taskslistdata&&taskslistdata.left_time.time}
-
- }
-
- :""}
-
-
- :
-
-
-
-
-
- ![]({getImageUrl("images/educoder/nodata.png")}/)
-
-
- 暂时还没有相关数据哦！
-
-
-
-
- }
-
- {data === undefined ? "" :
}
-
-
-
- : ""
- }
-
- {/*提示*/}
- this.getcourse_groupslist(id)}
- />
- {questionslist&&questionslist?
-
-
-
:""}
-
-
-
-
-
-
-
- -
-
- {questionslist&&questionslist?
-
-
-
-
-
- {/*
-
-
:""
- }
-
-
-
-
- {questionslist&&questionslist.group_info?
-
-
:""}
-
-
- 分组要求：
- （提交作品时需要关联同组成员，组内成员作品共享）
-
-
-
- 分组人数：{questionslist.group_info.min_number} - {questionslist.group_info.max_number} 人
- {questionslist.group_info.base_on_project===true?
- （基于项目，项目管理员角色的成员可以提交作品）
- : （非基于项目，任意小组成员可以提交作品）}
-
-
- {questionslist.group_info.base_on_project===true?
- 基于项目实施
- （各小组必须在educoder平台创建项目）
-
:不基于项目实施
}
-
- */}
- {/*{this.clickPraise()}}*/}
- {/*>*/}
- {/**/}
- {/*
*/} - {/*/!*{memo.praise_count}*!/*/} - {/**/} - {/*
*/}
-
- */} - {/*/!*{memo.praise_count}*!/*/} - {/**/} - {/*
-
-
- {/*讨论区*/}
-
-
-
-
-
- )
- }
-}
-export default Graduationtaskitem;
\ No newline at end of file
diff --git a/src/modules/courses/graduation/tasks/TaskPublishModal.js b/src/modules/courses/graduation/tasks/TaskPublishModal.js
deleted file mode 100644
index 0a805f37..00000000
--- a/src/modules/courses/graduation/tasks/TaskPublishModal.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React,{ Component } from "react";
-import { Input, Checkbox, Menu } from "antd";
-
-import CourseLayoutComponent from '../../common/CourseLayoutComponent'
-import TitleSearchSection from '../../common/titleSearch/TitleSearchSection'
-import ColorCountText from '../../common/titleSearch/ColorCountText'
-
-import { WordsBtn } from 'educoder'
-import axios from 'axios'
-
-import _ from 'lodash'
-
-import GraduateTaskItem from './GraduateTaskItem'
-import HomeworkModal from "../../coursesPublic/HomeworkModal";
-
-import '../../css/members.css'
-import '../style.css'
-// 毕设任务 立即发布弹框 https://www.trustie.net/issues/19981
-class TaskPublishModal extends Component{
- constructor(props){
- super(props);
- this.state = {
- modalname:"立即发布",
- modaltype:1,
- visible: false,
- Topval:"本操作只对“未发布”的对象生效",
- Botvalleft:"暂不发布",
- Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间：2018-07-15 15:33",
- endtime:"截止时间：2018-08-15 15:33",
- Cancelname:"暂不发布",
- Savesname:"立即发布",
- Cancel:this.onCancel,
- Saves:this.homeworkstartend,
- }
- }
- publish = ()=> {
- this.publish1()
- }
- end = ()=> {
- this.end1()
- }
- //立即发布
- publish1 =()=>{
- this.setState({
- modalname:"立即发布",
- modaltype:1,
- visible:true,
- Topval:"本操作只对“未发布”的对象生效",
- Botvalleft:"暂不发布",
- Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间：2018-07-15 15:33",
- endtime:"截止时间：2018-08-15 15:33",
- Cancelname:"暂不发布",
- Savesname:"立即发布",
- Cancel:this.onCancel,
- Saves:this.homeworkstartend,
- })
- }
-
- publish2=()=>{
- this.setState({
- modalname:"立即发布",
- modaltype:2,
- visible:true,
- Topval:"发布设置均可修改，",
- Topvalright:"点击修改",
- Botval:"此设置将对所有分班生效",
- Botvalleft:undefined,
- starttime:"发布时间：2018-07-15 15:33",
- endtime:"截止时间：2018-08-15 15:33",
- Cancelname:"取消",
- Savesname:"确定",
- Cancel:this.onCancel,
- Saves:undefined
- })
- }
-
- //立即截止
- end1=()=>{
- this.setState({
- modalname:"立即截止",
- modaltype:3,
- visible:true,
- Topval:"本操作只对“提交中”的对象生效",
- Botvalleft:"暂不截止",
- Botval:"则将根据已设置的截止时间，定时截止",
- Cancelname:"暂不截止",
- Savesname:"立即截止",
- Cancel:this.onCancel,
- Saves:this.homeworkends,
- starttime:undefined,
- endtime:undefined,
- })
- }
- end2=()=>{
- this.setState({
- modalname:"立即截止",
- modaltype:4,
- visible:true,
- Topval:"本操作只对“提交中”的对象生效",
- Botvalleft:"暂不截止",
- Botval:"则将根据已设置的截止时间，定时截止",
- Cancelname:"暂不截止",
- Savesname:"立即截止",
- Cancel:this.onCancel,
- Saves:undefined,
- starttime:undefined,
- endtime:undefined,
- })
- }
- setVisible = (visible) => {
- this.setState({ visible })
- }
- onCancel = () => {
- this.setState({ visible: false})
- }
- render(){
-
- let { modaltype, modalname, visible, Topval, Topvalright, Botvalleft, Botval, starttime, endtime, Cancelname, Savesname, Cancel, Saves } = this.state;
- return(
-
-
- })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {!!_content &&
-
- {item.username}（{item.comment_role}）
-
- {item.time}
- {/* 分数 */}
- {item.score != null && item.score >= 0 && {item.score}分}
-
- { !item.is_invalid && item.delete &&
- this.props.onDelete(item)}>
-
- }
- {/* 回复 */}
- { item.is_invalid ? 失效 : ''}
-
-
-
}
- {!_content && {"暂未写评语"}}
-
-
-
-
-
-
- {(item && item.children && item.children.length) ? : ''}
- {this.renderChildenComments(item)}
- { item.isAllChildrenLoaded != true && item.children && this.props.isChildCommentPagination == true && item.children.length >= 5?
-
-
- : ''}
-
- {/*mr10 */}
- {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
-
-
- - {/* 第二排右侧按钮区域 */} -
- - -
- 共{all_count}个毕设任务
- 已发布：{this.state.published_count}个
- 未发布：{this.state.unpublished_count}个
-
- }
-
- secondRowBotton={
-
-
-
- }
-
- onPressEnter={this.onPressEnter}
- searchPlaceholder={"请输入名称进行搜索"}
- />
-
-
- {/*
-
:""}
-
-
-
- 已选 {checkBoxValues===undefined?0:checkBoxValues.length} 个 （不支持跨页勾选）
-
-
-
- 删除
- { this.publish() }}>立即发布
- { this.end() }}>立即截止
- {course_public===true?设为公开 :""}
- {/*this.ActionPoll()}>加入题库 */}
-
-
-
- )
-
- })
- }
-
- :""}
- // onItemClick={this.onItemClick}
- // onSticky={this.onSticky}
- funlist={()=>this.fetchAll(search,page,order)}
- coursename={this.props.coursedata&&this.props.coursedata.name}
- graduationId={this.props.match.params.graduationId}
- taskid={item.task_id}
- coursesId={this.props.match.params.coursesId}
- categoryid={this.props.match.params.Id}
- workid={item.work_id}
- index={index}
- >
-
-
-
- }
-
-
- {
- tasks===undefined?'' :tasks.length===0?
-
-
-
-
- )
- }
-}
-export default GraduationTasks;
-
-{/**/}
- {/*
*/}
diff --git a/src/modules/courses/graduation/topics/ChooseGraduateTopicModal.js b/src/modules/courses/graduation/topics/ChooseGraduateTopicModal.js
deleted file mode 100644
index 3a3d129b..00000000
--- a/src/modules/courses/graduation/topics/ChooseGraduateTopicModal.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React,{ Component } from "react";
-import { Input, Checkbox} from "antd";
-import ModalWrapper from '../../common/ModalWrapper'
-const Search = Input.Search
-// 题库选用弹框 https://www.trustie.net/issues/19980
-class ChooseGraduateTopicModal extends Component{
- constructor(props){
- super(props);
- this.state={
-
- }
- }
-
- setVisible = (visible) => {
- this.refs.modalWrapper.setVisible(visible)
- }
-
- //切换tab
- changeNav=(index)=>{
- this.setState({
- nav_my:index
- })
- }
- onOk = () => {
- this.refs.modalWrapper.setVisible(false)
- }
- render() {
- let {flag,nav_my}=this.state
- let {workType}=this.props;
- return(
- */}
- {/*
*/}
- {/*
*/}
-{/**/}
- {/*暂时还没有相关数据哦！
- 选用对象：你在课堂{"毕设选题"}列表中已“加入题库” - 的选题 -
-
-
-
-
-
-
-
- )
- }
-}
-export default GraduateTopicDetail;
diff --git a/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js b/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
deleted file mode 100644
index 033033c4..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import React,{ Component } from "react";
-
-import '../../css/members.css'
-import '../../css/busyWork.css'
-import '../style.css'
-import axios from "axios";
-import GraduateTopicReply from './GraduateTopicReply'
-
-import { ConditionToolTip , MarkdownToHtml , AttachmentList } from 'educoder'
-
-const $=window.$;
-const type={1: "设计",2: "论文", 3: "创作"}
-const source={1: "生产/社会实际", 2:"结合科研", 3: "其它"}
-const first={1:'真题', 2:'模拟题'}
-const second={1:'纵向课题', 2:'横向课题', 3: "自选"}
-const repeat={1:'新题',2:"往届题，有新要求",3:'往届题，无新要求'}
-class GraduateTopicDetailTable extends Component{
- constructor(props){
- super(props);
- this.state={
- topicInfo:undefined
- }
- }
- componentDidMount=()=>{
- let course_id=this.props.match.params.course_id;
- let graduation_topic_id=this.props.match.params.graduation_topic_id;
-
- let url=`/courses/${course_id}/graduation_topics/${graduation_topic_id}/show_detail.json`;
- axios.get(url).then((result)=>{
- if(result.status==200){
- this.setState({
- topicInfo:result.data
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
- render(){
- let{topicInfo}=this.state
- console.log(topicInfo)
- let course_id=this.props.match.params.course_id;
- let graduation_topic_id=this.props.match.params.graduation_topic_id;
-
- return(
-
-
-
-
- {tableData && tableData.graduation_topic_name}
-
-
-
- 选题
- }
- {
- isStudent && tableData.user_selected == true && tableData.user_selected_topic==0 &&
- 取消选题
- }
- {
- isAdmin && 编辑
- }
-
- {
- tab && tab==1&&
-
-
-
- {/* null: 未选题 0：待确认 1：已同意 2：已拒绝 */}
- {
- isStudent && tableData.user_selected == false && (tableData.user_selected_topic==null || tableData.user_selected_topic==2) &&
-
-
- }
- {
- tab && tab==2&&
-
-
- {
- tableData && tableData.users_count>tablePageSize &&
-
-
- }
-
-
-
- )
- }
-}
-export default GraduateTopicDetailTable;
\ No newline at end of file
diff --git a/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
deleted file mode 100644
index 07e2b61b..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ /dev/null
@@ -1,306 +0,0 @@
-import React,{ Component } from "react";
-
-import '../../css/members.css'
-import '../../css/busyWork.css'
-import '../style.css'
-
-import { WordsBtn } from 'educoder'
-import NoneData from '../../coursesPublic/NoneData'
-import Modals from "../../../modals/Modals"
-import axios from 'axios'
-import { Modal,Select,Input } from "antd";
-
-const Option = Select.Option
-class GraduateTopicDetailTable extends Component{
- constructor(props){
- super(props);
- this.state={
- modalsType:false,
- modalsTopval:'',
- operationId:undefined,
- agreeFlag:false,
- classesId:undefined,
- agreeCheck:false,
- visible:false,
- un_addClass:undefined,
- un_addClass_notice:"",
- un_choose_notice:""
- }
- }
- // 拒绝
- aboutTopic=(id)=>{
- this.setState({
- modalsType:true,
- modalsTopval:'是否确认拒绝学生选题？',
- operationId:id
- })
- }
- cancelAboutTopic=()=>{
- this.setState({
- modalsType:false,
- modalsTopval:''
- })
- }
- sureAboutTopic=()=>{
- let{operationId}=this.state
- let courseId=this.props.match.params.course_id;
- let graduation_topic_id=this.props.match.params.graduation_topic_id;
- let url =`/courses/${courseId}/graduation_topics/${graduation_topic_id}/refuse_student_topic.json?student_graduation_topic=`+operationId;
- axios.post(url).then((result)=>{
- if(result.data.status==0){
- this.props.showNotification(`${result.data.message}`);
- this.setState({
- modalsType:false,
- modalsTopval:''
- })
- //成功后调用列表接口，刷新
- this.props.getDetailList(this.props.page);
- }
- }).catch((error)=>{
- console.log(error);
- })
- this.setState({
- modalsType:false,
- modalsTopval:''
- })
- }
-
- //同意
- agreeTopic=(id)=>{
- this.setState({
- agreeFlag:true,
- operationId:id
- })
- }
- hideAgreeTopic=()=>{
- this.setState({
- agreeFlag:false,
- classesId:undefined
- })
- }
- sureAgreeTopic=(count)=>{
- let{tableData}=this.props;
- let{operationId,classesId}=this.state
- let courseId=this.props.match.params.course_id;
-
- if(classesId!=undefined){
- let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
- this.agreeChoose(courseId,operationId,classesId,name);
- }else{
- this.agreeChoose(courseId,operationId,classesId);
- }
- }
-
- agreeChoose=(courseId,operationId,classesId,courseName)=>{
- let graduation_topic_id=this.props.match.params.graduation_topic_id;
- let url =`/courses/${courseId}/graduation_topics/${graduation_topic_id}/accept_student_topic.json`;
- axios.post(url,{
- student_graduation_topic_id:operationId,
- group_id:classesId,
- course_group_name:courseName
- }).then((result)=>{
- if(result.data.status==0){
- this.props.showNotification(`${result.data.message}`);
- this.setState({
- agreeFlag:false,
- agreeCheck:true,
- visible:false
- })
- //成功后调用列表接口，刷新
- this.props.getDetailList(this.props.page);
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //切换分班
- changeClasses=(value)=>{
- this.setState({
- classesId:value
- })
- }
-
- //新增分班
- topicAddClasses=()=>{
- this.setState({
- visible:true,
- agreeFlag:false
- })
- }
- hideClasses=()=>{
- this.setState({
- visible:false,
- classesId:undefined
- })
- }
-
- //新建分班--输入分班
- inputClasses=(e)=>{
- this.setState({
- un_addClass:e.target.value
- })
- }
-
- // 新建分班---确定
- sureAddClass=()=>{
- let {un_addClass}=this.state;
- if(!un_addClass){
- this.setState({
- un_addClass_notice:"请输入分班名称"
- })
- return;
- }
-
- let{operationId}=this.state
- let courseId=this.props.match.params.course_id;
- this.agreeChoose(courseId,operationId,-1,un_addClass);
- }
-
- render(){
- let {page,tableData}=this.props
- let { modalsType,modalsTopval,agreeFlag,classesId,visible
- ,un_addClass_notice
- ,un_addClass,
- un_choose_notice
- } = this.state
- const isAdmin =this.props.isAdmin();
- const isStudent =this.props.isStudent();
- const isNotMember=this.props.isNotMember();
- console.log(un_addClass_notice)
- return(
-
-
-
-
-
-
- {
- topicInfo && topicInfo.description!="" &&
-
- {
- topicInfo && topicInfo.attachment_list.length>0 &&
-
- {/* {
- topicInfo.attachment_list.map((item,key)=>{
- return(
-
-
-
- 30 }>
- {item.title}
-
- {item.filesize}
-
- )
- })
- } */}
-
- }
-
- {
- topicInfo &&
-
- - - 课题类型： - {topicInfo.topic_type ? type[`${topicInfo.topic_type}`] :"--"} - - - 课题来源： - {topicInfo.topic_source ? source[`${topicInfo.topic_source}`] :"--"} - - - 课题性质1： - {topicInfo.topic_property_first ? first[`${topicInfo.topic_property_first}`] :"--"} - - - 课题性质2： - {topicInfo.topic_property_second ? second[`${topicInfo.topic_property_second}`] :"--"} - -
- } - { - topicInfo && -- - 课题重复情况： - {topicInfo.topic_repeat ? repeat[`${topicInfo.topic_repeat}`] :"--"} - - - 调研或实习地点： - {topicInfo.city || "--"} - - - 课题来源单位： - {topicInfo.source_unit || "--"} - -
- } -
-
-
-
- )
- }
-}
-export default GraduateTopicDetailTable;
\ No newline at end of file
diff --git a/src/modules/courses/graduation/topics/GraduateTopicItem.js b/src/modules/courses/graduation/topics/GraduateTopicItem.js
deleted file mode 100644
index 551f7f58..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import React,{ Component } from "react";
-import CoursesListType from '../../coursesPublic/CoursesListType';
-
-import { WordsBtn } from 'educoder'
-import {Tooltip} from 'antd'
-import axios from 'axios'
-
-const map={0:"待选中",1:"待确认",2:"已确认"}
-class GraduateTopicItem extends Component{
- constructor(props){
- super(props);
- }
- editTopic=(topicId)=>{
- let courseId=this.props.match.params.coursesId;
- this.props.history.push(`/classrooms/${courseId}/graduation_topics/${topicId}/edit`);
- }
- toDetailPage=(topicId)=>{
-
- if(this.props.checkIfLogin()===false){
- this.props.showLoginDialog()
- return
- }
- // if(this.props.checkIfProfileCompleted()===false){
- // this.setState({
- // AccountProfiletype:true
- // })
- // return
- // }
- // if(this.props.checkIfProfessionalCertification()===false){
- // this.props.showProfileCompleteDialog()
- // return
- // }
-
- let courseId=this.props.match.params.coursesId;
- this.props.history.push(`/classrooms/${courseId}/graduation_topics/${topicId}/detail`);
- }
- render(){
- const { checkBox, discussMessage, index,chooseTopic,
- data,
- courseId
- } = this.props;
-
- const isAdmin = this.props.isAdmin();
- const isStudent=this.props.isStudent();
- const isNotMember=this.props.isNotMember();
- if (!discussMessage || !discussMessage.author) {
- return '';
- }
- return(
-
-
-
-
-
-
-
-
- 序号
- 姓名
- {isNotMember ?"" :学号}
- 分班
- 选题时间
- 操作
- {
- isAdmin &&
- 确认结果
- }
-
-
- {/* 拒绝弹框 */}
-
-
- 确认同意学生的选题，将学生加入我的分班
- { tableData.group_list && tableData.group_list.length===0?"":
- 选择：
-
}
-
-
-
-
- {un_choose_notice}
-
- {
- tableData.users_list && tableData.users_list.length > 0 && tableData.users_list.map((item,key)=>{
- return(
-
- {parseInt(key+1)+(parseInt(page-1)*15)}
- {item.student_name}
- {isNotMember ?"" :{item.student_id}}
- {item.class_group_name || "--"}
- {item.selected_time}
- {
- isAdmin &&
-
- {
- item.result == "待确认" ?
-
- this.aboutTopic(`${item.id}`)}>拒绝
- this.agreeTopic(`${item.id}`)}>同意
- :
- (
- item.result === "已拒绝" ? --
- :
- this.aboutTopic(`${item.id}`)}>拒绝
- )
- }
-
- }
- {
- isStudent &&
- {item.result}
- }
- {
- isAdmin &&
- {item.result=== "待确认"?"--":item.result}
- }
- {
- isNotMember && --
- }
-
-
- )
- })
- }
- {
- tableData.users_list && tableData.users_list.length == 0 &&
-
-
-
-
- )
- }
-}
-export default GraduateTopicItem;
diff --git a/src/modules/courses/graduation/topics/GraduateTopicNew.js b/src/modules/courses/graduation/topics/GraduateTopicNew.js
deleted file mode 100644
index 433007c6..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ /dev/null
@@ -1,635 +0,0 @@
-import React,{ Component } from "react";
-
-import {
- Form, Input, InputNumber, Switch, Radio,
- Slider, Button, Upload, Icon, Rate, Checkbox, message,
- Row, Col, Select, Modal,Cascader
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
-import {getUrl} from 'educoder';
-import "../../common/formCommon.css"
-import '../style.css'
-import '../../css/Courses.css'
-import { WordsBtn, City , getUploadActionUrl } from 'educoder'
-
-import {Link} from 'react-router-dom'
-// import City from './City'
-
-// import './board.css'
-// import { RouteHOC } from './common.js'
-
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-const NAME_COUNT=60;
-// 新建毕设选题
-// https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=c6d9b36f-7701-4035-afdb-62404681108c
-class GraduateTopicNew extends Component{
- constructor(props){
- super(props);
-
- this.mdRef = React.createRef();
-
- this.state = {
- fileList: [],
- boards: [],
- teacherList:[],
- topic_property_first:[],
- topic_property_second:[],
- topic_repeat:[],
- topic_source:[],
- topic_type:[],
- attachments:undefined,
- addonAfter:0,
- left_banner_id:undefined,
- course_name:undefined
- }
- }
- // 获取老师列表
- getTeacherList=()=>{
- const cid = this.props.match.params.coursesId
- let url=`/courses/${cid}/graduation_topics/new.json`;
- axios.get((url)).then((result)=>{
- if(result.status==200){
- this.setState({
- teacherList:result.data.teacher_list,
- left_banner_id:result.data.left_banner_id,
- course_name:result.data.course_name,
- left_banner_name:result.data.left_banner_name,
- topic_property_first:result.data.topic_property_first,
- topic_property_second:result.data.topic_property_second,
- topic_repeat:result.data.topic_repeat,
- topic_source:result.data.topic_source,
- topic_type:result.data.topic_type
- })
- console.log("sdfds");
- console.log(this.props.current_user && this.props.current_user.user_id);
- this.props.form.setFieldsValue({
- tea_id:this.props.current_user && this.props.current_user.user_id
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
- componentDidMount = () => {
- //新建or编辑
- let topicId=this.props.match.params.topicId;
-
- if(topicId==undefined){
- this.getTeacherList();
- }else{
- this.getEditInfo();
-
- }
- }
- //编辑，信息显示
- getEditInfo=()=>{
- const cid = this.props.match.params.coursesId
- let topicId=this.props.match.params.topicId
- let url=`/courses/${cid}/graduation_topics/${topicId}/edit.json`;
- axios.get((url)).then((result)=>{
- if(result){
- this.setState({
- left_banner_id:result.data.left_banner_id,
- course_name:result.data.course_name,
- left_banner_name:result.data.left_banner_name,
- teacherList:result.data.teacher_list,
- topic_property_first:result.data.topic_property_first,
- topic_property_second:result.data.topic_property_second,
- topic_repeat:result.data.topic_repeat,
- topic_source:result.data.topic_source,
- topic_type:result.data.topic_type,
- attachments:result.data.attachments,
- addonAfter:parseInt(result.data.selected_data.name.length)
- })
- this.props.form.setFieldsValue({
- tea_id:result.data.selected_data.tea_id,
- name:result.data.selected_data.name,
- city: [result.data.selected_data.province,result.data.selected_data.city],
- topic_type:result.data.selected_data.topic_type || undefined,
- topic_source:result.data.selected_data.topic_source || undefined,
- topic_property_first:result.data.selected_data.topic_property_first || undefined,
- topic_property_second:result.data.selected_data.topic_property_second || undefined,
- source_unit:result.data.selected_data.source_unit,
- topic_repeat:result.data.selected_data.topic_repeat || undefined
- });
- this.mdRef.current.setValue(result.data.selected_data.description)
- const _fileList = result.data.attachments.map(item => {
- return {
- id: item.id,
- uid: item.id,
- name: item.title,
- url: item.url,
- status: 'done'
- }
- })
- this.setState({ fileList: _fileList, cityDefaultValue: [result.data.selected_data.province,result.data.selected_data.city] })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- handleSubmit = (e) => {
- e.preventDefault();
- const cid = this.props.match.params.coursesId
- const topicId = this.props.match.params.topicId
- // console.log(this.props);
-
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- console.log('Received values of form: ', values);
- if (topicId !=undefined) {
- const editTopic = this.editTopic
- const editUrl = `/courses/${cid}/graduation_topics/${topicId}.json`
-
- let attachment_ids = undefined
- if (this.state.fileList) {
- attachment_ids = this.state.fileList.map(item => {
- return item.response ? item.response.id : item.id
- })
- }
- axios.put(editUrl, {
- graduation_topic:{
- ...values,
- province: values.city==undefined?"":values.city[0],
- city: values.city==undefined?"":values.city[1],
- },
- attachment_ids
- }).then((response) => {
- if (response.status == 200) {
- const { id } = response.data;
- if (id) {
- this.props.showNotification('保存成功！');
- this.props.history.push(`/classrooms/${cid}/graduation_topics/${this.state.left_banner_id}`);
- }
- }
- }).catch(function (error) {
- console.log(error);
- });
- } else {
- const url = `/courses/${cid}/graduation_topics.json`
- let attachment_ids = undefined
- if (this.state.fileList) {
- attachment_ids = this.state.fileList.map(item => {
- return item.response.id
- })
- }
-
- axios.post(url, {
- graduation_topic:{
- ...values,
- province: values.city==undefined?"":values.city[0],
- city: values.city==undefined?"":values.city[1],
- },
- attachment_ids,
- }).then((response) => {
- if (response.data) {
- const { id } = response.data;
- if (id) {
- this.props.showNotification('提交成功！');
- this.props.history.push(`/classrooms/${cid}/graduation_topics/${this.state.left_banner_id}`);
- }
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- } else {
- $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
- }
- });
- }
-
- // 选择省市
- ChangeCity=(value, selectedOptions)=>{
- console.log(selectedOptions);
- }
-
- // 附件相关 START
- handleChange = (info) => {
- if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
- let fileList = info.fileList;
- this.setState({ fileList });
- }
- }
- onAttachmentRemove = (file) => {
-
- if(!file.percent || file.percent == 100){
- this.props.confirm({
- content: '确定要删除这个附件吗?',
- okText: '确定',
- cancelText: '取消',
- // content: 'Some descriptions',
- onOk: () => {
- this.deleteAttachment(file)
- },
- onCancel() {
- console.log('Cancel');
- },
- });
- return false;
- }
-
- }
- deleteAttachment = (file) => {
- console.log(file);
- let id=file.response ==undefined ? file.id : file.response.id
- const url = `/attachments/${id}.json`
- axios.delete(url, {
- })
- .then((response) => {
- if (response.data) {
- const { status } = response.data;
- if (status == 0) {
- console.log('--- success')
-
- this.setState((state) => {
- const index = state.fileList.indexOf(file);
- const newFileList = state.fileList.slice();
- newFileList.splice(index, 1);
- return {
- fileList: newFileList,
- };
- });
- }
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- // 附件相关 ------------ END
-
- changeTopicName=(e)=>{
- // let num= 60 - parseInt(e.target.value.length);
- this.setState({
- addonAfter:e.target.value.length
- })
- }
- render() {
- let {
- fileList,
- teacherList,
- topic_property_first,
- topic_property_second,
- topic_repeat,
- topic_source,
- topic_type,
- addonAfter,
- left_banner_id,
- course_name,
- left_banner_name
- } = this.state;
- const { current_user } = this.props
- const { getFieldDecorator } = this.props.form;
- let{ topicId,coursesId }=this.props.match.params
- // console.log(this.props);
-
- const formItemLayout = {
- labelCol: {
- xs: { span: 24 },
- // sm: { span: 8 },
- sm: { span: 24 },
- },
- wrapperCol: {
- xs: { span: 24 },
- // sm: { span: 16 },
- sm: { span: 24 },
- },
- };
- const uploadProps = {
- width: 600,
- fileList,
- multiple: true,
- // https://github.com/ant-design/ant-design/issues/15505
- // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
- // showUploadList: false,
- action: `${getUploadActionUrl()}`,
- onChange: this.handleChange,
- onRemove: this.onAttachmentRemove,
- beforeUpload: (file) => {
- console.log('beforeUpload', file.name);
- const isLt150M = file.size / 1024 / 1024 < 150;
- if (!isLt150M) {
- this.props.showNotification('文件大小必须小于150MB!');
- }
- return isLt150M;
- },
- };
- // console.log("dfsf");
- // console.log(this.props);
- document.title=course_name===undefined?"":course_name;
- return(
- window.$(`.topicItem${index} input`).click() }>
-
- { isAdmin ? {checkBox} : ""}
-
-
-
-
- {
- isNotMember?
- discussMessage.private_icon===true?{discussMessage.name}:
- {discussMessage.name}
- :""
- }
- {
- isStudent? this.toDetailPage(`${discussMessage.id}`)}
- className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:""
- }
- {
- isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:""
- }
- {
- discussMessage.private_icon===true?
-
-
-
-
-
- {
- isNotMember?
- discussMessage.private_icon===true?{discussMessage.name}:
- {discussMessage.name}
- :""
- }
- {
- isStudent? this.toDetailPage(`${discussMessage.id}`)}
- className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:""
- }
- {
- isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:""
- }
- {
- discussMessage.private_icon===true?
-
-
-
- :""
- }
-
-
-
-
-
-
-
-
- )
- }
-}
-
-const WrappedGraduateTopicNew = Form.create({ name: 'topicPostWorksNew' })(GraduateTopicNew);
-// RouteHOC()
-export default (WrappedGraduateTopicNew);
diff --git a/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js b/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js
deleted file mode 100644
index 1a860922..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicNewFrom.js
+++ /dev/null
@@ -1,520 +0,0 @@
-import React,{ Component } from "react";
-
-import {
- Form, Input, Button, Upload, Icon , message, Select
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
-import { City , getUploadActionUrl , appendFileSizeToUploadFileAll } from 'educoder';
-const $ = window.$;
-const NAME_COUNT=60;
-const { Option} = Select;
-class GraduateTopicNewForm extends Component{
- constructor(props){
- super(props);
-
- this.mdRef = React.createRef();
-
- this.state = {
- fileList: [],
- teacherList:[],
- topic_property_first:[],
- topic_property_second:[],
- topic_repeat:[],
- topic_source:[],
- topic_type:[],
- addonAfter:0,
- cityDefaultValue:undefined
- }
- }
- // init编辑信息
- initValue=(result)=>{
- this.setState({
- teacherList:result.data.teacher_list,
- topic_property_first:result.data.topic_property_first,
- topic_property_second:result.data.topic_property_second,
- topic_repeat:result.data.topic_repeat,
- topic_source:result.data.topic_source,
- topic_type:result.data.topic_type,
- addonAfter:parseInt(result.data.selected_data.name.length)
- })
- this.props.form.setFieldsValue({
- tea_id:result.data.selected_data.tea_id,
- name:result.data.selected_data.name,
- city: [result.data.selected_data.province,result.data.selected_data.city],
- topic_type:result.data.selected_data.topic_type || undefined,
- topic_source:result.data.selected_data.topic_source || undefined,
- topic_property_first:result.data.selected_data.topic_property_first || undefined,
- topic_property_second:result.data.selected_data.topic_property_second || undefined,
- source_unit:result.data.selected_data.source_unit,
- topic_repeat:result.data.selected_data.topic_repeat || undefined
- });
- this.mdRef.current.setValue(result.data.selected_data.description)
- const _fileList = result.data.attachments.map(item => {
- return {
- id: item.id,
- uid: item.id,
- name: item.title,
- url: item.url,
- status: 'done'
- }
- })
- this.setState({ fileList: _fileList, cityDefaultValue: [result.data.selected_data.province,result.data.selected_data.city] })
- }
- //init新建信息
- initNewInfo=(result)=>{
- this.setState({
- teacherList:result.data.teacher_list,
- topic_property_first:result.data.topic_property_first,
- topic_property_second:result.data.topic_property_second,
- topic_repeat:result.data.topic_repeat,
- topic_source:result.data.topic_source,
- topic_type:result.data.topic_type
- })
-
- this.props.form.setFieldsValue({
- tea_id:this.props.current_user && this.props.current_user.user_id
- })
- }
-
- // 附件相关 START
- handleChange = (info) => {
- if (info.file.status === 'done' || info.file.status === 'uploading') {
- let contentFileList = info.fileList;
- // this.setState({ fileList: appendFileSizeToUploadFileAll(contentFileList)});
- // let list = appendFileSizeToUploadFileAll(contentFileList);
- // let arr = list.map(item=>{
- // return ( item.response && item.response.id )
- // })
- this.setState({
- fileList:contentFileList
- });
- }
- }
- onAttachmentRemove = (file) => {
- this.props.confirm({
- content: '确定要删除这个附件吗?',
- onOk: () => {
- this.deleteAttachment(file)
- },
- onCancel() {
- console.log('Cancel');
- },
- });
- return false;
- }
- deleteAttachment = (file) => {
- console.log(file);
- let id=file.response ==undefined ? file.id : file.response.id
- const url = `/attachments/${id}.json`
- axios.delete(url).then((response) => {
- if (response.data) {
- const { status } = response.data;
- if (status == 0) {
- console.log('--- success')
-
- this.setState((state) => {
- const index = state.fileList.indexOf(file);
- const newFileList = state.fileList.slice();
- newFileList.splice(index, 1);
- return {
- fileList: newFileList,
- };
- });
- }
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- changeTopicName=(e)=>{
- // let num= 60 - parseInt(e.target.value.length);
- this.setState({
- addonAfter:e.target.value.length
- })
- }
-
-
- handleSubmit = (e) => {
- e.preventDefault();
- const topicId = this.props.topicId
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- if (topicId !=undefined) {
- // 编辑
- // const editTopic = this.editTopic
- let attachment_ids = undefined
- if (this.state.fileList) {
- attachment_ids = this.state.fileList.map(item => {
- return item.response ? item.response.id : item.id
- })
- }
- const param = {
- ...values,
- province: values.city==undefined?"":values.city[0],
- city: values.city==undefined?"":values.city[1],
- }
- this.props.editSave && this.props.editSave(param,attachment_ids,topicId);
- } else {
- // 新建
- let attachment_ids = undefined
- if (this.state.fileList) {
- attachment_ids = this.state.fileList.map(item => {
- return item.response.id
- })
- }
- const param ={
- ...values,
- province: values.city==undefined?"":values.city[0],
- city: values.city==undefined?"":values.city[1],
- }
- this.props.newSubmit && this.props.newSubmit(param,attachment_ids,topicId);
- }
- } else {
- $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
- }
- });
- }
-
- // 附件相关 ------------ END
- render(){
- let{
- fileList,
- teacherList,
- topic_property_first,
- topic_property_second,
- topic_repeat,
- topic_source,
- topic_type,
- addonAfter,
- cityDefaultValue
- }=this.state;
- const { getFieldDecorator } = this.props.form;
- const formItemLayout = {
- labelCol: {
- xs: { span: 24 },
- // sm: { span: 8 },
- sm: { span: 24 },
- },
- wrapperCol: {
- xs: { span: 24 },
- // sm: { span: 16 },
- sm: { span: 24 },
- },
- };
- const uploadProps = {
- width: 600,
- fileList,
- multiple: true,
- action: `${getUploadActionUrl()}`,
- onChange: this.handleChange,
- onRemove: this.onAttachmentRemove,
- beforeUpload: (file) => {
- const isLt150M = file.size / 1024 / 1024 < 150;
- if (!isLt150M) {
- //message.error('文件大小必须小于150MB!');
- this.props.define({
- title:'提示',
- content:"该文件无法上传。超过文件大小限制(150MB),建议上传到百度云等其它共享工具里，然后再txt文档里给出链接以及共享密码并上传"
- })
- return isLt150M;
- }
- }
- };
- let { topicId , teacherName }=this.props;
- return(
-
-
-
-
-
-
-
- {topicId==undefined?"新建":"编辑"}毕设选题
- 返回 -
-
-
- )
- }
-}
-
-const WrappedGraduateTopicPostWorksNew = Form.create({ name: 'topicPostWorksNew' })(GraduateTopicPostWorksNew);
-// RouteHOC()
-export default (WrappedGraduateTopicPostWorksNew);
\ No newline at end of file
diff --git a/src/modules/courses/graduation/topics/GraduateTopicReply.css b/src/modules/courses/graduation/topics/GraduateTopicReply.css
deleted file mode 100644
index 6e295411..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicReply.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.graduateTopic .commentsbtn {
-
-}
-
-
-.edu-class-container {
- width: 1200px;
- margin: 10px auto 20px;
-}
-#forum_index_list {
- margin-top: 90px;
- margin-bottom: 320px;
-}
diff --git a/src/modules/courses/graduation/topics/GraduateTopicReply.js b/src/modules/courses/graduation/topics/GraduateTopicReply.js
deleted file mode 100644
index 5faf626f..00000000
--- a/src/modules/courses/graduation/topics/GraduateTopicReply.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import React,{ Component } from "react";
-import { Pagination } from "antd";
-
-import update from 'immutability-helper'
-import axios from 'axios'
-import MemoDetailMDEditor from '../../../forums/MemoDetailMDEditor'
-
-import '../../../forums/RightSection.css'
-import {ImageLayerOfCommentHOC} from '../../../page/layers/ImageLayerOfCommentHOC'
-
-import Comments from '../../../comment/Comments'
-import './GraduateTopicReply.css'
-import '../../common/courseMessage.css'
-import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
- , addSecondLevelComment, NEED_TO_WRITE_CONTENT, handleContentBeforeCreateSecondLevelComment
- , handleDeleteComment, handleCommentPraise, handleHiddenComment } from '../../common/CommentsHelper'
-const REPLY_PAGE_COUNT = 10
-const $ = window.$;
-class GraduateTopicReply extends Component{
- constructor(props){
- super(props);
- this.state={
- pageCount: 1
- }
- }
-
- componentDidMount(){
- this.fetchReplies()
-
-
- }
- _getUser() {
- const { current_user } = this.props;
- current_user.user_url = `/users/${current_user.login}`;
- return current_user;
- }
- _findById = _findById
- createNewComment = (commentContent, id, editor) => {
- const graduation_topic_id = this.props.memo.id
-
- let content = handleContentBeforeCreateNew(commentContent);
- const { memo } = this.props;
- const url = `/users/reply_message.json`;
-
- let { comments } = this.state;
- axios.post(url, {
- journals_for_message: {
- jour_type: 'GraduationTopic',
- jour_id: graduation_topic_id,
- notes: content,
- // m_parent_id
- reply_id: memo.user_id
- }
- }
- ).then((response) => {
- if (response.data.status === -1) {
- console.error('服务端异常')
- return;
- }
- // this.props.showNotification('帖子发表成功')
-
- if (response.data && response.data.id) {
- const _id = response.data.id;
- // md
- editor.setValue && editor.setValue('')
-
- const user = this._getUser();
- this.setState({
- comments: addNewComment(this.state.comments, _id, content, user, this.props.isSuperAdmin(), this),
- total_count: this.state.total_count + 1
- })
- this.refs.editor.showEditor();
-
- }
- }).catch((error) => {
- console.log(error)
- })
- }
- replyComment = (commentContent, id, editor) => {
- const { showNotification } = this.props;
- // if (!commentContent || commentContent.length === 0) {
- // showNotification(NEED_TO_WRITE_CONTENT)
- // return;
- // }
-
- if (this.props.memo.id === id ) { // 回复帖子
- this.createNewComment(commentContent, id, editor);
- return;
- }
- const url = `/users/reply_message.json`;
-
- const { comments } = this.state;
- const user = this._getUser();
- const graduation_topic_id = this.props.memo.id
- const commentIndex = this._findById(id, comments);
- let comment = comments[commentIndex];
-
- commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
- axios.post(url, {
- journals_for_message: {
- jour_type: 'GraduationTopic',
- jour_id: graduation_topic_id,
- notes: commentContent,
- m_parent_id: id,
- reply_id: comment.user_id
- }
- },
- {
- }
- ).then((response) => {
- if (response.data.id) {
- let newId = response.data.id;
-
- this.setState({
- comments: addSecondLevelComment(comments, comment, commentIndex, newId, commentContent, user, editor)
- })
-
- const newMemo2 = Object.assign({}, this.props.memo);
- newMemo2.total_count = newMemo2.total_count + 1;
- this.setState({
- memo: newMemo2
- })
- }
-
- }).catch((error) => {
- console.log(error)
- })
- }
-
- loadMoreChildComments = (parent) => {
- const graduation_topic_id = this.props.memo.id
- const course_id = this.props.course_id
- const url = `/courses/${course_id}/graduation_topics/${graduation_topic_id}/show_comment.json?parent_id=${parent.id}&limit=500`
- axios.get(url,{
- })
- .then((response) => {
- const { comments } = response.data
-
-
- // const memo = Object.assign({}, this.state.memo)
- // memo.sum_replies_count = sum_replies_count;
- this.setState({
- // memo,
- comments: generateChildComments(comments, this.state.comments, parent, this.transformReply)
- })
- }).catch((error) => {
- console.log(error)
- })
- }
-
- onPaginationChange = (pageCount) => {
- this.setState({ pageCount }, () => {
- this.fetchReplies()
- })
- }
-
- fetchReplies = () => {
- const graduation_topic_id = this.props.memo.id
- const course_id = this.props.course_id
- const url = `/courses/${course_id}/graduation_topics/${graduation_topic_id}/show_comment.json?page=${this.state.pageCount}`
- // page limit parent_id
- axios.get(url,{
- })
- .then((response) => {
- const { comments, messages_count } = response.data
-
- this.setState({
- comments: generateComments(comments, this.transformReply),
- // : this.state.comments.concat(comments),
- total_count: messages_count
- })
- }).catch((error) => {
- console.log(error)
- })
- }
-
- transformReply = (reply, children = []) => {
- const isAdmin = this.props.isAdmin()
- const isSuperAdmin = this.props.isSuperAdmin()
- return {
- isSuperAdmin: isSuperAdmin,
- admin: isAdmin, //
- permission: true, //
- children: children,
- child_message_count: reply.child_message_count,
- hidden: reply.hidden,
- id: reply.id,
- image_url: reply.author.image_url,
- reward: null, //
- time: reply.time, // moment(reply.created_on).fromNow(),
- user_id: reply.author.id,
- user_login: reply.author.login,
- user_praise: reply.user_praise,
- username: reply.author.name,
- content: reply.content,
- praise_count: reply.praise_count
- }
- }
-
- // 公共接口 --- 删除回复
- deleteComment = (parrentComment, childCommentId) => {
- handleDeleteComment(this, parrentComment, childCommentId, 'journals_for_message')
- }
- // 公共接口 --- 回复点赞
- commentPraise = (discussId) => {
- handleCommentPraise(this, discussId, 'journals_for_message')
- }
- // 公共接口 --- 隐藏回复
- hiddenComment = (item, childCommentId) => {
- handleHiddenComment(this, item, childCommentId, 'journals_for_message')
- }
-
- showCommentInput = () => {
- this.refs.editor.showEditor();
- }
- initReply = (parent) => {
- if (!parent.isAllChildrenLoaded) {
- this.loadMoreChildComments(parent)
- }
- }
-
- render(){
- let { total_count, comments, pageCount } = this.state
- const { current_user, memo } = this.props
-
- return(
-
-
-
-
-
-
-
-
-
- { total_count > REPLY_PAGE_COUNT &&
-
- 全部回复
- {total_count}
-
-
-
-
} */}
- 写评论
-
-
-
}
- 写评论
-
-
-
- }
- onPressEnter={this.onPressEnter}
- searchPlaceholder={"请输入名称进行搜索"}
- showSearchInput={topicList && topicList.length >= pageSize}
- >
-
- {
- // 超级管理员、教师、助教
- isAdmin ?
-
-
-
-
-
-
- ) : (topicList && topicList.length === 0 ?
- 已选 {checkBoxValues.length} 个 （不支持跨页勾选）
-
- : ""
- }
-
- this.onDelete(1)}>删除
- {
- course_public && course_public == 1 ? this.onDelete(2)}>设为公开 : ""
- }
- {/*this.onDelete(3)}>加入题库 */}
- {/* 加入题库 */}
-
-
-
- {topicList.map((item, index) => {
- return (
-
-
-
-
- this.onItemClick(item)} className="mr15">}
- onItemClick={this.onItemClick}
- index={index}
- chooseTopic={this.chooseTopic}
- >
-
- )
- })
- }
-
-
- :
-
- }
-
-
-
-
- )
- }
-}
-export default Boards;