From 89c57f155ee81b2543b2ffb7017ee472e2d350f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 09:53:09 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/tasks/GraduationTasksedit.js  | 12 ++++++------
 .../courses/graduation/tasks/GraduationTasksnew.js   |  8 ++++----
 public/stylesheets/educoder/edu-all.css              |  4 ++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 559144ecf..425441acf 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -18,7 +18,7 @@ class GraduationTasksedit extends Component{
     this.state={
       coursename:"",
       coursesearch:"",
-      title_num:60,
+      title_num:0,
       title_value:"",
       fileList: [],
       contents: [{val:"",id:1}],
@@ -53,14 +53,14 @@ class GraduationTasksedit extends Component{
 				//
         // }
 			let namelength=result.data.task_name.length;
-      let sixlength=title_num-namelength
+      // let sixlength=title_num-namelength
       this.setState({
           // fileList:newfilelist,
           description:result.data.description,
           tasktype:result.data.task_type,
           name:result.data.task_name,
           data:result.data,
-				  title_num:sixlength,
+				  title_num:namelength,
 			  	attachments:result.data.attachments,
       })
 
@@ -94,9 +94,9 @@ class GraduationTasksedit extends Component{
 
   // 输入title
   changeTitle=(e)=>{
-
+		//   title_num:60-parseInt(e.target.value.length),
     this.setState({
-      title_num:60-parseInt(e.target.value.length),
+      title_num:e.target.value.length,
       title_value:e.target.value
     })
 
@@ -379,7 +379,7 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)+"/60"}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 1d3c7578f..5c1acfb22 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -19,7 +19,7 @@ class GraduationTasksnew extends Component {
 		this.state = {
 			coursename: "",
 			coursesearch: "",
-			title_num: 60,
+			title_num: 0,
 			title_value: "",
 			fileList: [],
 			contents: [{val: "", id: 1}],
@@ -119,9 +119,9 @@ class GraduationTasksnew extends Component {
 
 	// 输入title
 	changeTitle = (e) => {
-
+		// title_num: 60 - parseInt(e.target.value.length),
 		this.setState({
-			title_num: 60 - parseInt(e.target.value.length),
+			title_num: e.target.value.length,
 			title_value: e.target.value
 		})
 
@@ -384,7 +384,7 @@ class GraduationTasksnew extends Component {
 											rules: [{required: true, message: "不能为空"}],
 										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
 															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
-															addonAfter={String(title_num)}/>)}
+															addonAfter={String(title_num)+"/60"}/>)}
 									</Form.Item>
 									<input type="hidden" id='nametypes'  />
 								</div>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 4f6dadcf9..4b0412180 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3743,4 +3743,8 @@ a.singlepublishtwo{
 
 .square-main p{
     margin-bottom: 0em;
+}
+
+.has-error .ant-input:focus{
+    border-color: #ff4d4f !important;
 }
\ No newline at end of file

From 05ed4802f2c3463c9cac104302a81404158ae91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 11:20:15 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E8=AE=BE?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BC=96=E8=BE=91=E5=B9=B6=E5=B0=81=E8=A3=85?=
 =?UTF-8?q?textarea=E5=AD=97=E6=95=B0=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/educoder.js           |  2 +
 .../courses/coursesPublic/AccessoryModal.js   | 24 ++++++-----
 .../graduation/tasks/GraduationTasksedit.js   |  2 +-
 .../graduation/tasks/GraduationTasksnew.js    |  2 +-
 .../src/modules/modals/WordNumberTextarea.css | 42 +++++++++++++++++++
 .../src/modules/modals/WordNumberTextarea.js  | 22 ++++++++++
 6 files changed, 81 insertions(+), 13 deletions(-)
 create mode 100644 public/react/src/modules/modals/WordNumberTextarea.css
 create mode 100644 public/react/src/modules/modals/WordNumberTextarea.js

diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 6f3284db2..8eb34ef55 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -70,3 +70,5 @@ export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/
 export { default as ModalWrapper } from '../modules/courses/common/ModalWrapper'
 export { default as NoneData } from '../modules/courses/coursesPublic/NoneData'
 
+export {default as WordNumberTextarea} from '../modules/modals/WordNumberTextarea'
+
diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 5541a01a6..0ea699ce9 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -1,9 +1,11 @@
 import React,{ Component } from "react";
-import { Modal,Checkbox,Upload,Button,Icon,message,notification} from "antd";
-import { WordsBtn,getUrl, getUploadActionUrl} from 'educoder';
+import { Modal,Checkbox,Upload,Button,Icon,message,notification,Input} from "antd";
+import { WordsBtn,getUrl, getUploadActionUrl,WordNumberTextarea} from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
+
 const CheckboxGroup = Checkbox.Group;
+const { TextArea } = Input;
 
 class AccessoryModal extends Component{
   constructor(props){
@@ -258,7 +260,6 @@ class AccessoryModal extends Component{
       },
     };
 
-
     return(
       <React.Fragment>
 
@@ -335,23 +336,24 @@ class AccessoryModal extends Component{
               </Upload>
             </p>
 
-            <textarea  placeholder="请在此输入补交附件的原因，最大限制100个字符" className={"mt20"} value={settextarea} onInput={this.settextarea} style={{
-              width: '100%',
-              height:'150px',
-              border:'1px solid rgba(234,234,234,1)',
-              padding: '10px'
-            }}></textarea>
+						<WordNumberTextarea
+							thisInput={(e)=>this.settextarea(e)}
+							thisValue={this.state.description}
+							startFontLength={description===undefined?0:description.length}
+							maxFontLength={100}
+						/>
+
             {
               this.state.Errormessage && this.state.Errormessage === true ?
                 <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
                   <span className="fl" style={{textAlign:"left",width: " 100%"}}>还未上传附件</span>
                 </p>
-                : <div style={{height:"25px"}}></div>
+                : ""
 
             }
 						{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 color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
               <a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname || '确认'}</a>
             </div>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 425441acf..4036a0a99 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -379,7 +379,7 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)+"/60"}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" suffix={String(title_num)+"/60"}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 5c1acfb22..6247f54c2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -384,7 +384,7 @@ class GraduationTasksnew extends Component {
 											rules: [{required: true, message: "不能为空"}],
 										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
 															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
-															addonAfter={String(title_num)+"/60"}/>)}
+															suffix={String(title_num)+"/60"}/>)}
 									</Form.Item>
 									<input type="hidden" id='nametypes'  />
 								</div>
diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css
new file mode 100644
index 000000000..59ed95038
--- /dev/null
+++ b/public/react/src/modules/modals/WordNumberTextarea.css
@@ -0,0 +1,42 @@
+.WordNumberTextarea {
+    outline: none; /* 去掉输入字符时的默认样式 */
+    appearance:none;
+    -webkit-appearance:none;
+    -moz-appearance:none;
+    background-color: white;
+    text-shadow: none;
+    -webkit-writing-mode: horizontal-tb !important;
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+    resize:none; /*禁止拉伸*/
+    border: none; /*去掉默认边框*/
+    width: 100%;
+    height:150px;
+    border:none;
+    padding: 10px;
+    display: block;
+}
+
+.WordNumbernote {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    text-decoration: none;
+    box-sizing: border-box;
+    overflow: hidden;
+    height: auto;
+    border: 1px solid rgba(234,234,234,1);
+    border-radius: 0.125rem;
+    margin: 0.31rem;
+    padding: 0.19rem;
+    backgroud:rgba(234,234,234,1);
+    padding-bottom: 10px;
+    padding-right: 10px;
+
+}
+.WordNumberTextarea-count {
+    display: inline-block;
+    float: right;
+    font-size: 0.28rem;
+    color: #adadad;
+    padding-right: 0.25rem;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/modals/WordNumberTextarea.js b/public/react/src/modules/modals/WordNumberTextarea.js
new file mode 100644
index 000000000..7f5a0288b
--- /dev/null
+++ b/public/react/src/modules/modals/WordNumberTextarea.js
@@ -0,0 +1,22 @@
+import React, { Component } from 'react';
+import './WordNumberTextarea.css';
+class WordNumberTextarea extends Component {
+  constructor(props) {
+    super(props);
+  }
+render() {
+    return(
+			<div className="WordNumbernote">
+					<textarea placeholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
+										className="WordNumberTextarea"
+										value={this.props.thisValue}
+										onInput={(e)=>this.props.thisInput(e)}
+										maxlength={this.props.maxFontLength}
+					/>
+					<div className="WordNumberTextarea-count"><span>{this.props.startFontLength}</span>/{this.props.maxFontLength}</div>
+			</div>
+    )
+  }
+}
+
+export default WordNumberTextarea;
\ No newline at end of file

From c3435db3b57a3ce1d3e11668c5e9e7c37f2f0785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 11:23:24 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E8=AE=BE?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BC=96=E8=BE=91=E5=B9=B6=E5=B0=81=E8=A3=85?=
 =?UTF-8?q?textarea=E5=AD=97=E6=95=B0=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/coursesPublic/AccessoryModal.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 0ea699ce9..f7c82fd23 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -21,6 +21,7 @@ class AccessoryModal extends Component{
 			updatas:false,
       shixunsreplace:false,
       Errormessage:false,
+			description:undefined
     }
   }
 
@@ -240,6 +241,7 @@ class AccessoryModal extends Component{
        ModalSave,
        loadtype,
        shixunsreplace,
+			 description
      }=this.state;
      let {course_groups}=this.props;
     const uploadProps = {
@@ -338,7 +340,7 @@ class AccessoryModal extends Component{
 
 						<WordNumberTextarea
 							thisInput={(e)=>this.settextarea(e)}
-							thisValue={this.state.description}
+							thisValue={description}
 							startFontLength={description===undefined?0:description.length}
 							maxFontLength={100}
 						/>

From 3eedd22ed0b71ebfeaa0ecfa5ec1b8c08c6573a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 11:40:43 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/shared/main.css                 |  6 ++---
 public/react/src/index.css                    |  6 ++---
 .../courses/coursesPublic/AccessoryModal.js   |  1 +
 .../courses/coursesPublic/ModulationModal.js  | 23 +++++++++++++------
 .../src/modules/modals/WordNumberTextarea.css |  2 +-
 .../src/modules/modals/WordNumberTextarea.js  |  2 +-
 public/stylesheets/educoder/edu-main.css      |  6 ++---
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/templates/shared/main.css b/app/templates/shared/main.css
index 81b80cdf8..dfe6613bf 100644
--- a/app/templates/shared/main.css
+++ b/app/templates/shared/main.css
@@ -760,9 +760,9 @@ html>body #ajax-indicator { position: fixed; }
 
 .paddingLeft28{padding-left:28px;}
 
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 
 .color656565{
     color:#656565;
diff --git a/public/react/src/index.css b/public/react/src/index.css
index ee89ffc11..efd553bf3 100644
--- a/public/react/src/index.css
+++ b/public/react/src/index.css
@@ -25,9 +25,9 @@ body {
 .ant-message{
   z-index: 20000;
 }
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 .ant-upload-list-item-info .anticon-loading, .ant-upload-list-item-info .anticon-paper-clip{
   color: #29bd8b !important;
 }
diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index f7c82fd23..d4124a606 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -339,6 +339,7 @@ class AccessoryModal extends Component{
             </p>
 
 						<WordNumberTextarea
+							thisPlaceholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
 							thisInput={(e)=>this.settextarea(e)}
 							thisValue={description}
 							startFontLength={description===undefined?0:description.length}
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index 46dc3becf..37cf1cc5c 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd";
-
+import { WordNumberTextarea } from 'educoder';
 
 class ModulationModal extends Component{
   constructor(props){
@@ -78,12 +78,21 @@ class ModulationModal extends Component{
 
 
             <div className="clearfix">
-              <textarea
-              className="winput-100-150"
-              placeholder="请填写您对作品调分的原因"
-              value={textareaval}
-              onInput={this.settextarea}
-              ></textarea>
+              {/*<textarea*/}
+              {/*className="winput-100-150"*/}
+              {/*placeholder="请填写您对作品调分的原因"*/}
+              {/*value={textareaval}*/}
+              {/*onInput={this.settextarea}*/}
+              {/*></textarea>*/}
+
+							<WordNumberTextarea
+								thisPlaceholder={"请填写您对作品调分的原因"}
+								thisInput={(e)=>this.settextarea(e)}
+								thisValue={textareaval}
+								startFontLength={textareaval===undefined?0:textareaval.length}
+								maxFontLength={100}
+							/>
+
               <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
             </div>
             <li>
diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css
index 59ed95038..9bd8c820c 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.css
+++ b/public/react/src/modules/modals/WordNumberTextarea.css
@@ -39,4 +39,4 @@
     font-size: 0.28rem;
     color: #adadad;
     padding-right: 0.25rem;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/modals/WordNumberTextarea.js b/public/react/src/modules/modals/WordNumberTextarea.js
index 7f5a0288b..812ed3fd3 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.js
+++ b/public/react/src/modules/modals/WordNumberTextarea.js
@@ -7,7 +7,7 @@ class WordNumberTextarea extends Component {
 render() {
     return(
 			<div className="WordNumbernote">
-					<textarea placeholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
+					<textarea placeholder={this.props.thisPlaceholder}
 										className="WordNumberTextarea"
 										value={this.props.thisValue}
 										onInput={(e)=>this.props.thisInput(e)}
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 4aa426192..f59827f45 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -761,9 +761,9 @@ html>body #ajax-indicator { position: fixed; }
 
 .paddingLeft28{padding-left:28px;}
 
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 
 .color656565{
     color:#656565;

From 6d9de555c90a5b72fe8fe2bde4c80e7f8dfa61e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 11:46:58 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/coursesPublic/AccessoryModal.js   | 7 +++----
 .../src/modules/courses/coursesPublic/ModulationModal.js  | 7 +++----
 public/react/src/modules/modals/WordNumberTextarea.js     | 8 ++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index d4124a606..174ef8180 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -339,10 +339,9 @@ class AccessoryModal extends Component{
             </p>
 
 						<WordNumberTextarea
-							thisPlaceholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
-							thisInput={(e)=>this.settextarea(e)}
-							thisValue={description}
-							startFontLength={description===undefined?0:description.length}
+							PlaceholderValue={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
+							InputValue={(e)=>this.settextarea(e)}
+							Value={description}
 							maxFontLength={100}
 						/>
 
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index 37cf1cc5c..bd96dee38 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -86,10 +86,9 @@ class ModulationModal extends Component{
               {/*></textarea>*/}
 
 							<WordNumberTextarea
-								thisPlaceholder={"请填写您对作品调分的原因"}
-								thisInput={(e)=>this.settextarea(e)}
-								thisValue={textareaval}
-								startFontLength={textareaval===undefined?0:textareaval.length}
+								PlaceholderValue={"请填写您对作品调分的原因"}
+								InputValue={(e)=>this.settextarea(e)}
+								Value={textareaval}
 								maxFontLength={100}
 							/>
 
diff --git a/public/react/src/modules/modals/WordNumberTextarea.js b/public/react/src/modules/modals/WordNumberTextarea.js
index 812ed3fd3..23d500cc0 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.js
+++ b/public/react/src/modules/modals/WordNumberTextarea.js
@@ -7,13 +7,13 @@ class WordNumberTextarea extends Component {
 render() {
     return(
 			<div className="WordNumbernote">
-					<textarea placeholder={this.props.thisPlaceholder}
+					<textarea placeholder={this.props.PlaceholderValue}
 										className="WordNumberTextarea"
-										value={this.props.thisValue}
-										onInput={(e)=>this.props.thisInput(e)}
+										value={this.props.Value}
+										onInput={(e)=>this.props.InputValue(e)}
 										maxlength={this.props.maxFontLength}
 					/>
-					<div className="WordNumberTextarea-count"><span>{this.props.startFontLength}</span>/{this.props.maxFontLength}</div>
+					<div className="WordNumberTextarea-count"><span>{this.props.Value===undefined?0:this.props.Value.length}</span>/{this.props.maxFontLength}</div>
 			</div>
     )
   }

From dc9b7803213148debf199d1ee1d024380d7e7c65 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 23 Aug 2019 13:53:14 +0800
Subject: [PATCH 6/8] prop

---
 .../modules/courses/coursesPublic/AccessoryModal.js |  8 ++++----
 .../courses/coursesPublic/ModulationModal.js        |  8 ++++----
 .../react/src/modules/modals/WordNumberTextarea.js  | 13 +++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 174ef8180..71d92cd0c 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -339,10 +339,10 @@ class AccessoryModal extends Component{
             </p>
 
 						<WordNumberTextarea
-							PlaceholderValue={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
-							InputValue={(e)=>this.settextarea(e)}
-							Value={description}
-							maxFontLength={100}
+							placeholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength || 100}个字符`}
+							onInput={(e)=>this.settextarea(e)}
+							value={description}
+							maxlength={100}
 						/>
 
             {
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index bd96dee38..974077793 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -86,10 +86,10 @@ class ModulationModal extends Component{
               {/*></textarea>*/}
 
 							<WordNumberTextarea
-								PlaceholderValue={"请填写您对作品调分的原因"}
-								InputValue={(e)=>this.settextarea(e)}
-								Value={textareaval}
-								maxFontLength={100}
+								placeholder={"请填写您对作品调分的原因"}
+								onInput={(e)=>this.settextarea(e)}
+								value={textareaval}
+								maxlength={100}
 							/>
 
               <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
diff --git a/public/react/src/modules/modals/WordNumberTextarea.js b/public/react/src/modules/modals/WordNumberTextarea.js
index 23d500cc0..52711de2c 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.js
+++ b/public/react/src/modules/modals/WordNumberTextarea.js
@@ -7,13 +7,14 @@ class WordNumberTextarea extends Component {
 render() {
     return(
 			<div className="WordNumbernote">
-					<textarea placeholder={this.props.PlaceholderValue}
-										className="WordNumberTextarea"
-										value={this.props.Value}
-										onInput={(e)=>this.props.InputValue(e)}
-										maxlength={this.props.maxFontLength}
+					<textarea 
+						placeholder={this.props.placeholder}
+						className="WordNumberTextarea"
+						value={this.props.value}
+						onInput={(e)=>this.props.onInput(e)}
+						maxlength={this.props.maxlength}
 					/>
-					<div className="WordNumberTextarea-count"><span>{this.props.Value===undefined?0:this.props.Value.length}</span>/{this.props.maxFontLength}</div>
+					<div className="WordNumberTextarea-count"><span>{this.props.value===undefined?0:this.props.value.length}</span>/{this.props.maxlength}</div>
 			</div>
     )
   }

From f02fda3c599ca8641f423f774198dcdaf6216fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 14:59:12 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=92=8C=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTasksSubmitedit.js        | 22 +++++++------------
 .../tasks/GraduationTasksSubmitnew.js         |  6 ++---
 .../tasks/GraduationTasksappraise.js          |  4 +++-
 .../graduation/tasks/GraduationTasksedit.js   |  2 +-
 .../graduation/tasks/GraduationTasksnew.js    |  3 ++-
 .../tasks/GraduationTaskssetting.js           |  5 ++++-
 .../tasks/GraduationTaskssettinglist.js       |  5 +++--
 .../tasks/GraduationTaskssettingquestions.js  |  3 ++-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index fcbe6b9aa..ce704ef6e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -77,16 +77,6 @@ class GraduationTasksSubmitedit extends Component{
 
   }
 
-  setedit=()=>{
-    // let coursesId=this.props.match.params.coursesId;
-    // let workId=this.props.match.params.work_Id;
-    // let {workslist}=this.state
-    // let task_id=workslist&&workslist.task_id;
-    // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
-		this.goback()
-  }
-
-
 
   handleSelectChange = (value) => {
     console.log(value);
@@ -103,7 +93,8 @@ class GraduationTasksSubmitedit extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
+
   }
 
 
@@ -378,6 +369,9 @@ class GraduationTasksSubmitedit extends Component{
   }
   Commoninterface =(fileList,selectmemberslist,workslist)=>{
 
+		let coursesIds=this.props.match.params.coursesId
+		let workId=this.props.match.params.work_Id;
+
     let  userids=[];
 
     for(var list of selectmemberslist){
@@ -424,7 +418,7 @@ class GraduationTasksSubmitedit extends Component{
           this.setState({
             spinnings:true
           })
-          let workId=this.props.match.params.work_Id;
+
 
 					// if(fileList.length===0){
 					// 	this.setState({
@@ -444,8 +438,8 @@ class GraduationTasksSubmitedit extends Component{
               spinnings:false
             })
             if(response!== undefined){
-              this.setedit()
-
+              // this.goback()
+							window.location.href=`/courses/${coursesIds}/graduation_tasks/${workId}/appraise`
             }
             // if(response.status===200) {
             //   GraduationTasksnewtype=false;
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index dadc621b2..3c8318796 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -105,7 +105,7 @@ class GraduationTasksSubmitnew extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
 	}
 
 
@@ -361,9 +361,7 @@ class GraduationTasksSubmitnew extends Component{
       return false;
     }
   }
-  gocannel=()=>{
-		this.props.history.goBack()
-  }
+
 
   //公用数据
   Commoninterface = (fileList,selectmemberslist,workslist)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index d01be4676..c03ffc1e0 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -76,7 +76,9 @@ class GraduationTasksappraise extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+
+		this.props.history.replace(`/courses/${this.state.datalist.course_id}/graduation_tasks/${this.state.datalist.graduation_id}/${this.state.datalist.task_id}/list`);
+
   }
 
   Cancelvisible=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 4036a0a99..42a128719 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -88,7 +88,7 @@ class GraduationTasksedit extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.state.data.course_id}/graduation_tasks/${this.state.data.graduation_id}`);
   }
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 6247f54c2..7c499430a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -113,7 +113,8 @@ class GraduationTasksnew extends Component {
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/graduation_tasks/${this.props.match.params.category_id}`);
 	}
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index e679702da..7e5707695 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -771,7 +771,10 @@ class GraduationTaskssettingapp extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		// this.props.history.replace(this.props.current_user.first_category_url);
+		this.props.history.replace(`/courses/${this.state.settingdata.course_id}/graduation_tasks/${this.state.settingdata.graduation_id}`);
+
   }
 
   isgoback=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 816d53526..9718de28a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -64,9 +64,10 @@ class GraduationTaskssettinglist extends Component{
 		// if(courseId===undefined){
 		// 	this.props.history.push("/courses");
 		// }else{
-		// 	this.props.history.push(this.props.current_user.first_category_url);
+	  // this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`);
 	}
 
 	seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index 22ce6fa04..b8296f9ef 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -62,7 +62,8 @@ class GraduationTasksquestions extends Component{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
   }
 
   end=()=>{

From ec83febe8dcc5f4c3fa0b9fb446dea29241ee7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 17:04:54 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  6 ++---
 .../shixunHomework/ShixunHomeworkPage.js      | 23 ++++++++-----------
 .../shixunHomework/ShixunWorkDetails.js       |  4 +++-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index dd670df9c..39df1d87e 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -41,9 +41,9 @@ export function initAxiosInterceptors(props) {
     var proxy = "http://localhost:3000"
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
-        //proxy = "https://pre-newweb.educoder.net"
-        proxy="http://47.96.87.25:48080"
-        
+
+        //proxy="http://47.96.87.25:48080"
+	      proxy = "https://pre-newweb.educoder.net"
         // wy
         // proxy="http://192.168.2.63:3001"
 
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 575785288..9b78729a9 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -113,14 +113,10 @@ class ShixunHomeworkPage extends Component {
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
   gotohome=()=>{
-		console.log(this.props)
-		// let courseId=this.props.match.params.coursesId;
-		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
-		// }else{
-		// 	this.props.history.push(this.props.current_user.first_category_url);
-		// }
-	// this.props.history.goBack()
+		// console.log(this.props)
+		let {jobsettingsdatapage}=this.state
+
+		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
 	}
 	render() {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
@@ -128,7 +124,8 @@ class ShixunHomeworkPage extends Component {
 		const isAdmin = this.props.isAdmin();
 		// console.log(119)
 	   console.log(jobsettingsdatapage);
-		console.log(this.props);
+
+
 		return (
 			<div className="newMain clearfix ">
 
@@ -137,11 +134,11 @@ class ShixunHomeworkPage extends Component {
 
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">
-							<Link className="btn colorgrey fl hovercolorblue " to={"/"}></Link>
+							<Link className="btn colorgrey fl hovercolorblue " to={this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</Link>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<a
 								className=" btn colorgrey fl hovercolorblue "
-								href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
+								href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn className="fl">作业详情</WordsBtn>
 						</p>
@@ -241,14 +238,14 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
+																												 to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
 									查看实训报告
 								</Link> : ""}
 								{
 									teacherdatapage === undefined ? ""
 										: teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
 										<a className="fr color-blue font-16"
-											 href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
+											 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 								}
 								{teacherdatapage === undefined ? "" : <Startshixuntask
 									{...this.props}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
index d37aea5a7..967a6ca61 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
@@ -58,7 +58,9 @@ class ShixunWorkDetails extends Component {
 		// }else{
 		// 	window.history.go(-1)
 		// }
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		// "/courses/1545/shixun_homeworks/15220/list?tab=2"
+		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/list?tab=2`);
 	}
 	render() {
     let{data}=this.state;