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

调整

Browse Source
chromesetting
杨树林 5 years ago
parent 5e5fb1663a 797a70c142
commit b23c32ab6d
10 changed files with 1044 additions and 931 deletions
Show Stats Download Patch File Download Diff File

6
app/controllers/challenges_controller.rb
Unescape View File

@ -178,6 +178,7 @@ class ChallengesController < ApplicationController
# tab 0:过关任务的更新; 1:评测设置的更新; 2:表示参考答案的更新;
def update
begin
ActiveRecord::Base.transaction do
tab = params[:tab].to_i
@challenge.update_attributes(challenge_params)
@ -236,6 +237,11 @@ class ChallengesController < ApplicationController
end
end
rescue => e
logger_error("##update_challenges: ##{e.message}")
tip_exception("更新失败！")
end
end
# 参考答案的'增,删,改'

13
app/helpers/export_helper.rb
Unescape View File

@ -163,9 +163,12 @@ module ExportHelper
count_2 = common_homeworks.size
count_3 = group_homeworks.size
count_4 = tasks.size
all_user_ids = all_members.pluck(:user_id)
#实训作业
shixun_homeworks.each_with_index do |s,index|
all_student_works = s.score_student_works #该实训题的全部用户回答
all_student_works = s.score_student_works.select{|work| all_user_ids.include?(work.user_id)} #该实训题的全部用户回答
title_no = index.to_i + 1
student_work_to_xlsx(all_student_works,s)
shixun_work_display_name = format_sheet_name (title_no.to_s + "." + s.name).strip.first(30)
@ -175,7 +178,7 @@ module ExportHelper
#普通作业
common_homeworks.each_with_index do |c,index|
all_student_works = c.score_student_works #当前用户的对该作业的回答
all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)} #当前用户的对该作业的回答
title_no = count_1 + index.to_i + 1
student_work_to_xlsx(all_student_works,c)
@ -187,7 +190,7 @@ module ExportHelper
#分组作业
group_homeworks.each_with_index do |c,index|
all_student_works = c.score_student_works #当前用户的对该作业的回答
all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)} #当前用户的对该作业的回答
title_no = count_1 + count_2 + index.to_i + 1
student_work_to_xlsx(all_student_works,c)
work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@ -197,7 +200,7 @@ module ExportHelper
#毕设任务
tasks.each_with_index do |c,index|
all_student_works = c.score_graduation_works #当前用户的对该作业的回答
all_student_works = c.score_graduation_works.select{|work| all_user_ids.include?(work.user_id)} #当前用户的对该作业的回答
title_no = count_1 + count_2 + count_3 + index.to_i + 1
graduation_work_to_xlsx(all_student_works,c,current_user)
work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@ -207,7 +210,7 @@ module ExportHelper
#试卷的导出
exercises.each_with_index do |c,index|
all_student_works = c.score_exercise_users #当前用户的对该作业的回答
all_student_works = c.score_exercise_users.select{|work| all_user_ids.include?(work.user_id)} #当前用户的对该作业的回答
title_no = count_1 + count_2 + count_3 + count_4 + index.to_i + 1
get_export_users(c,course,all_student_works)
work_name = format_sheet_name (title_no.to_s + "." + c.exercise_name).strip.first(30)

11
app/jobs/sync_trustie_job.rb
Unescape View File

@ -17,10 +17,17 @@ class SyncTrustieJob < ApplicationJob
"number": count
}
uri = URI.parse(url)
# http = Net::HTTP.new(uri.hostname, uri.port)
if api_host
http = Net::HTTP.new(uri.hostname, uri.port)
http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
Rails.logger.info("#######_________response__sync__end_____#########")
if api_host.include?("https://")
http.use_ssl = true
end
response = http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
Rails.logger.info("#######_________response__sync__end_____#########{response.body}")
end
end
end

7
db/migrate/20191211073142_modify_type_for_test_sets.rb
Unescape View File

