From 76169039c172e71d74c3817c70f4db3939b929c9 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, 27 Mar 2020 16:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=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                 |  2 +-
 .../exercise/ExerciseReviewAndAnswer.js       | 27 +++++++++++++++++--
 .../exercise/Exercisestatisticalresult.js     |  3 ++-
 .../courses/exercise/Exercisetablesmubu.js    |  3 ++-
 .../courses/exercise/new/JudgeDisplay.js      |  2 +-
 .../courses/exercise/new/MainDisplay.js       |  2 +-
 .../courses/exercise/new/NullDisplay.js       |  2 +-
 .../exercise/new/QestionDisplayHeader.js      |  3 ++-
 .../courses/exercise/new/ShixunDisplay.js     |  2 +-
 .../courses/exercise/new/ShixunProgramming.js | 10 +++----
 .../courses/exercise/new/SingleDisplay.js     |  5 ++--
 11 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index c630abf7e..df3ad315b 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,7 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-//debugType="student";
+debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 483769f62..7cc4781d2 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -617,6 +617,23 @@ class ExerciseReviewAndAnswer extends Component{
     }
 
   }
+
+  ProgrammingDetails=(item)=>{
+    if(item.hack_identifier){
+      let url= `/problems/${item.hack_identifier}/start.json`;
+      var newOpenWindow=window.open('about:blank');  // 在ajax外部先打开空白新窗口
+
+      axios.get(url).then((result)=>{
+        if(result.data.status===0){
+          newOpenWindow.location=`/myproblems/${result.data.identifier}`;
+        }
+      }).catch((error)=>{
+        console.log(error);
+      })
+    }
+
+  }
+
   render(){
     let coursesId=this.props.match.params.coursesId;
     let eId=this.props.match.params.Id;
@@ -692,7 +709,8 @@ class ExerciseReviewAndAnswer extends Component{
             width:100%!important
           }
           .ql-editor{
-          padding:0px !important
+          padding:0px !important;
+          overflow: unset !important;
           }
         `}</style>
 					{url?
@@ -917,7 +935,12 @@ class ExerciseReviewAndAnswer extends Component{
                           {
                             //实训题 ，答题
                             item.question_type == 5 &&
-                            <a href={"/shixuns/"+item.shixun_identifier+"/challenges"} target="_blank" class="font-16 color-blue fl" target={"_blank"}>实训详情</a>
+                            <a href={"/shixuns/"+item.shixun_identifier+"/challenges"} target="_blank" class="font-16 color-blue fl">实训详情</a>
+                          }
+                          {
+                            //实训题 ，答题
+                            item.question_type == 6 &&
+                            <a onClick={()=>this.ProgrammingDetails(item)} class="font-16 color-blue fl">进入答题</a>
                           }
                         </span>
                       </p>
diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
index 26f30212c..a9e4dc685 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -288,6 +288,7 @@ class Exercisestatisticalresult extends Component {
 		  }
 		.ql-editor{
 		 padding:0px !important;
+		 overflow: unset !important;
 		}
 			`}
 				</style>
