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_video
daiao 5 years ago
parent 1cd3f5d459 8f7602a722
commit a28330c182
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

22
public/compatibility.html
Unescape View File

@ -4,10 +4,10 @@
<meta charset="utf-8"></meta> <meta charset="utf-8"></meta>
<title>EduCoder</title> <title>EduCoder</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" type="text/css" href="/stylesheets/css/edu-common.css?15254409771"> <link rel="stylesheet" type="text/css" href="/stylesheets/css/edu-common.css?1">
<link rel="stylesheet" type="text/css" href="/stylesheets/educoder/edu-main.css?15254409771"> <link rel="stylesheet" type="text/css" href="/stylesheets/educoder/edu-main.css?1">
<link rel="stylesheet" type="text/css" href="/stylesheets/educoder/edu-all.css?15254409771"> <link rel="stylesheet" type="text/css" href="/stylesheets/educoder/edu-all.css?1">
</head> </head>
<body style="" data-gr-c-s-loaded="true"> <body style="" data-gr-c-s-loaded="true">
@ -18,7 +18,7 @@
<div id="md_div" style="display: none;" aria-hidden="true"></div> <div id="md_div" style="display: none;" aria-hidden="true"></div>
<div id="root" class="page -layout-v -fit" aria-hidden="true" style="position: relative;height:100%"> <div id="root" class="page -layout-v -fit" aria-hidden="true" style="position: relative;height:100%">
<div> <div>
<!-- <div class="newHeader" id="nHeader"> <!-- <div class="newHeader" id="nHeader">
<div class="educontent clearfix" style="width: 1200px;"> <div class="educontent clearfix" style="width: 1200px;">
<a href="/"><img alt="高校智能化教学与实训平台" class="logoimg" src="https://www.educoder.net/images/educoder/headNavLogo.png?1526520218"></a> <a href="/"><img alt="高校智能化教学与实训平台" class="logoimg" src="https://www.educoder.net/images/educoder/headNavLogo.png?1526520218"></a>
@ -206,17 +206,17 @@
<div id="picture_display" style="display: none;" aria-hidden="true"></div> <div id="picture_display" style="display: none;" aria-hidden="true"></div>
<!-- js css合并 文件优先级的问题 --> <!-- js css合并 文件优先级的问题 -->
<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script> <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script>
<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script> <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script>
<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script> <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script>
<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script> <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script>
<!-- <link href="//at.alicdn.com/t/font_653600_qa9lwwv74z.css" rel="stylesheet" type="text/css" aria-hidden="true"> --> <!-- <link href="//at.alicdn.com/t/font_653600_qa9lwwv74z.css" rel="stylesheet" type="text/css" aria-hidden="true"> -->
<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script> <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=0001"></script>
<div class="-task-desc" aria-hidden="true"></div> <div class="-task-desc" aria-hidden="true"></div>
<div class="-task-title" aria-hidden="true"> <div class="-task-title" aria-hidden="true">
<div class="data-tip-down"></div> <div class="data-tip-down"></div>
@ -224,6 +224,6 @@
<div class="data-tip-right"></div> <div class="data-tip-right"></div>
<div class="data-tip-top"></div> <div class="data-tip-top"></div>
</div> </div>
</body> </body>
</html> </html>

2
public/react/public/css/edu-all.css
Unescape View File

@ -487,7 +487,7 @@ table.text-file{}
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.subhead_content{width: 1200px;margin: 0px auto;} .subhead_content{width: 1200px;margin: 0px auto;}
.pathInfo li{text-align: center;float: left;margin-right: 38px;} .pathInfo li{text-align: center;float: left;margin-right: 30px;}
.pathInfo li span{display: block;} .pathInfo li span{display: block;}
.produce-content{padding: 40px 20px;background-color: #fff;box-sizing: border-box} .produce-content{padding: 40px 20px;background-color: #fff;box-sizing: border-box}

10
public/react/src/modules/paths/PathDetail/DetailTop.js
Unescape View File

@ -436,7 +436,7 @@ class DetailTop extends Component{
border:1px solid rgba(255,255,255,1); border:1px solid rgba(255,255,255,1);
} }
.maxwinth600{ .maxwinth600{
width:600px; width:740px;
} }
` `
} }
@ -454,7 +454,7 @@ class DetailTop extends Component{
</div> </div>
<div className="clearfix mt20"> <div className="clearfix mt20">
{ {
detailInfoList && detailInfoList &&
<ul className="fl color-grey-eb pathInfo"> <ul className="fl color-grey-eb pathInfo">
{ detailInfoList.stages_count!=0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""} { detailInfoList.stages_count!=0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""}
{ detailInfoList.shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.shixuns_count}</span></li> : ""} { detailInfoList.shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.shixuns_count}</span></li> : ""}
@ -472,8 +472,8 @@ class DetailTop extends Component{
</Link>:"" </Link>:""
} }
{ detailInfoList.allow_send === true?this.props.courses===undefined? { detailInfoList.allow_send === true?
<SendPanel {...this.props} {...this.state}></SendPanel>:"":"" <SendPanel {...this.props} {...this.state}></SendPanel>:""
} }
{this.props.courses===undefined?"":detailInfoList.is_creator===true?<a className={"fr font-18 color-white kaike mr20 kkbths"} onClick={()=>this.OpenCoursefun()}>开课</a>:""} {this.props.courses===undefined?"":detailInfoList.is_creator===true?<a className={"fr font-18 color-white kaike mr20 kkbths"} onClick={()=>this.OpenCoursefun()}>开课</a>:""}
@ -753,7 +753,7 @@ class DetailTop extends Component{
</div> </div>
) )
} }

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

@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2`)); .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`));
// index.html有加载 // index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`));
// $('head').append($('<link rel="stylesheet" type="text/css" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')

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

@ -141,7 +141,6 @@ export default class Shixuninformation extends Component {
onSubmits = () => { onSubmits = () => {
let {can_copy, use_scope, scope_partment, opening_time,oldscope_partment} = this.state; let {can_copy, use_scope, scope_partment, opening_time,oldscope_partment} = this.state;
if(this.state.opentime===true){ if(this.state.opentime===true){
if(opening_time===null){ if(opening_time===null){
this.setState({ this.setState({
@ -151,8 +150,9 @@ export default class Shixuninformation extends Component {
return return
} }
} }
if(use_scope===1){ if(use_scope===1){
if(oldscope_partment.length===0){ if(oldscope_partment.length===0&&scope_partment.length===0){
this.setState({ this.setState({
scope_partmenttype:true scope_partmenttype:true
}) })

2
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -491,7 +491,7 @@ table.text-file{}
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.subhead_content{width: 1200px;margin: 0px auto;} .subhead_content{width: 1200px;margin: 0px auto;}
.pathInfo li{text-align: center;float: left;margin-right: 38px;} .pathInfo li{text-align: center;float: left;margin-right: 30px;}
.pathInfo li span{display: block;} .pathInfo li span{display: block;}
.produce-content{padding: 40px 20px;background-color: #fff;box-sizing: border-box} .produce-content{padding: 40px 20px;background-color: #fff;box-sizing: border-box}

Write Preview
Loading…
Cancel
Save