m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

Browse Source
video_transcode
杨树明 5 years ago
parent 91790bfdaa 18f5d5525f
commit 2e691ff55d
9 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/css/Courses.css
Unescape View File

@ -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;

2
public/react/src/modules/developer/components/monacoSetting/index.js
Unescape View File

@ -93,7 +93,7 @@ const SettingDrawer = (props) => {
});
return (
<React.Fragment>
<h2 className={'setting_h2'}>{title}</h2>
<h3 className={'setting_h2'}>{title}</h3>
{ result }
</React.Fragment>
);

2
public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
Unescape View File

@ -497,7 +497,7 @@ class EditTab extends React.Component {
{/* 添加测试用例 */}
<div className={'test_demo_title'} ref={this.headerRef}>
<h2>测试用例</h2>
<h3>测试用例</h3>
<Button type="primary" ghost onClick={handleAddTest}>添加测试用例</Button>
</div>
<div className="test_demo_ctx">

4
public/react/src/modules/developer/recordDetail/index.js
Unescape View File

@ -112,7 +112,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">
@ -134,9 +134,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>

16
public/react/src/modules/developer/recordDetail/index.scss
Unescape View File

@ -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{

6
public/react/src/modules/question/NewMyShixunModel.js
Unescape View File

@ -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 (
<div className="newMain clearfix " ref={this.saveContainer}>

2
public/react/src/modules/question/component/ChoquesEditor.js
Unescape View File

@ -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) {

67
public/react/src/modules/question/component/Contentpart.js
Unescape View File

@ -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>

2
public/react/src/modules/question/component/SingleEditor.js
Unescape View File

@ -156,7 +156,7 @@ class SingleEditor extends Component{
}
if(!answerArray || answerArray.length == 0) {
this.props.showNotification('请先点击选择本选择题的正确选项');
this.props.showNotification('请设置本题的正确答案，点击选项A/B...即可完成设置');
return editordata;
}

Write Preview
Loading…
Cancel
Save