diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 61ab83126..6c4a20fa9 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -31,7 +31,7 @@ export function initAxiosInterceptors(props) { // proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.educoder.net" proxy = "https://testeduplus2.educoder.net" - //proxy="http://47.96.87.25:48080" + proxy="http://47.96.87.25:48080" // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制 diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 97d9436a6..718b6de42 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -316,7 +316,7 @@ class BoardsNew extends Component{ max: 60, message: '最大限制为60个字符', }], })( - + )} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 246c9d544..25ddaa146 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -371,6 +371,8 @@ class CommonWorkSetting extends Component{ componentDidMount() { this.fetchList() on('commonwork_fetch_all', this.fetchAllListener) + $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) + } componentWillUnmount() { off('commonwork_fetch_all', this.fetchAllListener) diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index eefbc1f0b..a6fc93c92 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -417,12 +417,25 @@ class NewWork extends Component{ height: 40px; line-height: 40px; } + + .workContent.AboutInputForm.ant-form-item { + border-bottom: none; + padding-bottom: 0px !important; + } + .newWorkUpload { + padding: 0px 30px 30px 30px!important; + background: #fff; + width: 100%; + display: inline-block; + border-bottom: 1px solid #EDEDED; + } + `} { {getFieldDecorator('description', { rules: [{ @@ -432,14 +445,13 @@ class NewWork extends Component{ )} - - - - (单个文件150M以内) - } + + + (单个文件150M以内) + { isGroup && diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index acd583e43..9c57001c8 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -15,7 +15,8 @@ class AccessoryModal extends Component{ Modalstopval:"", ModalCancel:"", ModalSave:"", - loadtype:false + loadtype:false, + updatas:false } } @@ -114,9 +115,12 @@ class AccessoryModal extends Component{ for(var list of fileList){ newfileList.push(list.response.id) } - +debugger if (newfileList.length == 0) { - this.props.showNotification('请先上传附件') + // this.props.showNotification('请先上传附件') + this.setState({ + updatas:true + }) return; } @@ -243,7 +247,7 @@ class AccessoryModal extends Component{ border:'1px solid rgba(234,234,234,1)', padding: '10px' }}> - + {this.state.updatas===true?请上传附件:""}
{this.props.Cancelname || '取消'} this.Saves()}>{this.props.Savesname || '确认'} diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 197082dbe..c2eb43242 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -850,8 +850,8 @@ a.white-btn.use_scope-btn:hover{ /*列表状态*/ .typestyle{ min-width: 68px; - height: 24px; - line-height: 24px; + height: 24px !important; + line-height: 24px !important; color: #fff !important; } .edu-filter-btn-028d01{ @@ -924,7 +924,7 @@ a.white-btn.use_scope-btn:hover{ .ml22{ margin-left:22px; } - +/* FORM START */ .ant-form label{ /* 为了覆盖antd的样式，这里使用了important，TODO */ font-size: 16px !important; @@ -938,6 +938,12 @@ a.white-btn.use_scope-btn:hover{ .ant-form label.font-12 { font-size: 12px !important; } +/* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */ +.mdInForm .has-error .ant-form-explain { + position: absolute; + margin-top: -2px; + margin-left: -7px; +} /*新建课堂*/ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 419f26315..519850271 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -6,6 +6,8 @@ import {Link} from 'react-router-dom'; import axios from 'axios'; import Modals from '../../../modals/Modals'; import Associationmodel from '../../coursesPublic/Associationmodel'; +import AccessoryModal from "../../coursesPublic/AccessoryModal"; + class GraduateTaskItem extends Component{ constructor(props){ @@ -111,12 +113,26 @@ class GraduateTaskItem extends Component{ } + addAccessory=()=>{ + this.setState({ + visibles:true + }) + } + Cancel=()=>{ this.setState({ visible:false }) } - + Cancelvisible=()=>{ + this.setState({ + visibles:false + }) + } + + setupdate=()=>{ + this.props.funlist + } render(){ let { Modalstype, @@ -161,6 +177,15 @@ class GraduateTaskItem extends Component{ taskid={taskid} funlist={this.props.funlist} />:""} + {this.state.visibles===true?:""}