Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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参考来控制

public/react/src/modules/courses/boards/BoardsNew.js

@@ -316,7 +316,7 @@ class BoardsNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子标题，最大限制60个字符" />
+                    <Input placeholder="请输入帖子标题，最大限制60个字符" className="searchViewAfter"/>
                   )}
                 </Form.Item>
 

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)  

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;
+                }
+                
               `}</style>
 
 
               {  <Form.Item
                 label="内容"
-                className="AboutInputForm"
+                className="AboutInputForm workContent mdInForm"
               > 
                 {getFieldDecorator('description', {
                   rules: [{
@@ -432,14 +445,13 @@ class NewWork extends Component{
                   <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
                     watch={false}  className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
                 )}
-
-                <Upload {...uploadProps} className="upload_1">
-                  <Button className="uploadBtn">
-                    <Icon type="upload" /> 上传附件
-                  </Button>
-                  (单个文件150M以内)
-                </Upload>
               </Form.Item> }
+              <Upload {...uploadProps} className="upload_1 newWorkUpload">
+                <Button className="uploadBtn">
+                  <Icon type="upload" /> 上传附件
+                </Button>
+                (单个文件150M以内)
+              </Upload>
               
 
               { isGroup && 

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'
             }}></textarea>
-
+						{this.state.updatas===true?<span className={"color-red"}>请上传附件</span>:""}
             <div className="clearfix mt30 edu-txt-center mb10">
               <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
               <a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname || '确认'}</a>

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;
+}
 
 
 /*新建课堂*/

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?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.visibles}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={discussMessage.work_id}
+						setupdate={this.setupdate}
+					/>:""}
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {
@@ -325,8 +350,9 @@ class GraduateTaskItem extends Component{
 
                         {item==="补交附件"?
 
-                          <WordsBtn className="colorblue font-16 mr20 fr mt12">
-                            <a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}>补交附件</a>
+                          <WordsBtn className="colorblue font-16 mr20 fr mt12" onClick={this.addAccessory}>
+														补交附件
+                            {/*<a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
                           </WordsBtn>
 
                           :""}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js

@@ -280,7 +280,7 @@ class GraduationTasksappraise extends Component{
 
                     <div className={"color-grey-6 h20 ml20"}>
 
-                      <span className={"color9B9B fr mr10"}>更新</span>
+                      <span className={"color9B9B fr"}>更新</span>
                       <span className={"fr font-13 mr10 ml10"}>{firelistdata&&firelistdata.atta_update_user}</span>
                       <span className={"color9B9B fr"}>
                         {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')}

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -12,6 +12,7 @@ import CoursesListType from '../../coursesPublic/CoursesListType';
 import ModulationModal from "../../coursesPublic/ModulationModal";
 import AllocationModal from "../../coursesPublic/AllocationModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
 
 const CheckboxGroup = Checkbox.Group;
 const Search = Input.Search;
@@ -436,12 +437,25 @@ class GraduationTaskssettinglist extends Component{
 
 
 	handaccessory=()=>{
-	  let {taskslistdata}=this.state;
-		let courseId=this.props.match.params.coursesId;
+	  // let {taskslistdata}=this.state;
+		// let courseId=this.props.match.params.coursesId;
+		//
+		// let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+		//
+		// window.location.href=url;
+		this.setState({
+			avisible:true
+		})
+	}
 
-		let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+	Cancelvisible=()=>{
+		this.setState({
+			avisible:false
+		})
+	}
 
-		window.location.href=url;
+	setupdate=()=>{
+	  this.searchValue()
 	}
 
 	showModulationtype=(id)=>{
@@ -1355,7 +1369,15 @@ class GraduationTaskssettinglist extends Component{
 					  />
 					:""}
 
-					{taskslistdata&&taskslistdata?
+					{this.state.avisible===true?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.avisible}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={taskslistdata.work_id}
+						setupdate={this.setupdate}
+					/>:""}					{taskslistdata&&taskslistdata?
 						// 教师列表
 						this.props.isAdmin()?<div className="newMain clearfix">
 								<div className={"educontent mb20"}>