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

merge

Browse Source
dev_home
cxt 5 years ago
parent 9b0b924dc2 fdc0b2947e
commit 269c900cac
16 changed files with 117 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/shixun_lists_controller.rb
Unescape View File

@ -1,6 +1,6 @@
class ShixunListsController < ApplicationController
def index
@results = ShixunSearchService.call(search_params, request.subdomain)
@results = ShixunSearchService.call(search_params, current_laboratory)
end
private

10
app/controllers/shixuns_controller.rb
Unescape View File

@ -974,8 +974,14 @@ class ShixunsController < ApplicationController
end
@course_count = course_ids.length
@courses = Course.where(:id => course_ids).page(page).per(limit)
@courses = Course.where(:id => course_ids)
## 云上实验室过滤
unless current_laboratory.main_site?
@courses = @courses.where(laboratory_id: current_laboratory.id )
end
@course_count = @courses.count
@courses = @courses.page(page).per(limit)
end
# 将实训发送到课程

2
app/controllers/subject_lists_controller.rb
Unescape View File

@ -1,6 +1,6 @@
class SubjectListsController < ApplicationController
def index
@results = SubjectSearchService.call(search_params, request.subdomain)
@results = SubjectSearchService.call(search_params, current_laboratory)
end
private

4
app/controllers/subjects_controller.rb
Unescape View File

@ -204,6 +204,10 @@ class SubjectsController < ApplicationController
WHERE m.course_id = c.id AND m.role in (1,2,3)
AND m.user_id=#{current_user.id} AND c.is_delete = 0 AND c.is_end = 0").map(&:id)
@courses = Course.where(id: course_ids)
## 云上实验室过滤
unless current_laboratory.main_site?
@courses = @courses.where(laboratory_id: current_laboratory.id )
end
@none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
end

4
app/models/laboratory.rb
Unescape View File

@ -9,10 +9,10 @@ class Laboratory < ApplicationRecord
has_many :portal_images, dependent: :destroy
has_many :laboratory_shixuns, dependent: :destroy
has_many :shixuns, through: :laboratory_shixuns, source: :shixun
# has_many :shixuns, through: :laboratory_shixuns, source: :shixun
has_many :laboratory_subjects, dependent: :destroy
has_many :subjects, through: :laboratory_subjects, source: :subject
# has_many :subjects, through: :laboratory_subjects, source: :subject
has_many :courses, dependent: :destroy
has_many :competitions, dependent: :destroy

15
app/services/shixun_search_service.rb
Unescape View File

@ -1,11 +1,11 @@
class ShixunSearchService < ApplicationService
include ElasticsearchAble
attr_reader :params, :subdomain
attr_reader :params, :laboratory
def initialize(params, subdomain)
def initialize(params, laboratory)
@params = params
@subdomain = subdomain
@laboratory = laboratory
end
def call
@ -36,8 +36,13 @@ class ShixunSearchService < ApplicationService
@shixuns = @shixuns.where(trainee: params[:diff])
end
laboratory = Laboratory.find_by_subdomain(subdomain)
@shixuns = @shixuns.where(id: laboratory.shixuns) if laboratory
## 云上实验室过滤
unless laboratory.main_site?
@shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: @laboratory.id })
end
# laboratory = Laboratory.find_by_subdomain(subdomain)
# @shixuns = @shixuns.where(id: laboratory.shixuns) if laboratory
Shixun.search(keyword, search_options)
end

15
app/services/subject_search_service.rb
Unescape View File

@ -1,11 +1,11 @@
class SubjectSearchService < ApplicationService
include ElasticsearchAble
attr_reader :params, :subdomain
attr_reader :params, :laboratory
def initialize(params, subdomain)
def initialize(params, laboratory)
@params = params
@subdomain = subdomain
@laboratory = laboratory
end
def call
@ -18,8 +18,13 @@ class SubjectSearchService < ApplicationService
@subjects = Subject.visible.unhidden
end
laboratory = Laboratory.find_by_subdomain(subdomain)
@subjects = @subjects.where(id: laboratory.subjects) if laboratory
# laboratory = Laboratory.find_by_subdomain(subdomain)
# @subjects = @subjects.where(id: laboratory.subjects) if laboratory
## 云上实验室过滤
unless laboratory.main_site?
@subjects = @subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: laboratory.id })
end
Subject.search(keyword, search_options)
end

7
public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
Unescape View File

