调整

public/react/src/modules/courses/shixunHomework/Homeworddescription.js

@@ -41,7 +41,7 @@ class Homeworddescription extends Component {
         super(props);
         this.state = {
             props: props,
-            description:undefined,
+            description:props.description,
         }
 
 
@@ -74,10 +74,8 @@ class Homeworddescription extends Component {
             <div >
                 <div  style={{
                     "background-color":"#FFFFff",
-                    "margin-top":"20px",
                     "padding":"20px 20px",
                     "position": "relative",
-                    "border-bottom": "1px solid #EDEDED",
                     "margin-bottom":" 0px"}}>
                     <style>
                         {`
@@ -85,7 +83,8 @@ class Homeworddescription extends Component {
                   `}
                     </style>
                     <Form.Item
-                        label="作业说明"
+                        label=""
+                        className="mdInForm"
                     >
                         {/*<TextArea  placeholder="作业说明..." value={this.state.description} onInput={this.settextarea} style={{"height": "120px"}}/>*/}
                             {/*<TextArea style={{"height": "120px"}}*/}
@@ -93,7 +92,7 @@ class Homeworddescription extends Component {
                         <TPMMDEditor ref={this.mdRef} placeholder={'作业说明'}
                                      mdID={'courseMessageMD'} initValue={this.state.description}   className="courseMessageMD" onChange={this.settextarea} style={{"height": "120px"}}></TPMMDEditor>
                     </Form.Item>
-                    <div className="clearfix">
+                    <div className="clearfix mt10">
                             <Button  type="primary" className="defalutSubmitbtn  fr mr20 "style={{"width":"90px"}} onClick={this.onSaveExercise} >保存</Button>
                             <Button className="defalutCancelbtn fr mr20 w20"  style={{"width":"90px"}} onClick={this.clickcancel} >取消</Button>
                     </div>

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -32,7 +32,6 @@ class ShixunWorkModal extends Component{
 					newgroup_list.push(item)
 				})
 				if( response.data.ungroup_list!== undefined ||  response.data.ungroup_list !== null){
-					console.log()
 					newgroup_list.push(response.data.ungroup_list)
 				}
 				this.setState({
@@ -88,7 +87,6 @@ class ShixunWorkModal extends Component{
 			let {page,limit,group_list}=this.state;
 			let newpage=page+1;
 			let newgroup_list=group_list;
-			debugger
 			let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
 
 			axios.get(url,{params:{

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -467,19 +467,31 @@ class Workquestionandanswer extends Component {
                             <div className="font-16 color-green fl pl20 mt10">作业说明:</div>
                             {
                                 this.props.isAdmin()&&this.props.isAdmin()===true ?
+
+                                  (Showupdateinstructions&& Showupdateinstructions === true?"":
                                     <Tooltip placement="top" title="编辑"><i
                                       className="color-green font-18 iconfont icon-bianjidaibeijing fr pr20 " onClick={()=>this.jobdescriptiondisplaybj()} ></i></Tooltip>
-                                    :""
+                                    ):""
                             }
 
                         </div>
 
                         <span>
-                       <div className="font-16 color-dark   break_word flex1 pl20  "  style={{"padding":"10px 10px 10px 20px"}}>
+                       <div className="font-16 color-dark   break_word flex1  " >
+                            {  Showupdateinstructions&& Showupdateinstructions === true?
+                              <div >
+                                  <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} description={jobsettingsdata === undefined ?"":jobsettingsdata === null ?"":jobsettingsdata === "null"?"":  jobsettingsdata.data.explanation=== undefined?"":jobsettingsdata.data.explanation=== null?"":jobsettingsdata.data.explanation} ></Homeworddescription>
+                              </div>
+                              :
+                              <div className="pl20 " style={{"padding":"10px 10px 10px 20px"}}>
                                   {jobsettingsdata === undefined ? "无" : jobsettingsdata === null ? "无" : jobsettingsdata === "null" ? "无" :
                                     jobsettingsdata.data.explanation=== undefined?"无" :jobsettingsdata.data.explanation=== null?"无":
                                       <div dangerouslySetInnerHTML={{__html:markdownToHTML(jobsettingsdata.data.explanation).replace(/▁/g,"▁▁▁")}}></div>
                                   }
+
+                              </div>
+                            }
+
                         </div>
                       </span>
                     </div>
@@ -494,12 +506,12 @@ class Workquestionandanswer extends Component {
                     {/* <div className="edu-back-white mb20  graduateTopic course-message"> */}
                         {/*<GraduateTopicReply memo={{id: graduation_topic_id, user_id: topicInfo && topicInfo.user_id}} course_id={course_id} {...this.props}></GraduateTopicReply>*/}
                     {/* </div> */}
-                    {  Showupdateinstructions&& Showupdateinstructions === true?
+                    {/*{  Showupdateinstructions&& Showupdateinstructions === true?*/}
-                      <div >
+                    {/*  <div >*/}
-                          <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} ></Homeworddescription>
+                    {/*      <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} ></Homeworddescription>*/}
-                      </div>
+                    {/*  </div>*/}
-                      :""
+                    {/*  :""*/}
-                    }
+                    {/*}*/}
                     { homework_id && <CommonReply
                         memo={{
                             id: homework_id,