Merge remote-tracking branch 'origin/master'

dev_forum
杨树明 6 years ago
commit d7b964d5d8

@ -97,13 +97,6 @@ class CommonWorkItem extends Component{
setupdate = () => {
}
toCreateProject = () => {
if (window.location.port == 3007) {
window.location.href = '/testbdweb.educoder.net/projects/new'
} else {
window.location.href = '/projects/new'
}
}
render(){
let { mainList,workType }=this.props;
const { aModalVisible, fileList, revise_reason } = this.state

@ -85,13 +85,6 @@ class ConnectProject extends Component{
console.log(error);
})
}
toCreateProject = () => {
if (window.location.port == 3007) {
window.location.href = '/testbdweb.educoder.net/projects/new'
} else {
window.location.href = '/projects/new'
}
}
//关联项目
openConnectionProject=(work)=>{
this.work = work;
@ -175,7 +168,7 @@ class ConnectProject extends Component{
{
(!haveProjects) &&
<div className="edu-txt-center">
您当前尚未管理任何项目请先<WordsBtn style="blue" className="" onClick={this.toCreateProject}>创建项目</WordsBtn>
您当前尚未管理任何项目请先<WordsBtn style="blue" className="" onClick={this.props.toCreateProject}>创建项目</WordsBtn>
</div>
}

@ -477,7 +477,7 @@ class NewWork extends Component{
<span className="ml15 mr15">~</span>
{/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */}
<ConditionToolTip condition={has_commit} title={'已有提交作品,人数范围只能扩大'}>
<InputNumber className="winput-240-40" placeholder="请填写每组最大人数" value={max_num}
<InputNumber className="winput-240-40" placeholder="请填写每组最大人数" value={max_num} max={10}
onChange={this.max_num_change} style={{width:'180px'}} />
</ConditionToolTip>
<label className="color-grey-9 ml20 font-14">项目管理员角色的成员都可以提交作品提交作品时需要关联同组成员组内成员作品共享</label>

@ -187,7 +187,13 @@ class UseBank extends Component{
display: -webkit-flex;
}
.setImgW .edu-nodata-img{
width:218px!important;
width:218px !important;
}
.bankwidth{
width:29% !important;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
}
`}</style>
@ -269,7 +275,10 @@ class UseBank extends Component{
<span className="fl with65">
<label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
</span>
<span title={item.course_list_name && item.course_list_name.length > 14 && item.course_list_name} className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name}</span>
<span title={item.course_list_name && item.course_list_name.length > 14 && item.course_list_name}
className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5 bankwidth":"fl with30 color-grey-6 task-hide pl5 bankwidth"}
>{item.course_list_name}</span>
{
nav_my==='public' &&
<span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span>

@ -17,6 +17,13 @@ export function RouteHOC(options = {}) {
}
}
toCreateProject = () => {
if (window.location.port == 3007) {
window.location.href = '/testbdweb.educoder.net/projects/new'
} else {
window.location.href = '/projects/new'
}
}
// common_homework group_homework
// 是否是分组作业
isGroup = () => {
@ -156,7 +163,7 @@ export function RouteHOC(options = {}) {
toWorkQuestionPage={this.toWorkQuestionPage}
toWorkSettingPage={this.toWorkSettingPage}
toCreateProject={this.toCreateProject}
isGroup={this.isGroup}
getModuleName={this.getModuleName}

@ -272,9 +272,11 @@ class Coursesleftnav extends Component{
debugger
let {url}=this.state;
if(urls!=url){
debugger
this.props.history.replace(urls);
this.props.updataleftNavfun();
}else{
debugger
if (key === this.props.indexs) {
this.props.unlocationNavfun(undefined)
} else {

@ -1,5 +1,5 @@
import React,{ Component } from "react";
import { Modal,Checkbox,Input} from "antd";
import { Modal,Checkbox,Input, Spin, Icon } from "antd";
import axios from 'axios';
import Modals from '../../modals/Modals';
const CheckboxGroup = Checkbox.Group;
@ -23,6 +23,7 @@ class Addcourses extends Component{
modalsType:false,
modalsTopval:undefined,
modalSave:undefined,
isSpin:false
}
}
@ -144,17 +145,22 @@ class Addcourses extends Component{
}
submittojoinclass=()=>{
this.setState({
isSpin:true
})
let {invite_code,professor,assistant_professor,student}=this.state;
if(invite_code===undefined||invite_code===""){
this.setState({
invite_codetype:true,
invite_codevalue:"邀请码不能为空"
invite_codevalue:"邀请码不能为空",
spinning:false
})
return
}else{
this.setState({
invite_codetype:false,
invite_codevalue:" "
invite_codevalue:" ",
spinning:false
})
}
@ -178,7 +184,12 @@ class Addcourses extends Component{
// // modalSave:this.submitasyn,
// course_id:response.data.course_id
// })
if(response.data.course_id!=undefined){
this.submitasyn(response.data.course_id)
}
this.props.hideAddcoursestype();
this.props.showNotification(response.data.message);
}else{
this.setState({
Addcoursestype:false
@ -193,8 +204,15 @@ class Addcourses extends Component{
// course_id:undefined
// })
}
this.setState({
spinning:false
})
}).catch((error) => {
console.log(error)
this.setState({
spinning:false
})
})
// if(value===0){
@ -258,7 +276,7 @@ class Addcourses extends Component{
modalsTopval,
modalSave
}=this.state;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
return(
<div>
<Modals
@ -277,6 +295,7 @@ class Addcourses extends Component{
footer={null}
destroyOnClose={true}
>
<Spin indicator={antIcon} spinning={this.state.isSpin}>
<div className="task_popup_con ml30">
<div className="mr15">
<ul>
@ -331,6 +350,7 @@ class Addcourses extends Component{
</ul>
</div>
</div>
</Spin>
</Modal>
</div>
)

@ -69,20 +69,23 @@ class ExerciseDisplay extends Component{
return(
<div className="edu-back-white">
<div className={"bor-bottom-greyE padding20-30"}>
<div className={" padding20-30"}>
<style>
{
`
.center{
text-align: center;
}
.edu-back-white>.bor-bottom-greyE:last-child {
border-bottom: none !important;
}
`
}
</style>
<div className={"font-18 center"}>{exercise&&exercise.exercise_name}</div>
<div className={"font-14 center color-grey-9"}>{exercise&&exercise.exercise_description}</div>
<div className={"font-14 color-grey-9"}>{exercise&&exercise.exercise_description}</div>
</div>
<div className={"bor-bottom-greyE padding20-30 newContainer"}>
<div className={" padding20-30 newContainer"}>
<p className=" clearfix">
{
exercise_types && exercise_types.q_singles > 0 &&

@ -167,7 +167,7 @@ class ExerciseListItem extends Component{
{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"100px"}}>
<a className="btn colorblue font-16" href={`/courses/${coursesId}/exercises/${item.id}/edit`} target={"_blank"}>编辑</a>
<a className="btn colorblue font-16" href={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</a>
<a className="btn colorblue ml20 font-16" href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</a>
</div> }

@ -342,6 +342,11 @@ class ExerciceNew extends Component{
this.editingId = null;
this.fetchExercise()
}
goToPreview = () => {
const exercise_id = this.props.match.params.Id
const courseId = this.props.match.params.coursesId
this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`)
}
render() {
let { exercise_name, exercise_description, course_id, exercise_types,
exercise_questions, left_banner_id } = this.state;
@ -366,6 +371,8 @@ class ExerciceNew extends Component{
const isAdmin = this.props.isAdmin()
const courseId=this.props.match.params.coursesId;
const exercise_id = this.props.match.params.Id
const isEdit = this.isEdit
const commonHandler = {
onQestionDelete: this.onQestionDelete,
@ -395,7 +402,7 @@ class ExerciceNew extends Component{
background: #fff;
}
.exerciseNew .markdown-body {
max-width: 1088px;
max-width: 1128px;
}
`}</style>
<div className="edu-class-container edu-position courseForm">
@ -546,6 +553,11 @@ class ExerciceNew extends Component{
<ActionBtn style="green" className="mr20" onClick={() => this.addShixun(null)}>
<i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>
</ActionBtn>
{exercise_id && <ActionBtn style="blue" className="fr" onClick={() => this.goToPreview()}>
{/* <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i> */}
试卷预览
</ActionBtn>}
</div>}
</div>

@ -39,14 +39,14 @@ class NullChildEditor extends Component{
let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish,
answers } = this.props;
// marginTop: '18px'
return(
<div className="df" style={{ marginTop: '18px'}}>
<div className="df" style={{ }}>
<div className="color-grey-6 mb5 mt6" style={{ flex: '0 0 90px'}}>答案(填空{index + 1}):</div>
<div className="df flex1" style={{flexDirection: 'column'}}>
{
answers.map((item, itemIndex) => {
return <div className="df mb20 flex1" >
return <div className="df flex1" >
<div className="flex1" style={{ flex: '0 0 1000px'}}>
<DMDEditor
className={'nullChildEditor'}

@ -80,12 +80,14 @@ class NullDisplay extends Component{
.answers .answer {
background: #EDEDED;
color: #C5C5C5;
width: 100%;
display: inline-block;
line-height: 16px;
padding:12px 10px;
margin-bottom:10px;
border-radius:2px;
max-width: 1024px;
word-break: break-all;
}
.answerRow {
padding: 1px 0;

@ -282,7 +282,7 @@ class NullEditor extends Component{
display: inline-block;
}
.content_editorMd_show {
display: flex;
maxWidth: 1000px;
}
`}</style>

@ -71,7 +71,7 @@ class SingleDisplay extends Component{
let length = 5;
const qName = qNameArray[question_type]
return(
<div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
<div className="bor-bottom-greyE padding20-30 singleDisplay" id={qNumber} _id={question_id}>
<style>{`
.optionMdEditor {
flex: 0 0 800px

@ -219,9 +219,10 @@ class SingleEditor extends Component{
}
.optionRow {
margin:0px!important;
margin-bottom: 20px!important;
/* margin-bottom: 20px!important; */
}
.signleEditor .content_editorMd_show{
display: flex;
margin-top:0px!important;
border-radius:2px;
max-width: 1056px;

@ -30,3 +30,7 @@
width: 100%;
display: inline-block;
}
.singleDisplay .options .markdown-body {
max-width: 1116px;
}

@ -504,7 +504,7 @@ class GraduationTasksSubmitedit extends Component{
`}</style>
<Form.Item
label="内容"
className="mdInForm"
>
{getFieldDecorator('description', {
rules: [{

@ -31,7 +31,8 @@ class GraduationTasksSubmitnew extends Component{
minmaxtype:false,
selectobjct:undefined,
Loadtype:false,
spinnings:false
spinnings:false,
shixunsreplace:false
}
}
@ -88,111 +89,11 @@ class GraduationTasksSubmitnew extends Component{
if(fileList.length === 0){
this.setState({
Modalstype:true,
Modalstopval:'请上传附件!',
Loadtype:true,
ModalSave:this.cancelAttachment,
tshixunsreplace:true,
})
return
}
let userids=[];
for(var list of selectmemberslist){
if(list.user_id!=undefined&&list.user_id!=null){
userids.push(list.user_id)
}
}
if(workslist.task_type===1){
userids=undefined
}
let listid=[];
for(var list of fileList){
listid.push(list.response.id)
}
// e.preventDefault();
if( GraduationTasksnewtype===true){
this.props.form.validateFields((err, values) => {
if (!err) {
console.log(values.description);
// console.log(fileList);
if(values.description===undefined||values.description===""){
return
}
if(workslist&&workslist.task_type===2){
if(userids!=undefined){
if(userids.length<2){
this.setState({
minvalue:2,
setvalue:"小于",
minmaxtype:true
})
return
}else if(userids.length>5){
this.setState({
minvalue:5,
setvalue:"大于",
minmaxtype:true
})
return
}
}
}
this.setState({
spinnings:true
})
let id=this.props.match.params.task_Id;
let url="/graduation_tasks/"+id+"/graduation_works.json";
axios.post(url, {
description:values.description,
attachment_ids:listid,
user_ids:userids
}
).then((response) => {
this.setState({
spinnings:false
})
if(response.status===200) {
GraduationTasksnewtype=false;
if(response.data.status===0){
// this.setState({
// Modalstype:true,
// Modalstopval:response.data.message,
// ModalSave:()=>this.setedit(response.data.work_id),
// Loadtype:true
// })
this.setedit(response.data.work_id)
}else{
GraduationTasksnewtype=true;
}
}
}).catch((error) => {
console.log(error)
})
}
});
}
// setTimeout(function () {
// GraduationTasksnewtype=true
// },10000)
this.Commoninterface(fileList,selectmemberslist,workslist);
}
handleSelectChange = (value) => {
@ -433,10 +334,116 @@ class GraduationTasksSubmitnew extends Component{
window.history.go(-1)
}
//公用数据
Commoninterface = (fileList,selectmemberslist,workslist)=>{
let userids=[];
for(var list of selectmemberslist){
if(list.user_id!=undefined&&list.user_id!=null){
userids.push(list.user_id)
}
}
if(workslist.task_type===1){
userids=undefined
}
let listid=[];
for(var list of fileList){
listid.push(list.response.id)
}
// e.preventDefault();
if( GraduationTasksnewtype===true){
this.props.form.validateFields((err, values) => {
if (!err) {
console.log(values.description);
// console.log(fileList);
if(values.description===undefined||values.description===""){
return
}
if(workslist&&workslist.task_type===2){
if(userids!=undefined){
if(userids.length<2){
this.setState({
minvalue:2,
setvalue:"小于",
minmaxtype:true
})
return
}else if(userids.length>5){
this.setState({
minvalue:5,
setvalue:"大于",
minmaxtype:true
})
return
}
}
}
this.setState({
spinnings:true
})
let id=this.props.match.params.task_Id;
let url="/graduation_tasks/"+id+"/graduation_works.json";
axios.post(url, {
description:values.description,
attachment_ids:listid,
user_ids:userids
}
).then((response) => {
this.setState({
spinnings:false
})
if(response.status===200) {
GraduationTasksnewtype=false;
if(response.data.status===0){
// this.setState({
// Modalstype:true,
// Modalstopval:response.data.message,
// ModalSave:()=>this.setedit(response.data.work_id),
// Loadtype:true
// })
this.setedit(response.data.work_id)
}else{
GraduationTasksnewtype=true;
}
}
}).catch((error) => {
console.log(error)
})
}
});
}
}
//确认
hidestartshixunsreplace=()=>{
let {fileList,selectmemberslist,workslist}=this.state;
this.Commoninterface(fileList,selectmemberslist,workslist);
}
//取消
hidestartshixunsreplacetwo=()=>{
this.setState({
shixunsreplace:false,
})
}
render(){
const { getFieldDecorator } = this.props.form;
let {search,fileList, workslist,setvalue,minvalue,minmaxtype,Loadtype,
Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist} =this.state;
Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist,shixunsreplace} =this.state;
let courseId=this.props.match.params.coursesId;
let category_id=this.props.match.params.category_id;
@ -481,6 +488,24 @@ render(){
modalSave={ModalSave}
loadtype={Loadtype}
/>
<Modal
keyboard={false}
title="提示"
visible={shixunsreplace}
closable={false}
footer={null}
>
<div className="task-popup-content">
<p className="task-popup-text-center font-16 ">还未上传附件</p>
<p className="task-popup-text-center font-16 pb20">是否确认提交作品?</p>
</div>
<div className="task-popup-submit clearfix">
<a className="task-btn task-btn-orange fr "
onClick={() => this.hidestartshixunsreplace()}>确认</a>
<a className="task-btn fr mr50"
onClick={() => this.hidestartshixunsreplacetwo()}>取消</a>
</div>
</Modal>
<div className="newMain clearfix">
<div className={"educontent mb20"}>
@ -520,13 +545,10 @@ render(){
.upload_1 .ant-upload-list {
width: 350px;
}
.contentbox{
margin-bottom:0px !important;
}
`}</style>
<Form.Item
label="内容"
className={"contentbox"}
className={"contentbox mdInForm"}
>
{getFieldDecorator('description', {
rules: [{
@ -583,7 +605,7 @@ render(){
{workslist&&workslist.task_type===1?"":
<div className="stud-class-set pd20 coursenavbox edu-back-white"
style={{borderTop:'1px solid #ccc'}}
style={{borderTop:'0.5px solid #ccc'}}
>
<Form.Item
label="小组成员"

@ -348,6 +348,7 @@ class GraduationTasksedit extends Component{
`}</style>
<Form.Item
label="内容"
className="mdInForm"
style={{marginBottom:'0px'}}
>
{getFieldDecorator('description', {

@ -339,9 +339,11 @@ class GraduationTasksnew extends Component {
.ant-form-item{
margin-bottom:0px
}
`}</style>
<Form.Item
label="内容"
className="mdInForm "
>
{getFieldDecorator('description', {

@ -307,6 +307,7 @@ class GraduateTopicPostWorksNew extends Component{
<Form.Item
label="内容"
className="mdInForm"
>
{getFieldDecorator('content', {
rules: [{

@ -811,7 +811,7 @@ submittojoinclass=(value)=>{
closable={false}
footer={null}
>
<div className="task_popup_con ml30">
<div className="task_popup_con">
<div className="mr15">
<ul>
<li className="clearfix mb10">

@ -81,7 +81,14 @@ function md_elocalStorage(editor,mdu,id){
var id1 = "#e_tip_"+id;
var id2 = "#e_tips_"+id;
$(id2).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 ");
var textStart = " 数据已于 "
var text = textStart + h + ':' + m + ':' + s +" 保存 ";
// 占位符
if ($(id2).html() && $(id2).html() != ' ' && $(id2).html().startWith(textStart) == false) {
$(id2).html( $(id2).html().split(' (')[0] + ` (${text})`);
} else {
$(id2).html(text);
}
// $(id2).html("");
}
},10000);

Loading…
Cancel
Save