@ -73,10 +73,11 @@ class CompetitionsIndex extends Component{
<style>
{
`
.courses-head{
.courses-head{
width: 100%;
height: 300px;
background-color: #081C4B;
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
background-color: #081C4B;
background-size: cover;
background-position: center;
background-repeat: no-repeat;
@ -85,7 +86,7 @@ class CompetitionsIndex extends Component{
`
}
</style>
<div className="courses-head pr Competitionshead " style={{"background":`url(${getImageUrl(`images/educoder/competitions/courses.jpg`)})`}}>
<div className="courses-head pr Competitionshead ">
<div className="edu-txt-center pathNavLine">
<div className="inline path-nav"></div>
</div>

16
public/react/src/modules/courses/coursesHome/CoursesHome.js
Unescape View File

@ -111,6 +111,22 @@ class CoursesHome extends Component{
{...this.state}
/>}
<div className="newMain clearfix">
<style>
{
`
.courses-head{
width: 100%;
height: 300px;
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
background-color: #081C4B;
background-size: cover;
background-position: center;
background-repeat: no-repeat;
}
`
}
</style>
<div className="courses-head pr" >
<div className="edu-txt-center pathNavLine">
<div className="inline path-nav">

18
public/react/src/modules/courses/coursesHome/css/CoursesHome.css
Unescape View File

@ -1,12 +1,12 @@
.courses-head{
width: 100%;
height: 300px;
background-image: url(./courses.jpg);
background-color: #081C4B;
background-size: cover;
background-position: center;
background-repeat: no-repeat;
}
/*.courses-head{*/
/*width: 100%;*/
/*height: 300px;*/
/*background-image: url(./courses.jpg);*/
/*background-color: #081C4B;*/
/*background-size: cover;*/
/*background-position: center;*/
/*background-repeat: no-repeat;*/
/*}*/
a{
text-decoration: none;
color: #05101a;

6
public/react/src/modules/moop_cases/CaseList.js
Unescape View File

@ -3,7 +3,7 @@ import { Input , Spin , Pagination } from "antd";
import './css/moopCases.css'
import '../courses/css/Courses.css'
import { ActionBtn , LinkAfterLogin } from 'educoder';
import { ActionBtn , LinkAfterLogin ,getImageUrl} from 'educoder';
import axios from 'axios'
@ -98,8 +98,8 @@ class CaseList extends Component{
return(
<React.Fragment>
<img src={mainImg} width="100%" />
<div className="educontent">
<img src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)} width="100%" />
<div className="educontent">
<div className="edu-back-white mb30 mt30">
<p className="padding20-30 clearfix bor-bottom-greyE">
<span className="font-18 fl color-grey-3">教学案例</span>

4
public/react/src/modules/paths/Index.js
Unescape View File

@ -49,7 +49,9 @@ class Index extends Component{
></Route>
{/*<Route path="/paths/:pathId" exact component = {PathsDetail} {...this.props} {...this.state}></Route>*/}
<Route exact path="/paths" exact component={ShixunPaths} {...this.props} {...this.state}></Route>
<Route path="/paths" exact
render={(props)=>(<ShixunPaths {...this.props} {...this.state} {...props}/>)}
></Route>
</Switch>
</div>
)

23
public/react/src/modules/paths/ShixunPathSearch.js
Unescape View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import axios from 'axios';
import {Input} from 'antd';
import {getImageUrl} from 'educoder';
import PathCard from "./ShixunPathCard.js";
import PathCard from "./ShixunPathCard";
import UpgradeModals from '../modals/UpgradeModals';
import Pagination from '@icedesign/base/lib/pagination';
import '@icedesign/base/lib/pagination/style.js';
@ -116,11 +116,14 @@ class ShixunPathSearch extends Component{
render() {
let { order,sortList,search,page,total_count,select }=this.state;
// console.log()
return (
<div>
{this.state.updata===undefined?"":<UpgradeModals
{...this.state}
/>}
<<<<<<< HEAD
{/*<style>*/}
{/*{*/}
{/*`*/}
@ -136,6 +139,24 @@ class ShixunPathSearch extends Component{
{/*`*/}
{/*}*/}
{/*</style>*/}
=======
<style>
{
`
.pathImg{
width: 100%;
height: 300px;
background-image: url(${getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url===null?`images/path/path.png`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url)});
background-color: #000a4f;
/* background-size: cover; */
background-position: center;
background-repeat: no-repeat;
}
`
}
</style>
>>>>>>> develop
<div className="pr">
<div className="pathImg"></div>
<div className="edu-back-white padding20 pathIndexNav">

18
public/react/src/modules/paths/ShixunPaths.css
Unescape View File

@ -22,15 +22,15 @@
background: #DDECF9;
color: #4CACFF
}
.pathImg{
width: 100%;
height: 300px;
background-image: url(../../images/path/path.png);
background-color: #000a4f;
/* background-size: cover; */
background-position: center;
background-repeat: no-repeat;
}
/*.pathImg{*/
/*width: 100%;*/
/*height: 300px;*/
/*background-image: url(../../images/path/path.png);*/
/*background-color: #000a4f;*/
/*!* background-size: cover; *!*/
/*background-position: center;*/
/*background-repeat: no-repeat;*/
/*}*/
/* 首页-最新最热 */
.mainPageArray span{

5
public/react/src/modules/paths/ShixunPaths.js
Unescape View File

@ -16,7 +16,10 @@ class ShixunPath extends Component{
return(
<div>
<div className="newMain clearfix">
<PathSearch></PathSearch>
<PathSearch
{...this.state}
{...this.props}
></PathSearch>
</div>
</div>

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

@ -19,8 +19,17 @@ class NewFooter extends Component {
return (
<div className="newFooter edu-txt-center ">
{/*newContainers*/}
{this.props.user&&this.props.user.main_site===false?<style>
{
`
.newFooter {
height: 50px;
}
`
}
</style>:""}
<div className="inner-footer_con">
<div className="footercon">
{this.props.user&&this.props.user.main_site===true?<div className="footercon">
{/* <div className="inline mt40 mb5">
<a href="/" className="fl" style={{height:'70px'}}>
<img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
@ -37,7 +46,7 @@ class NewFooter extends Component {
<li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
<li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
</ul>
</div>
</div>:""}
<div>
{this.props.mygetHelmetapi === null ? "" :
this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?

Write Preview
Loading…
Cancel
Save