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_cs_new
hjm 6 years ago
parent 72349a6ddd abda9ed218
commit 0369893e9a
13 changed files with 971 additions and 907 deletions
Show Stats Download Patch File Download Diff File

2
app/templates/shared/main.css
Unescape View File

@ -169,7 +169,7 @@ input::-ms-clear{display:none;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;}/*padding-bottom根据底部的高度而定*/
/*高度*/
.height-100{height: 100%;}

1
app/views/courses/search_teacher_candidate.json.jbuilder
Unescape View File

@ -3,6 +3,7 @@ json.candidates do
json.id user.id
json.name user.real_name
json.nickname user.nickname
json.login user.login
json.school_name user.user_extension.school.try(:name)
json.school_id user.user_extension.school.try(:id)
json.added @course.course_member?(user.id, [1, 2, 3])

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

@ -104,17 +104,17 @@ class ListPageIndex extends Component{
{/*头部banner*/}
<CoursesBanner {...this.props}></CoursesBanner>
{/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/}
{/* (*/}
{/* this.props.isAdmin()===true?*/}
{/* <Guide*/}
{/* setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
{/* >*/}
{/* </Guide>*/}
{/* :""*/}
{/* )*/}
{/* :""*/}
{/*}*/}
{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?
(
this.props.isAdmin()===true?
<Guide
setwindowlocal={(b)=>this.setwindowlocal(b)}
>
</Guide>
:""
)
:""
}
<div className="educontent clearfix" style={{flex: "1 0 auto"}}>

36
public/react/src/modules/courses/shixunHomework/Guide.js
Unescape View File

@ -21,21 +21,32 @@ class Guide extends Component {
}
componentDidMount() {
// 1366x768
// var mywidthone=7;
var mywidthone=0;
if(window.screen.width===1024){
mywidthone=1;
}
if(window.screen.width===1280){
else if(window.screen.width===1280){
mywidthone=2;
}
if(window.screen.width===1440){
else if(window.screen.width===1440){
mywidthone=3;
}
if(window.screen.width===1680){
else if(window.screen.width===1680){
mywidthone=4;
}
if(window.screen.width===1920){
else if(window.screen.width===1920){
mywidthone=5;
}
else if(window.screen.width===1366){
mywidthone=6;
}
else if(window.screen.width===1600){
mywidthone=7;
}
else{
mywidthone=5;
}
this.setState({
@ -54,8 +65,9 @@ class Guide extends Component {
render() {
let {page,mywidth}=this.state;
// console.log("屏幕宽度");
// console.log(window.screen.width);
// console.log(mywidth);
console.log(window.screen.width);
console.log(mywidth);
return (
<div className="guide-shadow">
<style>
@ -70,14 +82,14 @@ class Guide extends Component {
{
page===1?
<div className="guide-content">
<img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
<img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":mywidth===5?"ysldiv11900":mywidth===6?"ysldiv11366":mywidth===7?"ysldiv11600":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
</div>
:""
}
{
page===2?
<div className="guide-content">
<img className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
<img className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":mywidth===5?"ysldiv21900":mywidth===6?"ysldiv21366":mywidth===7?"ysldiv21600":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
</div>
:
""
@ -85,7 +97,7 @@ class Guide extends Component {
{
page===3?
<div className="guide-content">
<img className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
<img className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":mywidth===5?"ysldiv31900":mywidth===6?"ysldiv31366":mywidth===7?"ysldiv31600":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
</div>
:
""
@ -93,7 +105,7 @@ class Guide extends Component {
{
page===4?
<div className="guide-content">
<img className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
<img className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":mywidth===5?"ysldiv41900":mywidth===6?"ysldiv41366":mywidth===7?"ysldiv41600":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
</div>
:
""
@ -101,7 +113,7 @@ class Guide extends Component {
{
page===5?
<div className="guide-content">
<img className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
<img className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":mywidth===5?"ysldiv51900":mywidth===6?"ysldiv51366":mywidth===7?"ysldiv51600":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
</div>
:
""
@ -109,7 +121,7 @@ class Guide extends Component {
{
page===6?
<div className="guide-content">
<img className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
<img className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":mywidth===5?"ysldiv61900":mywidth===6?"ysldiv61366":mywidth===7?"ysldiv61600":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
</div>
:
""

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

@ -2492,7 +2492,7 @@ class Listofworksstudentone extends Component {
<div className="clearfix">
<span className="fl color-grey-6 font-12"><span
className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.student_works&&teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata === undefined ? "" : teacherdata.all_member_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
<style>
{
`

102
public/react/src/modules/courses/shixunHomework/guide.css
Unescape View File

@ -20,7 +20,7 @@
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.4);
transition: all .3s ease-out;
display: flex;
justify-content: center;
@ -236,15 +236,19 @@
}
.ysldiv11680{
margin-top: 11%;
margin-top: 11.5%;
margin-left: 13%;
margin-right: 10%;
margin-right: 9%;
}
.ysldiv11600{
margin-top: 12%;
margin-left: 11%;
margin-right: 7%;
}
.ysldiv11440{
margin-top: 14%;
margin-left: 7%;
margin-right: 3%;
height: 60%;
}
.ysldiv11280{
@ -253,6 +257,12 @@
margin-right: 0%;
height: 60%;
}
.ysldiv11366{
margin-top: 15%;
margin-left: 5%;
margin-right: 2%;
height: 60%;
}
.ysldiv11024{
margin-top: 20%;
margin-left: 0%;
@ -270,16 +280,19 @@
}
.ysldiv21680{
margin-top: 11%;
margin-top: 11.5%;
margin-left: 45%;
margin-right: 20%;
height: 24%;
}
.ysldiv21600{
margin-top: 12%;
margin-left: 47%;
margin-right: 20%;
}
.ysldiv21440{
margin-top: 14%;
margin-left: 47%;
margin-right: 17%;
height: 25%;
}
.ysldiv21280{
@ -288,6 +301,12 @@
margin-right: 14%;
height: 25%;
}
.ysldiv21366{
margin-top: 15%;
margin-left: 51%;
margin-right: 14%;
height: 23%;
}
.ysldiv21024{
margin-top: 20%;
margin-left: 61%;
@ -303,12 +322,17 @@
}
.ysldiv31680{
margin-top: 11%;
margin-top: 11.5%;
margin-left: 14%;
margin-right: 45%;
}
.ysldiv31600{
margin-top: 12%;
margin-left: 12%;
margin-right: 45%;
}
.ysldiv31440{
margin-top: 13%;
margin-top: 13.5%;
margin-left: 8%;
margin-right: 44%;
}
@ -318,6 +342,11 @@
margin-left: 3%;
margin-right: 44%;
}
.ysldiv31366{
margin-top: 14%;
margin-left: 6%;
margin-right: 43%;
}
.ysldiv31024{
margin-top: 18%;
margin-left: 1%;
@ -327,27 +356,37 @@
/*目录管理*/
.ysldiv41900{
margin-top: 18%;
margin-top: 16%;
margin-left: 19%;
margin-right: 28%;
margin-right: 29%;
}
.ysldiv41680{
margin-top: 21%;
margin-top: 18%;
margin-left: 14%;
margin-right: 24%;
}
.ysldiv41600{
margin-top: 19%;
margin-left: 12%;
margin-right: 23%;
}
.ysldiv41440{
margin-top: 24%;
margin-top: 21%;
margin-left: 8%;
margin-right: 19%;
margin-right: 20%;
}
.ysldiv41280{
margin-top: 27%;
margin-top: 24%;
margin-left: 3%;
margin-right: 17%;
}
.ysldiv41366{
margin-top: 22%;
margin-left: 6%;
margin-right: 20%;
}
.ysldiv41024{
margin-top: 29%;
margin-left: 0%;
@ -356,27 +395,37 @@
/*导航排序*/
.ysldiv51900{
margin-top: 18%;
margin-top: 16%;
margin-left: 18%;
margin-right: 42%;
}
.ysldiv51680{
margin-top: 20%;
margin-top: 18%;
margin-left: 13%;
margin-right: 41%;
margin-right: 40%;
}
.ysldiv51600{
margin-top: 19%;
margin-left: 11%;
margin-right: 39%;
}
.ysldiv51440{
margin-top: 24%;
margin-top: 21%;
margin-left: 7%;
margin-right: 38%;
margin-right: 39%;
}
.ysldiv51280{
margin-top: 27%;
margin-top: 24%;
margin-left: 2%;
margin-right: 38%;
}
.ysldiv51366{
margin-top: 22%;
margin-left: 5%;
margin-right: 39%;
}
.ysldiv51024{
margin-top: 34%;
margin-left: -1%;
@ -395,6 +444,11 @@
margin-left: 31%;
margin-right: 14%;
}
.ysldiv61600{
margin-top: 19%;
margin-left: 30%;
margin-right: 12%;
}
.ysldiv61440{
margin-top: 21%;
margin-left: 28%;
@ -407,6 +461,12 @@
margin-right: 3%;
height: 53%;
}
.ysldiv61366{
margin-top: 22%;
margin-left: 26%;
margin-right: 6%;
height: 53%;
}
.ysldiv61024{
margin-top: 26%;
margin-left: 27%;

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

@ -649,7 +649,7 @@ submittojoinclass=(value)=>{
return (
<div className="newHeader" id="nHeader" >
<div className="newHeaders" id="nHeader" >
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
@ -662,7 +662,7 @@ submittojoinclass=(value)=>{
{...this.props}
{...this.state}
/>:""}
<a href="/" className={"fl mr60 ml25"}>
<a href="/" className={"fl mr60 ml25 mt15"}>
<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
</a>

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

@ -471,6 +471,21 @@ class TPMBanner extends Component {
})
}
showonMouseOver=()=>{
$("#ratePanel").show();
this.setState({
showradios:true
})
}
hideonMouseOut=()=>{
$("#ratePanel").hide();
this.setState({
showradios:false
})
}
render() {
let {
Forkvisible,
@ -541,21 +556,6 @@ class TPMBanner extends Component {
// }
// }
// }
$("#commentsStar").hover(()=>{
$("#ratePanel").show();
this.setState({
showradios:true
})
},()=>{
$("#ratePanel").hide();
this.setState({
showradios:false
})
})
const radioStyle = {
display: 'block',
height: '30px',
@ -617,12 +617,12 @@ class TPMBanner extends Component {
</li>
</ul>
<div className="pr fl" id="commentsStar">
<div className="pr fl" id="commentsStar" onMouseOver={()=>this.showonMouseOver()}>
<div className={"color-grey-c mb11"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
<div className="rateYo">
<Rating value={star_info[0]} disabled allowHalf/>
</div>
<div id="ratePanel" className="showratePanel" style={{"width":"512px"}}>
<div id="ratePanel" className="showratePanel" style={{"width":"512px"}} onMouseOut={()=>this.hideonMouseOut()}>
<div className="pr">
<span className="rateTrangle"></span>
<div className="pr clearfix ratePanelContent" style={{height: '177px'}}>
@ -638,7 +638,7 @@ class TPMBanner extends Component {
</div>
</div>
</div>
<div className="fr">
<div className="fr width360">
<div className="clearfix">
<div className="rateYo fl mt3">
{showradios === true ?

17
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" />')
// .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?7`));
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?7`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
// index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?7`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')
@ -361,7 +361,16 @@ export function TPMIndexHOC(WrappedComponent) {
max-width: unset;
overflow: hidden;
}
.newHeaders{
max-width: unset;
background: #24292D !important;
width: 100%;
height: 60px !important;
min-width: 1200px;
z-index: 1000;
-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1);
box-shadow: 0px 0px 12px rgba(0,0,0,0.1);
}
`
}</style>
<NewHeader {...this.state} {...this.props}></NewHeader>

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

@ -15,7 +15,7 @@ import axios from 'axios';
import './css/TPMsettings.css';
import { getImageUrl, toPath, getUrl } from 'educoder';
import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll} from 'educoder';
let origin = getUrl();
@ -1338,11 +1338,15 @@ export default class TPMsettings extends Component {
}
handleChange = (info) => {
console.log("handleChange1");
let fileList = info.fileList;
this.setState({ fileList:fileList,
let {fileList}=this.state;
if(fileList.length===0){
let fileLists = info.fileList;
this.setState({ fileList:fileLists,
deleteisnot:false});
}
}
onAttachmentRemove = (file) => {
confirm({
title: '确定要删除这个附件吗?',
@ -1668,22 +1672,11 @@ export default class TPMsettings extends Component {
<div className="mt10" style={{
display: "inline-block"
}}>
{
this.state.deleteisnot=== true?
<Upload {...uploadProps} >
<Icon type="upload" className="fl mt3" > </Icon>
<span className="color-blue fl cdefault">上传附件</span>
<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
</Upload>
:
<Upload {...uploadProps} disabled={true} >
<Icon type="upload" className="fl mt3" > </Icon>
<span className="color-grey-c fl">上传附件</span>
<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
</Upload>
}
</div>
</li>
<div className={"color-red shixunspanred"}>

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

@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {TPMIndexHOC} from '../TPMIndexHOC';
import {SnackbarHOC} from 'educoder';
import {SnackbarHOC,appendFileSizeToUploadFileAll} from 'educoder';
import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification} from 'antd';
@ -760,12 +760,17 @@ class Newshixuns extends Component {
// 附件相关 START
handleChange = (info) => {
let {fileList}=this.state;
console.log("handleChange1");
let fileList = info.fileList;
if(fileList.length===0){
let fileLists = info.fileList;
this.setState({
fileList:fileList,
// fileList:appendFileSizeToUploadFileAll(fileList),
fileList:fileLists,
deleteisnot:false});
}
}
onAttachmentRemove = (file) => {
confirm({
title: '确定要删除这个附件吗?',
@ -1051,32 +1056,12 @@ class Newshixuns extends Component {
<div className="mt10" style={{
display: "inline-block"
}}>
{/*<Form.Item>*/}
{/* {*/}
{/* getFieldDecorator('file',{*/}
{/* rules:[{*/}
{/* }]*/}
{/* })(*/}
{
deleteisnot=== true?
<Upload {...uploadProps} >
<Upload {...uploadProps}>
<Icon type="upload" className="fl mt3" > </Icon>
<span className="color-blue fl cdefault">上传附件</span>
<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
</Upload>
:
<Upload {...uploadProps} disabled={true} >
<Icon type="upload" className="fl mt3" > </Icon>
<span className="color-grey-c fl">上传附件</span>
<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
</Upload>
}
{/* )*/}
{/* }*/}
{/*</Form.Item>*/}
</div>
</li>

4
public/react/src/modules/tpm/shixuns/css/TPMBanner.css
Unescape View File

@ -106,3 +106,7 @@ a:active{text-decoration:none;}
display: flex;
justify-content: flex-end;
}
.width360{
width:360px;
}

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

@ -169,7 +169,7 @@ input::-ms-clear{display:none;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;}/*padding-bottom根据底部的高度而定*/
.newMain{ padding-bottom: 120px !important; }
/*高度*/

Write Preview
Loading…
Cancel
Save