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

调整

Browse Source
dev_forum
杨树明 6 years ago
parent 5377f4dc74
commit 8fc86ecf9b
6 changed files with 1385 additions and 1374 deletions
Show Stats Download Patch File Download Diff File

2576
public/javascripts/educoder/edu_application.js
View File

File diff suppressed because it is too large Load Diff

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

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

8
public/react/src/modules/home/shixunsHome.js
Unescape View File

@ -198,13 +198,13 @@ class ShixunsHome extends Component {
</div> </div>
<Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link> <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
<div className="square-list clearfix"> <div className="square-list clearfix" style={{width:'102%'}}>
{homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{ {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
if(key<8) if(key<8)
return( return(
<div className="square-Item" key={key} id={item.id}> <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
<div className="tag-green"> <div className="tag-green">
<span className="tag-name"> {item.name}</span> <span className="tag-name"> {item.name}</span>
@ -272,10 +272,10 @@ class ShixunsHome extends Component {
</div> </div>
<Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link> <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
<div className="square-list clearfix"> <div className="square-list clearfix" style={{width:'102%'}}>
{homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{ {homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{
return( return(
<div className="square-Item" key={key} id={item.id}> <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
<div className="tag-green"> <div className="tag-green">
<span className="tag-name"> {item.tag_name}</span> <span className="tag-name"> {item.tag_name}</span>

98
public/react/src/modules/tpm/NewFooter.js
Unescape View File

@ -1,49 +1,49 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Redirect } from 'react-router'; import { Redirect } from 'react-router';
import { getImageUrl, toPath } from 'educoder' import { getImageUrl, toPath } from 'educoder'
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
class NewFooter extends Component { class NewFooter extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
componentWillReceiveProps(newProps, newContext) { componentWillReceiveProps(newProps, newContext) {
} }
render() { render() {
return ( return (
<div className="newFooter edu-txt-center"> <div className="newFooter edu-txt-center newContainers">
<div className="inner-footer_con"> <div className="inner-footer_con">
<div className="footercon"> <div className="footercon">
<div className="inline mt40 mb5"> <div className="inline mt40 mb5">
<a href="/" className="fl" style={{height:'70px'}}> <a href="/" className="fl" style={{height:'70px'}}>
<img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px"> <img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
</img> </img>
</a> </a>
<span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span> <span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
</div> </div>
<ul className="clearfix inner-footernav"> <ul className="clearfix inner-footernav">
<li><a href="/" className="fl" target="_blank">网站首页</a></li> <li><a href="/" className="fl" target="_blank">网站首页</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li> <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li>
</ul> </ul>
</div> </div>
<div> <div>
<p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p> <p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p>
</div> </div>
<div className="cl"></div> <div className="cl"></div>
</div> </div>
</div> </div>
); );
} }
} }
export default NewFooter; export default NewFooter;

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

@ -23,7 +23,7 @@ $(window).scroll(function(){
}); });
function rightSlider(){ function rightSlider(){
var poi=parseInt((parseInt($(window).width())- 1200 )/2)-60; var poi=parseInt((parseInt($(window).width())- 1200 )/2)-34;
// console.log(parseInt($(window).width())+" "+poi); // console.log(parseInt($(window).width())+" "+poi);
if(poi>0){ if(poi>0){
$(".-task-sidebar").css("right",poi); $(".-task-sidebar").css("right",poi);

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

@ -294,23 +294,34 @@ export function TPMIndexHOC(WrappedComponent) {
return ( return (
<div> <div>
<SiderBar Headertop={Headertop}/>
<SiderBar <style>{
Headertop={Headertop} `
/> .newContainers{
<NewHeader {...this.state} {...this.props}></NewHeader> width: 100%;
<div className="newContainer"> min-width: 1440px;
<WrappedComponent initCommonState={(user)=>this.initCommonState(user)} max-width: unset;
{...this.props} {...this.state} }
showShixun={this.showShixun} aboutFocus={this.aboutFocus} // .-task-sidebar{
{...common} // right: 270px !important;
> // }
</WrappedComponent> `
}</style>
</div> <NewHeader {...this.state} {...this.props}></NewHeader>
<NewFooter <div className="newContainer newContainers">
Footerdown={Footerdown} <WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
/> {...this.props} {...this.state}
showShixun={this.showShixun} aboutFocus={this.aboutFocus}
{...common}
>
</WrappedComponent>
</div>
<NewFooter
Footerdown={Footerdown}
/>
</div> </div>
); );
} }

Write Preview
Loading…
Cancel
Save