Merge branch 'educoder' into dev_aliyun

dev_aliyun
cxt 6 years ago
commit 4e71101a36

@ -18,7 +18,7 @@ class EcloudController < ApplicationController
skip_before_filter :verify_authenticity_token
before_filter :save_para
before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
# before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
before_filter :user_setup
# before_filter :require_login, only: [:authorize]

@ -179,6 +179,8 @@ class ManagementsController < ApplicationController
if params[:search]
if params[:search].to_i.to_s == params[:search].to_s
myshixun_id = Game.where(:myshixun_id => params[:search].to_i).pluck(:myshixun_id)
game_myshixun_id = Game.where(:id => params[:search].to_i).pluck(:myshixun_id)
myshixun_id = myshixun_id + game_myshixun_id
else
myshixun_id = Game.where(:identifier => params[:search]).pluck(:myshixun_id)
end

@ -3,7 +3,7 @@
<div class="head-nav pr">
<ul id="header-nav">
<li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
<!-- <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
<!-- 精选实训 -->

@ -5,7 +5,7 @@
<div class="head-nav pr">
<ul id="header-nav">
<li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
<!-- <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>

@ -1,5 +0,0 @@
class AddExecTimeToEvaluateRecords < ActiveRecord::Migration
def change
add_column :evaluate_records, :exec_time, :integer
end
end

@ -86,10 +86,11 @@ task :add_test_users => :environment do
(1..1000).each do |i|
(1..2000).each do |i|
puts i
no = sprintf("%04d", i)
phone = "5160731#{no}"
phone = "6160731#{no}"
us = UsersService.new
user = us.register phone: phone, password: 'edu12345678'
@ -100,7 +101,7 @@ task :add_test_users => :environment do
,,,,,,,,,,,,,,,,,,绿,,,
,,,,,,,,,,访,,绿,,,,,,,,,
,,绿,,,,,,,,,,,,,,,,,,,
,绿,,,,,,,,,绿,,,,,,,,,,
,绿,,,,,,,,,,绿,,,,,,,,,,
,,,,,,,,,,,,,,,,,".split(",")
lastname = l[rand(l.length)] + f[rand(f.length)]
@ -109,7 +110,7 @@ task :add_test_users => :environment do
lastname: lastname,
nickname: '',
sex: 0,
mail: "00educoder#{no}@qq.com",
mail: "stueducoder#{no}@qq.com",
identity: 1,
te_technical_title: 0,
pro_technical_title: 0,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

@ -66,7 +66,12 @@ class CommunityHome extends Component {
}
let xhslist=["路由交换","H3CNA","H3CNE","H3CSE-Routing&Switching","H3CTE","","","H3CNE-SDN","","H3CIE-Routing&SWitching"]
return (
<div className="edu-con-bg01" style={{paddingTop: '50px',paddingBottom: '231px'}}>
<div className="edu-con-bg01 communityHome" style={{paddingTop: '60px',paddingBottom: '231px'}}>
<style>{`
.communityHome .ant-carousel .slick-slide {
height: 500px;
}
`}</style>
<div className="Community_Home_Top" style={{width:BrowserType===true?'100%':'100.9%'}}>
{ BannersUrl===""?"":

@ -558,4 +558,8 @@ a.TrainingLecturer:hover{
.mt60{
margin-top:60px;
}
.SystemParameters{
height:auto;
}

@ -28,7 +28,7 @@
}
.SystemParameters {
height: 60px;
min-height: 60px;
}
p {

@ -470,7 +470,7 @@ class ecCourseSupports extends Component {
</Modal>
<div className="educontent mb290 mt60">
<div className="educontent mb290">
<EcTitleCourseEvaluations
{...this.props}

Loading…
Cancel
Save