Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
Conflicts: public/react/src/modules/courses/busyWork/CommonWorkAppraise.jsdev_forum
commit
4088ebcdc0
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,74 +1,75 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
export function loadSshScript(callback) {
|
export function loadSshScript(callback) {
|
||||||
let _url_origin = ``;
|
let _url_origin = ``;
|
||||||
let prefix = 'react/build'
|
let prefix = 'react/build'
|
||||||
if (window.location.port == 3007) {
|
if (window.location.port == 3007) {
|
||||||
prefix = ''
|
prefix = ''
|
||||||
} else {
|
} else {
|
||||||
_url_origin = `https://testeduplus2.educoder.net/`;
|
// _url_origin = `https://testeduplus2.educoder.net/`;
|
||||||
}
|
_url_origin = 'http://47.96.87.25:48080';
|
||||||
const $ = window.$;
|
}
|
||||||
// 未加载过
|
const $ = window.$;
|
||||||
if (!window['Terminal']) {
|
// 未加载过
|
||||||
// /js/js_min_all.
|
if (!window['Terminal']) {
|
||||||
$('head').append($('<link rel="stylesheet" type="text/css" />')
|
// /js/js_min_all.
|
||||||
.attr('href', `${_url_origin}${prefix}/js/xterm/xterm.css`));
|
$('head').append($('<link rel="stylesheet" type="text/css" />')
|
||||||
|
.attr('href', `${_url_origin}${prefix}/js/xterm/xterm.css`));
|
||||||
// $.getScript(
|
|
||||||
// `${_url_origin}${prefix}/js/xterm/xterm.js`,
|
// $.getScript(
|
||||||
// (data, textStatus, jqxhr) => {
|
// `${_url_origin}${prefix}/js/xterm/xterm.js`,
|
||||||
// });
|
// (data, textStatus, jqxhr) => {
|
||||||
// $.getScript(
|
// });
|
||||||
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js`,
|
// $.getScript(
|
||||||
// (data, textStatus, jqxhr) => {
|
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js`,
|
||||||
// });
|
// (data, textStatus, jqxhr) => {
|
||||||
// $.getScript(
|
// });
|
||||||
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js`,
|
// $.getScript(
|
||||||
// (data, textStatus, jqxhr) => {
|
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js`,
|
||||||
// $.getScript(
|
// (data, textStatus, jqxhr) => {
|
||||||
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js`,
|
// $.getScript(
|
||||||
// (data, textStatus, jqxhr) => {
|
// `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js`,
|
||||||
// callback && callback()
|
// (data, textStatus, jqxhr) => {
|
||||||
// });
|
// callback && callback()
|
||||||
// });
|
// });
|
||||||
|
// });
|
||||||
$.when(
|
|
||||||
$.getScript( `${_url_origin}${prefix}/js/xterm/xterm.js` ),
|
$.when(
|
||||||
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js` ),
|
$.getScript( `${_url_origin}${prefix}/js/xterm/xterm.js` ),
|
||||||
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js` ),
|
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js` ),
|
||||||
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js` ),
|
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js` ),
|
||||||
$.Deferred(function( deferred ){
|
$.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js` ),
|
||||||
$( deferred.resolve );
|
$.Deferred(function( deferred ){
|
||||||
})
|
$( deferred.resolve );
|
||||||
).done(function(){
|
})
|
||||||
//place your code here, the scripts are all loaded
|
).done(function(){
|
||||||
callback && callback()
|
//place your code here, the scripts are all loaded
|
||||||
});
|
callback && callback()
|
||||||
} else {
|
});
|
||||||
callback && callback()
|
} else {
|
||||||
}
|
callback && callback()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
export function openTerminal(props, parentDomId) {
|
|
||||||
const { game_id, host, password, port, username, webssh_url, ws_url,
|
export function openTerminal(props, parentDomId) {
|
||||||
rows, cols, width, height} = props;
|
const { game_id, host, password, port, username, webssh_url, ws_url,
|
||||||
|
rows, cols, width, height} = props;
|
||||||
var options = {
|
|
||||||
host: host,
|
var options = {
|
||||||
port: port,
|
host: host,
|
||||||
username: username,
|
port: port,
|
||||||
secret: password,
|
username: username,
|
||||||
gameid: game_id,
|
secret: password,
|
||||||
rows: rows,
|
gameid: game_id,
|
||||||
columns: cols,
|
rows: rows,
|
||||||
width,
|
columns: cols,
|
||||||
height,
|
width,
|
||||||
parentDomId,
|
height,
|
||||||
// tab: $("#terminalTab").val(),
|
parentDomId,
|
||||||
}
|
// tab: $("#terminalTab").val(),
|
||||||
window.g_websocket_url = ws_url;
|
}
|
||||||
// TODO 加一个parentDomId 来做多ssh tab
|
window.g_websocket_url = ws_url;
|
||||||
window.openTerminal(options)
|
// TODO 加一个parentDomId 来做多ssh tab
|
||||||
}
|
window.openTerminal(options)
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,129 +1,129 @@
|
|||||||
.paragraph:hover .status_li a{
|
.paragraph:hover .status_li a{
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.newedu-filter-btn{
|
.newedu-filter-btn{
|
||||||
display: block;
|
display: block;
|
||||||
float: left;
|
float: left;
|
||||||
padding: 0 9px;
|
padding: 0 9px;
|
||||||
height: 28px;
|
/*height: 28px;*/
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
border-radius: 14px;
|
border-radius: 14px;
|
||||||
background-color: #F5F5F5;
|
background-color: #F5F5F5;
|
||||||
color: #666;
|
color: #666;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
margin-bottom: 9px;
|
margin-bottom: 9px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edu-filter-btn29BD8B{
|
.edu-filter-btn29BD8B{
|
||||||
display: block;
|
display: block;
|
||||||
float: left;
|
float: left;
|
||||||
padding: 0 9px;
|
padding: 0 9px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
border-radius: 14px;
|
border-radius: 14px;
|
||||||
background-color: #29BD8B;
|
background-color: #29BD8B;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
margin-bottom: 9px;
|
margin-bottom: 9px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lesson-saved-list-item{
|
.lesson-saved-list-item{
|
||||||
border-bottom: none!important;
|
border-bottom: none!important;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.click_add{
|
.click_add{
|
||||||
border-top: none!important;
|
border-top: none!important;
|
||||||
}
|
}
|
||||||
.white-panel li{border:1px solid #fafafa!important;}
|
.white-panel li{border:1px solid #fafafa!important;}
|
||||||
.white-panel li.active{border:1px solid #4CACFF!important;}
|
.white-panel li.active{border:1px solid #4CACFF!important;}
|
||||||
|
|
||||||
/* 选择实训列表 */
|
/* 选择实训列表 */
|
||||||
.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
|
.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
|
||||||
|
|
||||||
.mtf3{
|
.mtf3{
|
||||||
margin-top:-3px;
|
margin-top:-3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mtf5{
|
.mtf5{
|
||||||
margin-top: -5px;
|
margin-top: -5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.color204{
|
.color204{
|
||||||
color:rgba(204,204,204,1);
|
color:rgba(204,204,204,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.lesson-saved-list-itemdrop{
|
.lesson-saved-list-itemdrop{
|
||||||
height: 93px;
|
height: 93px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lesson-saved-list{
|
.lesson-saved-list{
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.itempositionleft{
|
.itempositionleft{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
||||||
.itempositionright{
|
.itempositionright{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ant-input{
|
.ant-input{
|
||||||
background-color: #fafafa!important;
|
background-color: #fafafa!important;
|
||||||
}
|
}
|
||||||
.ant-input:focus{
|
.ant-input:focus{
|
||||||
background-color:#ffffff!important;
|
background-color:#ffffff!important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pathNavLine{bottom: -11px;}
|
.pathNavLine{bottom: -11px;}
|
||||||
|
|
||||||
#shixun_operation:hover{
|
#shixun_operation:hover{
|
||||||
color:#fff !important;
|
color:#fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cursor{
|
.cursor{
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.paragraph_nameid:hover{
|
.paragraph_nameid:hover{
|
||||||
color:#4cacff !important;
|
color:#4cacff !important;
|
||||||
}
|
}
|
||||||
/* 学习统计 */
|
/* 学习统计 */
|
||||||
.statisticsNav{height: 100px;}
|
.statisticsNav{height: 100px;}
|
||||||
.statisticsNav ul{margin-top: 35px;}
|
.statisticsNav ul{margin-top: 35px;}
|
||||||
.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
|
.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
|
||||||
.statisticsNav ul li a{color: #4D4D4D!important;}
|
.statisticsNav ul li a{color: #4D4D4D!important;}
|
||||||
.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
|
.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
|
||||||
.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
|
.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
|
||||||
|
|
||||||
|
|
||||||
.next-loading{
|
.next-loading{
|
||||||
width:100%;
|
width:100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paddingleft22{
|
.paddingleft22{
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding-left: 22px;
|
padding-left: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paddingl5{
|
.paddingl5{
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paddingl10{
|
.paddingl10{
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.red{
|
.red{
|
||||||
color:red;
|
color:red;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pl38{
|
.pl38{
|
||||||
padding-left: 38px;
|
padding-left: 38px;
|
||||||
}
|
}
|
||||||
.ml37{
|
.ml37{
|
||||||
margin-left: 37px;
|
margin-left: 37px;
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue