From 3ee209d3a113cb40ad5584bb45b1fe89f2f1092f Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Sat, 7 Mar 2020 22:20:07 +0800
Subject: [PATCH] issue

---
 .../react/src/modules/courses/css/Courses.css |  2 +-
 .../modules/developer/recordDetail/index.js   |  4 +-
 .../modules/developer/recordDetail/index.less | 18 ++++-
 .../question/component/ChoquesEditor.js       |  4 +-
 .../modules/question/component/Contentpart.js | 67 ++++++++-----------
 .../question/component/SingleEditor.js        |  4 +-
 6 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 50c2c3849..a525cbb6f 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -435,7 +435,7 @@ a.white-btn.use_scope-btn:hover{
 .maxwidth190{max-width: 190px; color:#666666;font-size: 14px;}
 .color05101A{color:#05101A;}
 .liactive{border-left: 1px solid #4CACFF;}
-
+.ant-btn-lg{height: 39px;}
 .bannername{
     max-width: 907px;
     overflow: hidden;
diff --git a/public/react/src/modules/developer/recordDetail/index.js b/public/react/src/modules/developer/recordDetail/index.js
index d6afa0590..92bcacb7f 100644
--- a/public/react/src/modules/developer/recordDetail/index.js
+++ b/public/react/src/modules/developer/recordDetail/index.js
@@ -110,7 +110,7 @@ function RecordDetail(props) {
           <span className="status_label pass_case" style={{ display: [-1, 0, 2, 5].includes(detail.status) ? 'inline-block' : 'none' }}>
             <span className="status_label_sub">{detail.pass_sets_count}</span>
             <span className="pass_case_span"> / {detail.set_count}</span>
-            个通过测试用例
+            个通过的测试用例
           </span>
         </div>
         <div className="result_error_area">
@@ -132,9 +132,9 @@ function RecordDetail(props) {
           <MonacoEditor
             height="100%"
             width="100%"
+            className="code_area_Style"
             language={(detail.language && detail.language.toLowerCase()) || ''}
             value={detail.code || ''}
-            theme="dark"
             readOnly={true}
           />
         </div>
diff --git a/public/react/src/modules/developer/recordDetail/index.less b/public/react/src/modules/developer/recordDetail/index.less
index 4fc5b529e..10eabbc04 100644
--- a/public/react/src/modules/developer/recordDetail/index.less
+++ b/public/react/src/modules/developer/recordDetail/index.less
@@ -1,5 +1,19 @@
-@import '../split_pane_resizer.less';
-
+@import '../split_pane_resizer.scss';
+.result_code_area .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input{
+  background-color: #f9f9f9!important;
+}
+.result_code_area .monaco-editor .line-numbers{
+  color: #999!important;
+}
+.result_code_area .monaco-editor .current-line ~ .line-numbers {
+  color: #0b216f!important;
+}
+.result_code_area .minimap-decorations-layer{
+  background: rgba(225,225,225,0.2)!important;
+}
+.result_code_area .monaco-editor .margin{
+  background-color: #eee!important;
+}
 .record_detail_area{
   background: #fff;
   .record_detail_ctx{
diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js
index 32a68ae44..9287ed73e 100644
--- a/public/react/src/modules/question/component/ChoquesEditor.js
+++ b/public/react/src/modules/question/component/ChoquesEditor.js
@@ -132,8 +132,8 @@ class ChoquesEditor extends Component {
 				return editordata;
 			}
 		}
-		if (!answerArray || answerArray.length == 0) {
-			this.props.showNotification('请先点击选择本选择题的正确选项');
+		if(!answerArray || answerArray.length == 0) {
+			this.props.showNotification('请设置本题的正确答案，点击选项A/B...即可完成设置');
 			return editordata;
 		}
 		if (!answerArray || answerArray.length < 2) {
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 0577e851c..69a58bc97 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -369,18 +369,16 @@ class Contentpart extends Component {
 							</style>
 						 <div className="xaxisreverseorder">
 							 {
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									 isysladmins===true||is_teacher===true?
-											 this.props.Isitapopup&&this.props.Isitapopup==="true"?
-												 ""
-												 :
-												 <a onClick={(e)=>this.xinzenw(e)}>
-													 <div className="newbutoon">
-														 <p className="newbutoontes" >新增</p>
-													 </div>
-												 </a>
-											 :""
-									 :""
+								isysladmins===true||is_teacher===true?
+									this.props.Isitapopup&&this.props.Isitapopup==="true"?
+									""
+									:
+									<a onClick={(e)=>this.xinzenw(e)}>
+										<div className="newbutoon">
+											<p className="newbutoontes" >新增</p>
+										</div>
+									</a>
+								:""
 							 }
 
 							 {item_type==="PROGRAM"?
@@ -400,33 +398,24 @@ class Contentpart extends Component {
 
 
 							 {
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									 this.props.Isitapopup&&this.props.Isitapopup==="true"?
-										 <Search
-											 style={isysladmins===true||is_teacher===true?{ marginRight:"0px"}:{marginRight:"0px"}}
-											 className={"xaxisreverseorder searchwidth"}
-											 placeholder="请输入题目名称、内容"
-											 enterButton
-											 size="large"
-											 onInput={(e)=>this.props.setdatafunsval(e)}
-											 onSearch={ (value)=>this.props.setdatafuns(value)} />
-										 :
-									 <Search
-										 style={isysladmins===true||is_teacher===true?{ marginRight:"30px"}:{marginRight:"0px"}}
-										 className={"xaxisreverseorder searchwidth"}
-										 placeholder="请输入题目名称、内容"
-										 enterButton
-										 size="large"
-										 onInput={(e)=>this.props.setdatafunsval(e)}
-										 onSearch={ (value)=>this.props.setdatafuns(value)} />
-									 :
-									 <Search
-										 className={"xaxisreverseorder searchwidth"}
-										 placeholder="请输入题目名称、内容"
-										 enterButton
-										 size="large"
-										 onInput={(e)=>this.props.setdatafunsval(e)}
-										 onSearch={ (value)=>this.props.setdatafuns(value)} />
+								this.props.Isitapopup&&this.props.Isitapopup==="true"?
+									<Search
+										style={isysladmins===true||is_teacher===true?{ marginRight:"0px"}:{marginRight:"0px"}}
+										className={"xaxisreverseorder searchwidth"}
+										placeholder="请输入题目名称、内容"
+										enterButton
+										size="large"
+										onInput={(e)=>this.props.setdatafunsval(e)}
+										onSearch={ (value)=>this.props.setdatafuns(value)} />
+									:
+								<Search
+									style={isysladmins===true||is_teacher===true?{ marginRight:"30px"}:{marginRight:"0px"}}
+									className={"xaxisreverseorder searchwidth"}
+									placeholder="请输入题目名称、内容"
+									enterButton
+									size="large"
+									onInput={(e)=>this.props.setdatafunsval(e)}
+									onSearch={ (value)=>this.props.setdatafuns(value)} />
 							 }
 
 						 </div>
diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js
index 5feb26f3c..51fd2d095 100644
--- a/public/react/src/modules/question/component/SingleEditor.js
+++ b/public/react/src/modules/question/component/SingleEditor.js
@@ -143,8 +143,8 @@ class SingleEditor extends Component {
 			}
 		}
 
-		if (!answerArray || answerArray.length == 0) {
-			this.props.showNotification('请先点击选择本选择题的正确选项');
+		if(!answerArray || answerArray.length == 0) {
+			this.props.showNotification('请设置本题的正确答案，点击选项A/B...即可完成设置');
 			return editordata;
 		}