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

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

Browse Source
dev_forum
hjm 6 years ago
parent 954347811e 0d9fa58a3e
commit 49a9f6648f
12 changed files with 4719 additions and 4695 deletions
Show Stats Download Patch File Download Diff File

30
public/react/config/webpack.config.dev.js
Unescape View File

@ -114,21 +114,21 @@ module.exports = {
// First, run the linter.
// It's important to do this before Babel processes the JS.
// 上线然后要注释回来
// {
// test: /\.(js|jsx|mjs)$/,
// enforce: 'pre',
// use: [
// {
// options: {
// formatter: eslintFormatter,
// eslintPath: require.resolve('eslint'),
//
// },
// loader: require.resolve('eslint-loader'),
// },
// ],
// include: paths.appSrc,
// },
{
test: /\.(js|jsx|mjs)$/,
enforce: 'pre',
use: [
{
options: {
formatter: eslintFormatter,
eslintPath: require.resolve('eslint'),
},
loader: require.resolve('eslint-loader'),
},
],
include: paths.appSrc,
},
{
// "oneOf" will traverse all following loaders until one will
// match the requirements. When no loader matches it will fall

6
public/react/public/index.html
Unescape View File

@ -148,12 +148,12 @@
(function() { // Scoping function to avoid globals
var href = location.href;
if (href.indexOf('/tasks/') != -1) {
document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
// build.js中会将这个url附加一个前缀 react/build
document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
} else if (href.indexOf('/paths/') != -1) {
document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
}
})();

2
public/react/public/index.test.html
Unescape View File

@ -38,7 +38,7 @@
<link rel="stylesheet" type="text/css" href="/css/css_min_all.css">
<link href="https://testeduplus2.educoder.net/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
<link href="/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_653600_qa9lwwv74z.css">

3
public/react/src/common/UrlTool.js
Unescape View File

@ -29,7 +29,8 @@ export function getUrl(path, goTest) {
//goTest = true
// testbdweb.educoder.net testbdweb.trustie.net
// const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
const local = 'https://testeduplus2.educoder.net'
// const local = 'https://testeduplus2.educoder.net'
const local = 'http://47.96.87.25:48080'
if (isDev) {
return `${local}${path?path:''}`
}

12
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -1757,7 +1757,7 @@ class PollNew extends Component {
})
}
//上移到服务器中
//上下移到服务器中
Upanddownmovementof = (bool, poll_question_id) => {
// console.log("调用了Upanddownmovementofr")
// console.log(poll_question_id)
@ -1769,7 +1769,7 @@ class PollNew extends Component {
}).then((result) => {
try {
if (result.data.status === 0) {
this.props.showNotification(`已完成`);
this.props.showNotification(`上移成功`);
thiss.thisinitializationdatanew();
}
// console.log(JSON.stringify(result))
@ -1787,7 +1787,7 @@ class PollNew extends Component {
try {
if (result.data.status === 0) {
// message.success("下移题目成功", 1)
this.props.showNotification(`已完成`);
this.props.showNotification(`下移成功`);
thiss.thisinitializationdatanew();
}
// console.log(JSON.stringify(result))
@ -2483,7 +2483,7 @@ class PollNew extends Component {
}
</p>
<p className="mt20"> <span className="font-16 flex1" style={{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
<p className="mt20"> <span className="font-16 flex1" style={item.question.question_type === 1?{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}:item.question.question_type === 2? {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}: {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
{item.question.question_type === 1 ?
(<RadioGroup defaultChecked={false} disabled>
@ -2823,9 +2823,9 @@ class PollNew extends Component {
}}
>
<li className="clearfix mt30 mb50">
<a type="primary" className="defalutSubmitbtn fl mr20"
<a className="defalutSubmitbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
<a type="primary" className="defalutCancelbtn fl"
onClick={() => this.submitQuestionnaire()}>提交</a>
<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
</li>
</div>
}

2
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -1377,7 +1377,7 @@ class Listofworks extends Component {
classroom: game_list[i].score,
complete_status: game_list[i].complete_status,
})
experience=game_list[i].complete_status+experience;
experience=game_list[i].score+experience;
if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
boolgalist=false;

2
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -394,7 +394,7 @@ class Listofworksstudentone extends Component {
classroom: game_list[i].score,
complete_status: game_list[i].complete_status,
})
experience=game_list[i].complete_status+experience;
experience=game_list[i].score+experience;
if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
boolgalist=false;

22
public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
Unescape View File

@ -52,6 +52,26 @@ class TraineetraininginformationModal extends Component {
// this.seacthdata();
}
componentWillReceiveProps(nextProps) {
// console.log("46");
// console.log(nextProps);
// console.log(this.props);
if (nextProps.boolgalist != this.props.boolgalist) {
// console.log("50");
// console.log(nextProps.user);
if (nextProps.boolgalist !== undefined) {
// console.log("53");
// console.log(nextProps.user);
this.setState({
boolgalist: nextProps.boolgalist,
})
}
}
}
LimitNumber=(txt)=> {
var str = txt;
if(str.length>25){
@ -61,7 +81,7 @@ class TraineetraininginformationModal extends Component {
}
render() {
var columns;
if(this.props.boolgalis&&this.props.boolgalist === true) {
if(this.state.boolgalist&&this.state.boolgalist === true) {
columns = [
{
title: '关卡',

3
public/react/src/modules/page/component/monaco/TPIMonaco.js
Unescape View File

@ -45,7 +45,8 @@ function loadMonacoResouce(callback) {
if (window.location.port == 3007) {
prefix = ''
} else {
_url_origin = `https://testeduplus2.educoder.net/`;
// _url_origin = `https://testeduplus2.educoder.net/`;
_url_origin = 'http://47.96.87.25:48080';
}
const $ = window.$;

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

@ -6,7 +6,8 @@ export function loadSshScript(callback) {
if (window.location.port == 3007) {
prefix = ''
} else {
_url_origin = `https://testeduplus2.educoder.net/`;
// _url_origin = `https://testeduplus2.educoder.net/`;
_url_origin = 'http://47.96.87.25:48080';
}
const $ = window.$;
// 未加载过

11
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -18,7 +18,7 @@ import Trialapplication from "../login/Trialapplication";
const $ = window.$;
const versionNum = '0001';
// let _url_origin = getUrl()
let _url_origin=`https://testeduplus2.educoder.net`;
let _url_origin=``;
// let _url_origin=`https://www.educoder.net`;
if (!window['indexHOCLoaded']) {
@ -28,16 +28,13 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`));
.attr('href', `/stylesheets/css/edu-common.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`));
.attr('href', `/stylesheets/educoder/edu-main.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
.attr('href', `/stylesheets/educoder/edu-all.css?1525440977`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/css_min_all.css?1525440977`));

6
public/react/src/modules/tpm/newshixuns/Newshixuns.js
Unescape View File

@ -546,6 +546,7 @@ class Newshixuns extends Component {
// const { id } = response.data;
// if (id) {
if(this.state.file !== undefined){
console.log("549");
this.deleteAttachment(this.state.file);
this.setState({
file:undefined,
@ -577,6 +578,7 @@ class Newshixuns extends Component {
postapplyvisible: false,
})
if(this.state.file !== undefined){
console.log("580");
this.deleteAttachment(this.state.file);
this.setState({
file:undefined,
@ -662,6 +664,7 @@ class Newshixuns extends Component {
cancelText: '取消',
// content: 'Some descriptions',
onOk: () => {
console.log("665")
this.deleteAttachment(file)
},
onCancel() {
@ -671,7 +674,7 @@ class Newshixuns extends Component {
return false;
}
deleteAttachment = (file) => {
// console.log(file);
console.log(file);
let id=file.response ==undefined ? file.id : file.response.id
const url = `/attachments/${id}.json`
axios.delete(url, {
@ -760,6 +763,7 @@ class Newshixuns extends Component {
}
if(thiss.state.file !== undefined){
console.log("763")
thiss.deleteAttachment(thiss.state.file);
thiss.setState({
file:file

Write Preview
Loading…
Cancel
Save