@@ -302,7 +303,7 @@ class Exercisestatisticalresult extends Component {
 											{/*Q{item.ques_position}：*/}
 											{/* <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML1(item.ques_title).replace(/▁/g,"▁▁▁")}}></div> */}
 											{this.state&&this.state.data.is_md===false&&item.ques_type!=6?<QuillForEditor
-												style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px'}}
+												style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px',overflow: 'unset !important'}}
 												readOnly={true}
 												value={item.ques_title?JSON.parse(item.ques_title):""}
 												// showUploadImage={this.handleShowUploadImage}
diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
index 5f078e3d2..55b4c583b 100644
--- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
+++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
@@ -67,7 +67,7 @@ class Exercisetablesmubus extends Component {
 				const _content = <span style={{color:text.type===true? "#29BD8B":'#333333', width: '100%'}}>
 					{text.value>0&&text.value!="有效填写量"&&text.value!="wrong"||!text.value&&text.value!="有效填写量"&&text.value!="wrong"?text.value:text.value!="有效填写量"&&text.value!="wrong" &&
 						this.props&&this.props.data.is_md===false?<QuillForEditor
-						style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px'}}
+						style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px',overflow: 'unset !important'}}
 						readOnly={true}
 						value={this.setdata(text.value)}
 						// showUploadImage={this.handleShowUploadImage}
@@ -141,6 +141,7 @@ class Exercisetablesmubus extends Component {
 					}
 					.ql-editor{
 					 padding:0px !important;
+					 overflow: unset !important;
 					}
 			`}
 				</style>
diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index 5cad3ed05..9a96cfb3d 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -77,7 +77,7 @@ class JudgeDisplay extends Component{
                                 className=""
                             ></MarkdownToHtml>:<QuillForEditor
                             readOnly={true}
-                            style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+                            style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
                             value={this.setdata(item.choice_text)}
                             // showUploadImage={this.handleShowUploadImage}
                           />}
diff --git a/public/react/src/modules/courses/exercise/new/MainDisplay.js b/public/react/src/modules/courses/exercise/new/MainDisplay.js
index 50cb0c61b..cb3344b47 100644
--- a/public/react/src/modules/courses/exercise/new/MainDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/MainDisplay.js
@@ -61,7 +61,7 @@ class MainDisplay extends Component{
                   className=""
               ></MarkdownToHtml>:<QuillForEditor
                 readOnly={true}
-                style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+                style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
                 value={this.setdata(standard_answer[0])}
                 // showUploadImage={this.handleShowUploadImage}
                 />}
diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js
index 25cb2da7c..943be52cb 100644
--- a/public/react/src/modules/courses/exercise/new/NullDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js
@@ -99,7 +99,7 @@ class NullDisplay extends Component{
                                         content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)}
                                       ></MarkdownToHtml>:<QuillForEditor
                                         readOnly={true}
-                                        style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+                                        style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
                                         value={this.setdata(item)}
                                         // showUploadImage={this.handleShowUploadImage}
                                       />
diff --git a/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js b/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
index 7e9b4f81b..12438150b 100644
--- a/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
+++ b/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
@@ -53,6 +53,7 @@ class QestionDisplayHeader extends Component{
             }
              .ql-editor{
                padding:0px !important;
+               overflow: unset !important;
               }
             `}</style>
             <div className="font-16 fl">
@@ -94,7 +95,7 @@ class QestionDisplayHeader extends Component{
         !this.props.exercise||this.props.exercise&&this.props.exercise.is_md||this.props.question_type===6?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
 
          ></MarkdownToHtml>:<QuillForEditor
-          style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
+          style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px',overflow: 'unset !important'}}
           readOnly={true}
           value={this.setdata(question_title)}
           // showUploadImage={this.handleShowUploadImage}
diff --git a/public/react/src/modules/courses/exercise/new/ShixunDisplay.js b/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
index 10e2be02f..9d8100c1a 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
@@ -124,7 +124,7 @@ class ShixunDisplay extends Component{
             >
             </div>:<QuillForEditor
             readOnly={true}
-            style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+            style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
             value={this.setdata(question_title)}
             // showUploadImage={this.handleShowUploadImage}
           />}
diff --git a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
index 17c634b7b..88c4da2ca 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
@@ -49,18 +49,18 @@ class ShixunProgramming extends Component{
             `}</style>
 
         <QestionDisplayHeader {...this.props} question_title={question_title}
-                              topRight={
+
+        ></QestionDisplayHeader>
+        {/*            topRight={
                                 <a target="_blank" href={`/problems/${hack_identifier}/edit`} className="mr30"
                                    style={{color: '#4CACFF'}}
                                 >实训详情</a>
-                              }
-        ></QestionDisplayHeader>
-
+                              }*/}
         {description&&
         !this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={description} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
 
         ></MarkdownToHtml>:<QuillForEditor
-          style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
+          style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px',overflow: 'unset !important'}}
           readOnly={true}
           value={this.setdata(description)}
           // showUploadImage={this.handleShowUploadImage}
diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js
index 3697307cb..fa14149be 100644
--- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js
@@ -72,6 +72,7 @@ class SingleDisplay extends Component{
               }
               .ql-editor{
                padding:0px !important;
+               overflow: unset !important;
               }
             `}</style>
 
@@ -95,7 +96,7 @@ class SingleDisplay extends Component{
 
                             ></MarkdownToHtml>:<QuillForEditor
                             readOnly={true}
-                            style={{ float: 'left', display: 'inline-block',padding:'0px',margin: '2px 0px 0px'}}
+                            style={{ float: 'left', display: 'inline-block',padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
                             value={this.setdata(item.choice_text)}
                             // showUploadImage={this.handleShowUploadImage}
                           />}
@@ -113,7 +114,7 @@ class SingleDisplay extends Component{
 
                             ></MarkdownToHtml>:<QuillForEditor
                           readOnly={true}
-                          style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+                          style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
                           value={this.setdata(item.choice_text)}
                           // showUploadImage={this.handleShowUploadImage}
                         />}