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/components/monacoSetting/index.js b/public/react/src/modules/developer/components/monacoSetting/index.js
index c66341be0..256d11501 100644
--- a/public/react/src/modules/developer/components/monacoSetting/index.js
+++ b/public/react/src/modules/developer/components/monacoSetting/index.js
@@ -93,7 +93,7 @@ const SettingDrawer = (props) => {
});
return (
- {title}
+ {title}
{ result }
);
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index e3fb2efd9..aa7711033 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -497,7 +497,7 @@ class EditTab extends React.Component {
{/* 添加测试用例 */}
-
测试用例
+ 测试用例
diff --git a/public/react/src/modules/developer/recordDetail/index.js b/public/react/src/modules/developer/recordDetail/index.js
index 6675f066d..80911f10d 100644
--- a/public/react/src/modules/developer/recordDetail/index.js
+++ b/public/react/src/modules/developer/recordDetail/index.js
@@ -112,7 +112,7 @@ function RecordDetail (props) {
{detail.pass_sets_count}
/ {detail.set_count}
- 个通过测试用例
+ 个通过的测试用例
@@ -134,9 +134,9 @@ function RecordDetail (props) {
diff --git a/public/react/src/modules/developer/recordDetail/index.scss b/public/react/src/modules/developer/recordDetail/index.scss
index b308a7cbc..10eabbc04 100644
--- a/public/react/src/modules/developer/recordDetail/index.scss
+++ b/public/react/src/modules/developer/recordDetail/index.scss
@@ -1,5 +1,19 @@
@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/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js
index ce6afc5fd..a733830d5 100644
--- a/public/react/src/modules/question/NewMyShixunModel.js
+++ b/public/react/src/modules/question/NewMyShixunModel.js
@@ -1024,9 +1024,9 @@ class NewMyShixunModel extends Component {
+ single_questions_count
+ subjective_questions_count;
- console.log("弹出框");
- console.log(Datacount)
- console.log(Contentdata)
+ // console.log("弹出框");
+ // console.log(Datacount)
+ // console.log(Contentdata)
return (
diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js
index d2a0b231b..512e6e373 100644
--- a/public/react/src/modules/question/component/ChoquesEditor.js
+++ b/public/react/src/modules/question/component/ChoquesEditor.js
@@ -143,7 +143,7 @@ class ChoquesEditor extends Component{
}
}
if(!answerArray || answerArray.length == 0) {
- this.props.showNotification('请先点击选择本选择题的正确选项');
+ 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 94233133a..f4fba7d5f 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 {
{
- defaultActiveKey===0||defaultActiveKey==="0"?
- isysladmins===true||is_teacher===true?
- this.props.Isitapopup&&this.props.Isitapopup==="true"?
- ""
- :
-
this.xinzenw(e)}>
-
-
- :""
- :""
+ isysladmins===true||is_teacher===true?
+ this.props.Isitapopup&&this.props.Isitapopup==="true"?
+ ""
+ :
+
this.xinzenw(e)}>
+
+
+ :""
}
{item_type==="PROGRAM"?
@@ -400,33 +398,24 @@ class Contentpart extends Component {
{
- defaultActiveKey===0||defaultActiveKey==="0"?
- this.props.Isitapopup&&this.props.Isitapopup==="true"?
-
this.props.setdatafunsval(e)}
- onSearch={ (value)=>this.props.setdatafuns(value)} />
- :
- this.props.setdatafunsval(e)}
- onSearch={ (value)=>this.props.setdatafuns(value)} />
- :
- this.props.setdatafunsval(e)}
- onSearch={ (value)=>this.props.setdatafuns(value)} />
+ this.props.Isitapopup&&this.props.Isitapopup==="true"?
+ this.props.setdatafunsval(e)}
+ onSearch={ (value)=>this.props.setdatafuns(value)} />
+ :
+ this.props.setdatafunsval(e)}
+ onSearch={ (value)=>this.props.setdatafuns(value)} />
}
diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js
index fab9170b8..aaba60dd0 100644
--- a/public/react/src/modules/question/component/SingleEditor.js
+++ b/public/react/src/modules/question/component/SingleEditor.js
@@ -156,7 +156,7 @@ class SingleEditor extends Component{
}
if(!answerArray || answerArray.length == 0) {
- this.props.showNotification('请先点击选择本选择题的正确选项');
+ this.props.showNotification('请设置本题的正确答案,点击选项A/B...即可完成设置');
return editordata;
}