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

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_cs
杨树林 5 years ago
parent ff224463c8 5c13c1d3e6
commit 97741eee00
15 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
Unescape View File

@ -87,7 +87,7 @@ class Completetaskpage extends Component {
this.setState({
banksMenu:menuData
})
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,response.data);
}catch (e) {
}

2
public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
Unescape View File

@ -82,7 +82,7 @@ class CompletetopicdePage extends Component {
this.setState({
banksMenu:menuData
})
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,response.data);
}catch (e) {
}

2
public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
Unescape View File

@ -92,7 +92,7 @@ class GroupjobbankPage extends Component {
this.setState({
banksMenu:menuData
})
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,response.data);
}catch (e) {
}

2
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -302,7 +302,7 @@ class PollNewQuestbank extends Component {
{content:'编辑'}
]
}
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,result.data);
}catch (e) {
}

2
public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
Unescape View File

@ -93,7 +93,7 @@ class Generaljobbankdetails extends Component {
this.setState({
banksMenu:menuData
})
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,response.data);
}catch (e) {
}

3
public/react/src/modules/page/MainContent.js
Unescape View File

@ -100,6 +100,9 @@ class MainContent extends Component {
vnc_url={vnc_url}
{...this.props}
></VNCContainer>
<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack" style={{height:'48px'}}>
<ActionView onRunCodeTest={onRunCodeTest} {...this.props}></ActionView>
</div>
</CodeRepositoryViewContainer>
:
<React.Fragment>

29
public/react/src/modules/tpm/TPMsettings/TPMsettings.js
Unescape View File

@ -355,6 +355,7 @@ export default class TPMsettings extends Component {
code_hidden: response.data.shixun.code_hidden,
forbid_copy: response.data.shixun.forbid_copy,
vnc: response.data.shixun.vnc,
vnc_evaluate: response.data.shixun.vnc_evaluate,
name: response.data.shixun.name,
scope_partment: response.data.shixun.scope_partment,
description: response.data.shixun.description,
@ -535,6 +536,12 @@ export default class TPMsettings extends Component {
forbid_copy: sum,
});
}
shixun_vnc_evaluate=(e) => {
this.setState({
vnc_evaluate: e.target.checked,
});
}
shixun_vnc=(e)=>{
// let sum = ""
@ -545,6 +552,7 @@ export default class TPMsettings extends Component {
// }
this.setState({
vnc: e.target.checked,
vnc_evaluate: false,
});
}
@ -772,7 +780,7 @@ export default class TPMsettings extends Component {
}
let {
name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum,
name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, vnc_evaluate,
evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
opening_time,shixunmemoMDvalue,shixun_service_configlist
} = this.state;
@ -883,6 +891,7 @@ export default class TPMsettings extends Component {
use_scope: use_scope,
can_copy: can_copy,
vnc: vnc===null?undefined:vnc,
vnc_evaluate: vnc_evaluate===null?undefined:vnc_evaluate,
test_set_permission: test_set_permission,
code_hidden: code_hidden,
trainee: trainee,
@ -1464,6 +1473,7 @@ export default class TPMsettings extends Component {
forbid_copy,
code_hidden,
vnc,
vnc_evaluate,
scopetype,
scope_partment,
departmentslist,
@ -2222,11 +2232,20 @@ export default class TPMsettings extends Component {
{this.props.identity<3?<div className="clearfix mt20 ml30">
<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化:</span>
<span className="fl mt5">
<Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
</span>
<span className="fl mt5">
<Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
</span>
</div>:""}
{this.props.identity<3 && vnc ?<div className="clearfix mt20 ml30">
<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化评测:</span>
<span className="fl mt5 ml5">
<Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在VNC图形化实训中，给学员开启评测</label>
</span>
</div>:""}
</div>

5
public/react/src/modules/user/usersInfo/banks/BanksIndex.js
Unescape View File

@ -85,7 +85,10 @@ class BanksIndex extends Component{
}
initPublic = (crumbData) =>{
initPublic = (crumbData,data) =>{
if(data && data.status && data.status == -2){
this.props.history.push(`/topicbank/publicly`);
}
this.setState({
crumbData
})

4
public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js
Unescape View File

@ -31,11 +31,11 @@ class BanksTabIndex extends Component{
}
}
initPublic = (crumbData,menuData) =>{
initPublic = (crumbData,menuData,data) =>{
this.setState({
banksMenu:menuData
})
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,data);
}
render(){

2
public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
Unescape View File

@ -36,7 +36,7 @@ class ExerciseBanksDetail extends Component{
type:this.props.match.params.type,
authorize:result && result.data && result.data.authorize,
}
this.props.initPublic(crumbData,menuData);
this.props.initPublic(crumbData,menuData,result.data);
}
render(){

2
public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js
Unescape View File

@ -29,7 +29,7 @@ class ExerciseBanksEdit extends Component {
{content:'编辑'}
]
}
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,responseData.data);
}
render(){

2
public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
Unescape View File

@ -29,7 +29,7 @@ class GtaskBanksEdit extends Component {
{content:'编辑'}
]
}
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,result.data);
result.data.isEdit = true;
this.setState({ data:result.data})
this.newWorkFormRef.initValue(result.data);

3
public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
Unescape View File

@ -12,7 +12,6 @@ class GtopicBanksEdit extends Component{
}
componentDidMount = () =>{
let bankId = this.props.match.params.bankId;
this.initData(bankId);
}
@ -28,7 +27,7 @@ class GtopicBanksEdit extends Component{
{content:'编辑'}
]
}
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,result.data);
this.GraduateTopicNewFromRef.initValue(result);
}

2
public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
Unescape View File

@ -30,7 +30,7 @@ class HomeworkBanksEdit extends Component {
{content:'编辑'}
]
}
this.props.initPublic(crumbData);
this.props.initPublic(crumbData,result.data);
result.data.isEdit = true;
result.data.ref_attachments = result.data.reference_attachments
// this.setState({ isGroup: result.data.min_num || result.data.max_num })

2
public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
Unescape View File

@ -47,7 +47,7 @@ class PollBanksContent extends Component{
type:this.props.match.params.type,
authorize:result && result.data && result.data.authorize,
}
this.props.initPublic(crumbData,menuData);
this.props.initPublic(crumbData,menuData,result.data);
this.setState({
pollDetail
})

Write Preview
Loading…
Cancel
Save