@ -0,0 +1,7 @@
class ModifyTypeForTestSets < ActiveRecord::Migration[5.2]
def change
change_column :test_sets, :input, :longtext
change_column :test_sets, :output, :longtext
end
end

7
public/react/src/AppConfig.js
Unescape View File

@ -89,12 +89,7 @@ export function initAxiosInterceptors(props) {
url = `${config.url}`;
}
}
//保存jupyter 到 tpm 中 //获取jupyter 到 tpm 中
if(config.params&&config.params.redirect_uri!=undefined){
if(config.params.redirect_uri.indexOf('/jupyters')!=-1){
url = `${config.url}`;
}
}
if(`${config[0]}`!=`true`){
if (window.location.port === "3007") {
// if (url.indexOf('.json') == -1) {

10
public/react/src/modules/page/VNCContainer.js
Unescape View File

@ -38,9 +38,9 @@ class VNCContainer extends Component {
}
shouldComponentUpdate () {
return false;
}
// shouldComponentUpdate () {
// return false;
// }
getSecondDrawerWidth = () => {
return $('#game_right_contents').width() - firstDrawerWidth
@ -337,11 +337,11 @@ class VNCContainer extends Component {
width={firstDrawerWidth}
closable={false}
onClose={this.onBottomDrawerClose}
visible={this.state.bottomDrawer}
visible={this.state.bottomDrawer===undefined?false:this.state.bottomDrawer}
className={'codeEvaluateDrawer'}
placement="bottom"
getContainer={false}
style={{ position: 'absolute', bottom: '25px', zIndex: 1 }}
style={{ position: 'absolute', bottom: '-25px', zIndex: 1 }}
afterVisibleChange={(visible) => {
if (visible) {
const canvas = $('.vncDisply canvas')[0]

470
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -1,16 +1,16 @@
import React, { Component } from 'react';
import React, {Component} from 'react';
import { Redirect } from 'react-router';
import {Redirect} from 'react-router';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
import PropTypes from 'prop-types';
import { Rating ,Progress} from "@icedesign/base";
import {Rating, Progress} from "@icedesign/base";
import {Modal,Input,Radio,Pagination,message,Spin,Icon,Tooltip,Rate} from 'antd';
import {Modal, Input, Radio, Pagination, message, Spin, Icon, Tooltip, Rate} from 'antd';
import AccountProfile from"../user/AccountProfile";
import AccountProfile from "../user/AccountProfile";
import 'antd/lib/pagination/style/index.css';
@ -29,34 +29,34 @@ const RadioGroup = Radio.Group;
class TPMBanner extends Component {
constructor(props) {
super(props)
this.state={
this.state = {
Forkvisible: false,
Senttothetype:false,
Senttothevcalue:undefined,
courses_count:1,
course_list:[],
pagenum:1,
publishbox:"",
publishboxstatus:0,
pages:1,
Issuevisible:false,
evaluation_set_position:[],
tag_position:[],
Forkauthentication:false,
can_fork:undefined,
certi_url:undefined,
showradios:false,
startbtn:false,
Searchvalue:"",
startshixunCombattype:false,
shixunsmessage:"",
shixunsreplace:false,
hidestartshixunsreplacevalue:"",
isIE:false,
Senttothetype: false,
Senttothevcalue: undefined,
courses_count: 1,
course_list: [],
pagenum: 1,
publishbox: "",
publishboxstatus: 0,
pages: 1,
Issuevisible: false,
evaluation_set_position: [],
tag_position: [],
Forkauthentication: false,
can_fork: undefined,
certi_url: undefined,
showradios: false,
startbtn: false,
Searchvalue: "",
startshixunCombattype: false,
shixunsmessage: "",
shixunsreplace: false,
hidestartshixunsreplacevalue: "",
isIE: false,
Forkvisibletype: false,
isSpin:false,
Senttothevcaluetype:false,
jupyterbool:false,
isSpin: false,
Senttothevcaluetype: false,
jupyterbool: false,
}
}
@ -70,46 +70,48 @@ class TPMBanner extends Component {
// });
// }
IEVersion=()=>{
IEVersion = () => {
var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
if(isIE) {
if (isIE) {
var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
reIE.test(userAgent);
var fIEVersion = parseFloat(RegExp["$1"]);
if(fIEVersion == 7) {
if (fIEVersion == 7) {
return 7;
} else if(fIEVersion == 8) {
} else if (fIEVersion == 8) {
return 8;
} else if(fIEVersion == 9) {
} else if (fIEVersion == 9) {
return 9;
} else if(fIEVersion == 10) {
} else if (fIEVersion == 10) {
return 10;
} else {
return 6;//IE版本<=7
}
} else if(isEdge) {
} else if (isEdge) {
return 'edge';//edge
} else if(isIE11) {
} else if (isIE11) {
return 11; //IE11
}else{
} else {
return -1;//不是ie浏览器
}
}
componentDidMount() {
let thiisie=this.IEVersion();
if(thiisie!=-1){
let thiisie = this.IEVersion();
if (thiisie != -1) {
this.setState({
isIE:true
isIE: true
})
}else{
} else {
this.setState({
isIE:false
isIE: false
})
}
}
/*
* Fork
* */
@ -133,7 +135,7 @@ class TPMBanner extends Component {
hideForkvisible = () => {
this.setState({
Forkvisible: false,
Forkauthentication:false
Forkauthentication: false
})
}
@ -144,9 +146,9 @@ class TPMBanner extends Component {
let id = this.props.match.params.shixunId;
let url = "/shixuns/" + id + "/copy.json";
axios.post(url).then((response) => {
if(response.data.status===401){
if (response.data.status === 401) {
}else{
} else {
this.setState({
Forkvisible: false,
Forkauthentication: false,
@ -163,8 +165,8 @@ class TPMBanner extends Component {
/*
* 发送至按钮
* */
Senttothe=()=>{
if(this.props.checkIfLogin()===false){
Senttothe = () => {
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}
@ -183,61 +185,64 @@ class TPMBanner extends Component {
// return
// }
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/search_user_courses.json";
let url = "/shixuns/" + id + "/search_user_courses.json";
this.setState({
Senttothetype:true
Senttothetype: true
})
axios.get(url, {
params: {
page:1,
limit:10
}}).then((response) => {
page: 1,
limit: 10
}
}).then((response) => {
this.setState({
courses_count:response.data.courses_count,
course_list:response.data.course_list
courses_count: response.data.courses_count,
course_list: response.data.course_list
})
}).catch((error) => {
console.log(error)
});
}
SenttotheSearch=(value)=>{
SenttotheSearch = (value) => {
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/search_user_courses.json?search="+value;
let url = "/shixuns/" + id + "/search_user_courses.json?search=" + value;
axios.get(encodeURI(url), {
params: {
page:1,
limit:10
}}).then((response) => {
page: 1,
limit: 10
}
}).then((response) => {
this.setState({
courses_count:response.data.courses_count,
course_list:response.data.course_list,
pages:1,
Searchvalue:value
courses_count: response.data.courses_count,
course_list: response.data.course_list,
pages: 1,
Searchvalue: value
})
}).catch((error) => {
console.log(error)
});
}
onChangeSenttothevcalue=(e)=>{
onChangeSenttothevcalue = (e) => {
this.setState({
Senttothevcalue:e.target.value
Senttothevcalue: e.target.value
})
}
onChangesendeSenttothe=(pageNumber)=>{
let{Searchvalue}=this.state;
onChangesendeSenttothe = (pageNumber) => {
let {Searchvalue} = this.state;
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/search_user_courses.json?search="+Searchvalue;
let url = "/shixuns/" + id + "/search_user_courses.json?search=" + Searchvalue;
axios.get(url, {
params: {
page:pageNumber,
limit:10
}}).then((response) => {
page: pageNumber,
limit: 10
}
}).then((response) => {
this.setState({
courses_count:response.data.courses_count,
course_list:response.data.course_list,
courses_count: response.data.courses_count,
course_list: response.data.course_list,
pagenum: pageNumber,
pages: pageNumber
})
@ -245,27 +250,27 @@ class TPMBanner extends Component {
console.log(error)
});
}
sendeSenttothevcalue=()=>{
sendeSenttothevcalue = () => {
let {Senttothevcalue}=this.state;
let {Senttothevcalue} = this.state;
if(Senttothevcalue===undefined){
if (Senttothevcalue === undefined) {
this.setState({
Senttothevcaluetype:true
Senttothevcaluetype: true
})
return
}
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/send_to_course.json";
axios.post(url,{
course_id:Senttothevcalue
let url = "/shixuns/" + id + "/send_to_course.json";
axios.post(url, {
course_id: Senttothevcalue
}).then((response) => {
this.props.showSnackbar(response.data.message);
this.setState({
Senttothetype:false,
Searchvalue:"",
pages:1
Senttothetype: false,
Searchvalue: "",
pages: 1
})
// window.location.href = response.data.url;
// response.data.course_id
@ -277,11 +282,11 @@ class TPMBanner extends Component {
}
hideSenttothevcalue=()=>{
hideSenttothevcalue = () => {
this.setState({
Senttothetype:false,
Searchvalue:"",
pages:1
Senttothetype: false,
Searchvalue: "",
pages: 1
})
@ -291,14 +296,14 @@ class TPMBanner extends Component {
* 撤销发布按钮
* */
ModalCancel=()=>{
ModalCancel = () => {
this.setState({
Modalstype:false
Modalstype: false
})
}
ModalSave=()=>{
ModalSave = () => {
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/cancel_publish.json";
let url = "/shixuns/" + id + "/cancel_publish.json";
axios.get(url).then((response) => {
this.props.showSnackbar(response.data.message);
window.location.reload()
@ -306,12 +311,12 @@ class TPMBanner extends Component {
console.log(error)
});
}
cancel_publish=()=>{
cancel_publish = () => {
this.setState({
Modalstype:true,
Modalstopval:"是否确认撤销发布？",
ModalCancel:this.ModalCancel,
ModalSave:this.ModalSave,
Modalstype: true,
Modalstopval: "是否确认撤销发布？",
ModalCancel: this.ModalCancel,
ModalSave: this.ModalSave,
})
}
@ -319,32 +324,32 @@ class TPMBanner extends Component {
/*
* 申请发布按钮
* */
applyrelease=()=>{
applyrelease = () => {
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/publish.json";
let url = "/shixuns/" + id + "/publish.json";
axios.get(url).then((response) => {
let evaluation_set_position
if(response.data.evaluation_set_position===null){
evaluation_set_position=[]
}else{
evaluation_set_position=response.data.evaluation_set_position
if (response.data.evaluation_set_position === null) {
evaluation_set_position = []
} else {
evaluation_set_position = response.data.evaluation_set_position
}
this.setState({
Issuevisible:true,
tag_position:response.data.tag_position,
evaluation_set_position:evaluation_set_position,
publishboxstatus:response.data.status,
Issuevisible: true,
tag_position: response.data.tag_position,
evaluation_set_position: evaluation_set_position,
publishboxstatus: response.data.status,
})
}).catch((error) => {
console.log(error)
});
};
hiddenIssuevisible=(val)=>{
hiddenIssuevisible = (val) => {
this.setState({
Issuevisible:false
Issuevisible: false
})
if(val===0||val===1){
if (val === 0 || val === 1) {
window.location.reload()
}
@ -362,29 +367,30 @@ class TPMBanner extends Component {
// }
// reset_my_game
hidestartshixunsreplace=(url)=>{
hidestartshixunsreplace = (url) => {
this.setState({
isSpin:true,
isSpin: true,
})
axios.get(url).then((response) => {
if(response.status===200){
if (response.status === 200) {
// let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
// this.props.history.push(path);
message.success('重置成功，正在进入实训！');
this.startshixunCombat(response.data.shixun_identifier, 1);
this.setState({
shixunsreplace:false,
isSpin:false,
shixunsreplace: false,
isSpin: false,
})
// message.success('重置成功，正在进入实训！');
// this.startshixunCombat();
}}
}
}
).catch((error) => {
this.setState({
startbtn:false,
shixunsreplace:false,
isSpin:false
startbtn: false,
shixunsreplace: false,
isSpin: false
})
});
@ -392,16 +398,17 @@ class TPMBanner extends Component {
//开始实战按钮
startshixunCombat=(id, reset)=>{
startshixunCombat = (id, reset) => {
if(this.props.checkIfLogin()===false){
if(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true){
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
if (this.props.checkIfProfileCompleted() === false) {
this.setState({
AccountProfiletype:true
AccountProfiletype: true
})
return
}
@ -414,97 +421,172 @@ class TPMBanner extends Component {
// }
let {shixunsDetails} = this.props
if( shixunsDetails.shixun_status>1){
if (shixunsDetails.shixun_status > 1) {
this.setState({
startbtn:true,
hidestartshixunsreplacevalue:""
startbtn: true,
hidestartshixunsreplacevalue: ""
})
}else{
} else {
this.setState({
hidestartshixunsreplacevalue:""
hidestartshixunsreplacevalue: ""
})
}
let url="/shixuns/"+id+"/shixun_exec.json" ;
let url = "/shixuns/" + id + "/jupyter_exec.json";
if (reset) {
url += '?reset=' + reset
}
axios.get(url).then((response) => {
if(response.status===200){
if(response.data.status===-2){
if (response.status === 200) {
if (response.data.status === -2) {
// this.resetshixunCombat(response.data.message);
this.setState({
startbtn:false,
shixunsreplace:true,
hidestartshixunsreplacevalue:response.data.message+".json"
startbtn: false,
shixunsreplace: true,
hidestartshixunsreplacevalue: response.data.message + ".json"
})
// this.shixunexec(response.data.message+".json")
}else if(response.data.status===-1){
} else if (response.data.status === -1) {
console.log(response)
}else if(response.data.status===-3){
} else if (response.data.status === -3) {
this.setState({
shixunsmessage:response.data.message,
startshixunCombattype:true,
startbtn:false
shixunsmessage: response.data.message,
startshixunCombattype: true,
startbtn: false
})
} else {
// let path="/tasks/"+response.data.game_identifier;
// this.props.history.push(path);
// this.context.router.history.push(path);
if (response.data.status != 401) {
window.location.href = "/tasks/" + response.data.identifier+`/jupyter`;
}
}
}
}).catch((error) => {
this.setState({
startbtn: false
})
});
}else{
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}
if (this.props.checkIfProfileCompleted() === false) {
this.setState({
AccountProfiletype: true
})
return
}
// if(this.props.checkIfProfessionalCertification()===false){
// this.setState({
// AccountProfiletype:true
// })
// return
// }
let {shixunsDetails} = this.props
if (shixunsDetails.shixun_status > 1) {
this.setState({
startbtn: true,
hidestartshixunsreplacevalue: ""
})
} else {
this.setState({
hidestartshixunsreplacevalue: ""
})
}
let url = "/shixuns/" + id + "/shixun_exec.json";
if (reset) {
url += '?reset=' + reset
}
axios.get(url).then((response) => {
if (response.status === 200) {
if (response.data.status === -2) {
// this.resetshixunCombat(response.data.message);
this.setState({
startbtn: false,
shixunsreplace: true,
hidestartshixunsreplacevalue: response.data.message + ".json"
})
// this.shixunexec(response.data.message+".json")
} else if (response.data.status === -1) {
console.log(response)
} else if (response.data.status === -3) {
this.setState({
shixunsmessage: response.data.message,
startshixunCombattype: true,
startbtn: false
})
} else {
// let path="/tasks/"+response.data.game_identifier;
// this.props.history.push(path);
// this.context.router.history.push(path);
if(response.data.status!=401){
window.location.href = "/tasks/"+response.data.game_identifier;
if (response.data.status != 401) {
window.location.href = "/tasks/" + response.data.game_identifier;
}
}
}
}).catch((error) => {
this.setState({
startbtn:false
startbtn: false
})
});
}
tocertification=()=>{
let{certi_url}=this.state;
}
tocertification = () => {
let {certi_url} = this.state;
this.setState({
Forkauthentication:false
Forkauthentication: false
})
window.location.href=certi_url;
window.location.href = certi_url;
}
SenttotheValue=(e)=>{
SenttotheValue = (e) => {
this.setState({
Searchvalue:e.target.value
Searchvalue: e.target.value
})
}
hidestartshixunCombattype=()=>{
hidestartshixunCombattype = () => {
this.setState({
startshixunCombattype:false
startshixunCombattype: false
})
}
hideAccountProfile=()=>{
hideAccountProfile = () => {
this.setState({
AccountProfiletype:false
AccountProfiletype: false
})
}
showonMouseOver=()=>{
showonMouseOver = () => {
$("#ratePanel").show();
this.setState({
showradios:true
showradios: true
})
}
hideonMouseOut=()=>{
hideonMouseOut = () => {
$("#ratePanel").hide();
this.setState({
showradios:false
showradios: false
})
}
@ -532,7 +614,8 @@ class TPMBanner extends Component {
hidestartshixunsreplacevalue,
Forkvisibletype,
AccountProfiletype,
isIE} = this.state;
isIE
} = this.state;
let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
let challengeBtnTipText = '';
let challengeBtnText = '模拟实战';
@ -545,14 +628,14 @@ class TPMBanner extends Component {
// challengeBtnTipText = '开始学习并完成实战任务'
//
// }
if(shixunsDetails!=undefined){
if (shixunsDetails.shixun_status === 0 ) {
if (shixunsDetails != undefined) {
if (shixunsDetails.shixun_status === 0) {
challengeBtnText = '继续实战'
} else if (shixunsDetails.shixun_status === 1) {
challengeBtnText = '查看实战'
} else if (shixunsDetails.shixun_status === 3) {
challengeBtnText = '继续实战'
}else{
} else {
challengeBtnText = "开始实战"
}
}
@ -584,37 +667,40 @@ class TPMBanner extends Component {
lineHeight: '30px',
};
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
const MyRate = ({ defaultValue, ...rest }) => {
const antIcon = <Icon type="loading" style={{fontSize: 24}} spin/>;
const MyRate = ({defaultValue, ...rest}) => {
let myValue = defaultValue;
// console.log(myValue-Math.floor(myValue))
// if (myValue < Math.ceil(myValue)) {
// myValue = Math.floor(myValue) + 0.5;
// }
return <Rating {...rest} value={myValue} />;
return <Rating {...rest} value={myValue}/>;
};
console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter)
return (
shixunsDetails===undefined?"":
<div className="shixunDetail">
shixunsDetails === undefined ? "" :
<div className="shixunDetail">
<div className="shixunDetail_top">
{AccountProfiletype===true?<AccountProfile
hideAccountProfile={()=>this.hideAccountProfile()}
{AccountProfiletype === true ? <AccountProfile
hideAccountProfile={() => this.hideAccountProfile()}
{...this.props}
{...this.state}
/>:""}
/> : ""}
{this.state.Modalstype===true?<Modals
{this.state.Modalstype === true ? <Modals
modalsType={this.state.Modalstype}
modalsTopval={this.state.Modalstopval}
modalCancel={this.state.ModalCancel}
modalSave={this.state.ModalSave}
modalsBottomval={this.state.ModalsBottomval}
loadtype={this.state.Loadtype}
/>:""}
/> : ""}
<div className="educontent clearfix">
<p className="clearfix">
@ -647,7 +733,7 @@ class TPMBanner extends Component {
{/*`*/}
{/*}*/}
{/*</style>*/}
<ul className="fl color-grey-c pathInfo" >
<ul className="fl color-grey-c pathInfo">
<li>
<span>学习人数</span>
<span className="mt10">{shixunsDetails.stu_num}</span>
@ -663,12 +749,14 @@ class TPMBanner extends Component {
</li>
</ul>
<div className="pr fl" id="commentsStar" onMouseOver={()=>this.showonMouseOver()} onMouseOut={()=>this.hideonMouseOut()}>
<div className={"color-grey-c ml15"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
<div className="pr fl" id="commentsStar" onMouseOver={() => this.showonMouseOver()}
onMouseOut={() => this.hideonMouseOut()}>
<div className={"color-grey-c ml15"} style={{color: "#Fff", textAlign: "center"}}>学员评分</div>
<div className="rateYo">
<MyRate allowHalf defaultValue={star_info[0]} disabled/>
</div>
<div id="ratePanel" className="showratePanel" style={{"width":"530px"}} onMouseOut={()=>this.hideonMouseOut()}>
<div id="ratePanel" className="showratePanel" style={{"width": "530px"}}
onMouseOut={() => this.hideonMouseOut()}>
<div className="pr">
<span className="rateTrangle"></span>
<div className="pr clearfix ratePanelContent" style={{height: '177px'}}>
@ -744,7 +832,7 @@ class TPMBanner extends Component {
shixunsDetails.task_operation[0] === "查看实战" ? "查看我的实战光辉历史" :
shixunsDetails.task_operation[0] === "模拟实战" ? "模拟完成实战任务" : shixunsDetails.task_operation[0] === "开启挑战" ? "开始学习并完成实战任务" : ""
}>
<a onClick={()=>this.startshixunCombat(this.props.match.params.shixunId)}
<a onClick={() => this.startshixunCombat(this.props.match.params.shixunId)}
className="fr user_default_btn task-btn-orange font-18"
id="shixun_operation" data-remote="true"
>
@ -844,7 +932,7 @@ class TPMBanner extends Component {
evaluation_set_position.map((item, key) => {
return (
<span key={key}>{item}<span
style={{display: key != evaluation_set_position.length-1 ? "inline-block" : 'none'}}>,</span></span>
style={{display: key != evaluation_set_position.length - 1 ? "inline-block" : 'none'}}>,</span></span>
)
})
}
@ -859,7 +947,7 @@ class TPMBanner extends Component {
tag_position.map((item, key) => {
return (
<span key={key}>{item}<span
style={{display: key != tag_position.length-1 ? "inline-block" : 'none'}}>,</span></span>
style={{display: key != tag_position.length - 1 ? "inline-block" : 'none'}}>,</span></span>
)
})
}
@ -888,7 +976,7 @@ class TPMBanner extends Component {
<a onClick={this.Senttothe}
className="fr user_default_btn user_blue_btn mr20 font-18"
data-tip-down=""
style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 ||shixunsDetails.shixun_status === 1 ||shixunsDetails.shixun_status === -1 ? "none" : "block"}}
style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 || shixunsDetails.shixun_status === 1 || shixunsDetails.shixun_status === -1 ? "none" : "block"}}
data-remote="true">
<Tooltip placement="bottom" title={"以实训作业的形式发送到我的课堂"}>
发送至
@ -928,7 +1016,7 @@ class TPMBanner extends Component {
`}
</style>
<div id="search_course_list" className={courses_count > 12?"cdefault ":"cdefault "}>
<div id="search_course_list" className={courses_count > 12 ? "cdefault " : "cdefault "}>
<div className="clearfix mb20 edu-bg-light-blue edu-h270">
<ul>
<RadioGroup onChange={this.onChangeSenttothevcalue} value={Senttothevcalue}>
@ -944,7 +1032,7 @@ class TPMBanner extends Component {
</ul>
</div>
</div>
{this.state.Senttothevcaluetype===true?<div className={"color-red"}>请选择你要发送的课堂</div>:""}
{this.state.Senttothevcaluetype === true ? <div className={"color-red"}>请选择你要发送的课堂</div> : ""}
<div className="mt10 marginauto" style={{display: courses_count > 12 ? "block" : "none"}}>
<Pagination size="small" className="mb20"
showQuickJumper defaultCurrent={1} current={pages} pageSize={12}
@ -978,7 +1066,8 @@ class TPMBanner extends Component {
}
{this.props.identity < 8&&shixunsDetails.shixun_status != -1 ?<div className="fr user_default_btn user_blue_btn mr20"
{this.props.identity < 8 && shixunsDetails.shixun_status != -1 ?
<div className="fr user_default_btn user_blue_btn mr20"
style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
<Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
<span className="flex1 edu-txt-center fl font-18"
@ -996,12 +1085,12 @@ class TPMBanner extends Component {
closable={false}
footer={null}
>
{Forkvisibletype===true?
{Forkvisibletype === true ?
<Spin
tip="请等待正在复制中..."
style={{marginLeft:'38%'}}
style={{marginLeft: '38%'}}
>
</Spin>:
</Spin> :
<div>
<div className="task-popup-content"><p
className="task-popup-text-center font-16 pb20">复制将在后台执行，平台将为你创建<br/>一个新的同名实训和内容，请问是否继续？</p>
@ -1037,7 +1126,7 @@ class TPMBanner extends Component {
</Link>
}
</div>:""}
</div> : ""}
</div>
@ -1045,9 +1134,10 @@ class TPMBanner extends Component {
</div>
<div className="alert alert-orange mb15 mt15 clearfix"
style={{display:shixunsDetails.shixun_status === 1?"block":"none"}}
>正在等待管理员的审核。在审核通过前，可以随时撤销发布</div>
</div>
style={{display: shixunsDetails.shixun_status === 1 ? "block" : "none"}}
>正在等待管理员的审核。在审核通过前，可以随时撤销发布
</div>
</div>
);
}

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

@ -64,6 +64,7 @@ class Shixuninformation extends Component {
choice_main_type:this.props.data.shixun.choice_main_type,
choice_small_type:this.props.data.shixun.choice_small_type,
choice_standard_scripts:this.props.data.shixun.choice_standard_scripts,
shixunmemoMDvalue:this.props.data.shixun.evaluate_script,
})
this.props.form.setFieldsValue({
@ -316,7 +317,10 @@ class Shixuninformation extends Component {
let operateauthority=this.props.identity===1?true:this.props.identity<5&&this.props.data.shixun.status==0?true:false;
console.log(operateauthority)
const {getFieldDecorator} = this.props.form;
const {newshixunlist, languagewrite, systemenvironment, testcoderunmode, fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
const {languagewrite, systemenvironment, testcoderunmode, fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
console.log("1222")
console.log(choice_standard_scripts)
const {shixun_service_configs}=this.props;
const uploadProps = {
width: 600,
@ -478,6 +482,7 @@ class Shixuninformation extends Component {
})(
<div className=" fl pr mr20">
<Select placeholder="请选择小类别"
mode="multiple"
onChange={this.selectright}
value={this.state.choice_small_type.length===0||this.state.choice_small_type[0]===""||this.state.choice_small_type===[]?undefined:this.state.choice_small_type}
style={{width: 180,height:30}}

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

@ -99,7 +99,7 @@ export default class TPMsettings extends Component {
}
</style>
<Tabs tabBarExtraContent={
<div className={"mb20"}>
<div className={"mb20 mr20"}>
<Button type="primary" ghost className={"Permanentban"}>
永久关闭
</Button>

4
public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
Unescape View File

@ -73,8 +73,8 @@ class Challengesjupyter extends Component {
if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
}else{
console.log("componentDidMountChallengesjupyter");
console.log(response.data);
// console.log("componentDidMountChallengesjupyter");
// console.log(response.data);
if(response.data.status===0){
this.setState({
jupyter_url:response.data.url,

Write Preview
Loading…
Cancel
Save