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

Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_forum
杨树林 5 years ago
parent 11cd50eb75 f2097f2a11 c1284c229b
commit edaf04695d
29 changed files with 201 additions and 101 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/application_controller.rb
Unescape View File

@ -229,7 +229,7 @@ class ApplicationController < ActionController::Base
uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous")) uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
if !User.current.logged? && Rails.env.development? if !User.current.logged? && Rails.env.development?
User.current = User.find 12 User.current = User.find 57703
end end
if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除 if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除

2
app/controllers/concerns/controller_rescue_handler.rb
Unescape View File

@ -3,7 +3,7 @@ module ControllerRescueHandler
included do included do
rescue_from Exception do |e| rescue_from Exception do |e|
logger.error e Util.logger_error e
render json: {status: -1, message: e.message} render json: {status: -1, message: e.message}
end end
# rescue_from ActionView::MissingTemplate, with: :object_not_found # rescue_from ActionView::MissingTemplate, with: :object_not_found

2
app/controllers/concerns/paginate_helper.rb
Unescape View File

@ -1,7 +1,7 @@
module PaginateHelper module PaginateHelper
def paginate(objs, **opts) def paginate(objs, **opts)
page = params[:page].to_i <= 0 ? 1 : params[:page].to_i page = params[:page].to_i <= 0 ? 1 : params[:page].to_i
per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : 20 per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : opts[:per_page] || 20
Kaminari.paginate_array(objs).page(page).per(per_page) Kaminari.paginate_array(objs).page(page).per(per_page)
end end

2
app/controllers/departments_controller.rb
Unescape View File

@ -1,6 +1,6 @@
class DepartmentsController < ApplicationController class DepartmentsController < ApplicationController
def for_option def for_option
render_ok(departments: current_school.departments.select(:id, :name).as_json) render_ok(departments: current_school.departments.without_deleted.select(:id, :name).as_json)
end end
private private

21
app/controllers/tidings_controller.rb
Unescape View File

@ -1,19 +1,32 @@
class TidingsController < ApplicationController class TidingsController < ApplicationController
include PaginateHelper
after_action :update_onclick_time!, only: [:index]
def index def index
tidings = current_user.tidings.order(created_at: :desc) tidings = current_user.tidings
tiding_types = tiding_types =
case params[:type] case params[:type]
when 'notice' then 'System' when 'notice' then 'System'
when 'apply' then 'Apply' when 'apply' then 'Apply'
when 'course' then %w(HomeworkCommon Exercise Poll) when 'course' then %w(HomeworkCommon Exercise Poll GraduationTask GraduationTopic)
when 'project' then 'Project' when 'project' then 'Project'
when 'interaction' then %w(Comment Mentioned Praise Fan) when 'interaction' then %w(Comment Mentioned Praise Fan)
when 'project_package' then %w(Created Destroyed Bidding BiddingEnd BiddingWon BiddingLost)
end end
tidings = tidings.where(tiding_type: tiding_types) if tiding_types.present? tidings = tidings.where(tiding_type: tiding_types) if tiding_types.present?
tidings = tidings.where(container_type: 'ProjectPackage') if params[:type] == 'project_package'
@count = tidings.count @count = tidings.count
@tidings = paginate tidings @tidings = paginate(tidings.order(created_at: :desc), per_page: 10)
@onclick_time = current_user.click_time
end
private
def update_onclick_time!
current_user.onclick_time.touch(:onclick_time)
end end
end end

20
app/decorators/tiding_decorator.rb
Unescape View File

@ -8,6 +8,10 @@ module TidingDecorator
time_from_now(created_at) time_from_now(created_at)
end end
def unread?(time)
created_at > time
end
# 组装国际化路径：locale_format('Apply', 1) ==> tiding.ApplyUserAuthentication.Apply.1_end # 组装国际化路径：locale_format('Apply', 1) ==> tiding.ApplyUserAuthentication.Apply.1_end
def locale_format(*arr) def locale_format(*arr)
arr.unshift("tiding.#{container_type}").join('.') << '_end' arr.unshift("tiding.#{container_type}").join('.') << '_end'
@ -340,4 +344,20 @@ module TidingDecorator
def department_content def department_content
I18n.t(locale_format) % [container.try(:name), container.try(:school)&.name] I18n.t(locale_format) % [container.try(:name), container.try(:school)&.name]
end end
def library_content
if tiding_type == 'System'
I18n.t(locale_format(tiding_type, status), reason: extra) % container.try(:title)
else
I18n.t(locale_format) % container.try(:title)
end
end
def project_package_content
if tiding_type == 'System'
I18n.t(locale_format(tiding_type, status), reason: extra) % container.try(:title)
else
I18n.t(locale_format(tiding_type)) % [container.try(:title) || extra]
end
end
end end

2
app/models/department.rb
Unescape View File

@ -2,4 +2,6 @@ class Department < ApplicationRecord
belongs_to :school belongs_to :school
has_many :department_members, dependent: :destroy has_many :department_members, dependent: :destroy
scope :without_deleted, -> { where(is_delete: false) }
end end

6
app/views/tidings/_tiding.json.jbuilder
Unescape View File

@ -1,9 +1,11 @@
json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_type, :parent_container_type json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, :parent_container_id, :parent_container_type
json.content tiding.content json.content tiding.content
json.identifier tiding.try(:container).try(:identifier) rescue nil
json.time tiding.how_long_time json.time tiding.how_long_time
json.new_tiding tiding.unread?(@onclick_time)
json.trigger_user do json.trigger_user do
json.partial! 'users/user_simple', user: tiding.trigger_user json.partial! 'users/user_simple', user: tiding.trigger_user_id.zero? ? User.find(1) : tiding.trigger_user
end end
json.attachments tiding.attachments, partial: 'attachments/attachment_small', as: :attachment json.attachments tiding.attachments, partial: 'attachments/attachment_small', as: :attachment

1
app/views/users/get_user_info.json.jbuilder
Unescape View File

@ -14,6 +14,7 @@ if @course
if params[:group_info] if params[:group_info]
json.group_info @course.teacher_group(@user.id) if @course_identity < Course::STUDENT json.group_info @course.teacher_group(@user.id) if @course_identity < Course::STUDENT
end end
json.first_category_url module_url(@course.none_hidden_course_modules.first, @course)
end end
if params[:school] if params[:school]

16
config/locales/tidings/zh-CN.yml
Unescape View File

@ -199,3 +199,19 @@
Apply_end: "发起了匿评申诉申请：%s" Apply_end: "发起了匿评申诉申请：%s"
HomeworkCommon_end: "有人对你的匿评发起了申诉：%s" HomeworkCommon_end: "有人对你的匿评发起了申诉：%s"
Department_end: "你选填的二级单位：%s（%s）因不符合规范,已被系统删除.请重新选择" Department_end: "你选填的二级单位：%s（%s）因不符合规范,已被系统删除.请重新选择"
Library:
Apply_end: "申请发布教学案例：%s"
System:
1_end: "你提交的发布教学案例申请：%s，审核已通过"
2_end: "你提交的发布教学案例申请：%s，审核未通过，原因：%{reason}"
ProjectPackage:
Apply_end: "申请发布众包需求：%s"
System:
1_end: "你提交的众包需求申请：%s，审核已通过"
2_end: "你提交的众包需求申请：%s，审核未通过，原因：%{reason}"
Created_end: "你创建了众包需求：%s"
Destroyed_end: "你删除了众包需求：%s"
Bidding_end: "应征了你发布的众包任务：%s"
BiddingEnd_end: "你发布的众包任务：%s，已进入选标阶段，请尽快进行选择确认！"
BiddingWon_end: "恭喜，你应征的众包任务：%s，在评选环节中标了"
BiddingLost_end: "很遗憾，你应征投稿的众包任务：%s，未中标"

2
config/routes.rb
Unescape View File

@ -4,6 +4,8 @@ Rails.application.routes.draw do
require 'admin_constraint' require 'admin_constraint'
mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new
get 'attachments/download/:id', to: 'attachments#show'
resources :edu_settings resources :edu_settings
scope '/api' do scope '/api' do
get 'home/index' get 'home/index'

24
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -78,12 +78,12 @@ class GraduationTasksSubmitedit extends Component{
} }
setedit=()=>{ setedit=()=>{
let coursesId=this.props.match.params.coursesId; // let coursesId=this.props.match.params.coursesId;
let workId=this.props.match.params.work_Id; // let workId=this.props.match.params.work_Id;
let {workslist}=this.state // let {workslist}=this.state
let task_id=workslist&&workslist.task_id; // let task_id=workslist&&workslist.task_id;
// window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit"; // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; this.goback()
} }
@ -96,11 +96,13 @@ class GraduationTasksSubmitedit extends Component{
} }
goback=()=>{ goback=()=>{
let courseId=this.props.match.params.coursesId;
let work_Id=this.props.match.params.work_Id;
// window.location.href="/courses/"+courseId+"/graduation/graduation_tasks/"+category_id; let courseId=this.props.match.params.coursesId;
window.location.href="/courses/"+courseId+"/graduation_tasks/"+work_Id+"/appraise"; if(courseId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
@ -568,7 +570,7 @@ class GraduationTasksSubmitedit extends Component{
<p className="clearfix mt10"> <p className="clearfix mt10">
{/*<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/} {/*<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
{/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/} {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">毕设任务</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+work_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+work_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@ -825,7 +827,7 @@ class GraduationTasksSubmitedit extends Component{
<Form.Item> <Form.Item>
<div className="clearfix mt30 mb30"> <div className="clearfix mt30 mb30">
<Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button> <Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
<a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a> <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
</div> </div>
</Form.Item> </Form.Item>
{/*</Form>*/} {/*</Form>*/}

13
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -100,9 +100,12 @@ class GraduationTasksSubmitnew extends Component{
goback=()=>{ goback=()=>{
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
let category_id=this.props.match.params.category_id; if(courseId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
} }
@ -438,7 +441,7 @@ class GraduationTasksSubmitnew extends Component{
spinnings:false spinnings:false
}) })
if(response!==undefined){ if(response!==undefined){
this.setedit(response.data.work_id) this.goback()
} }
// if(response.status===200) { // if(response.status===200) {
// GraduationTasksnewtype=false; // GraduationTasksnewtype=false;
@ -567,7 +570,7 @@ render(){
<p className="clearfix mt10"> <p className="clearfix mt10">
{/*<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/} {/*<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
{/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/} {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">毕设任务</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@ -802,7 +805,7 @@ render(){
<Form.Item> <Form.Item>
<div className="clearfix mt30 mb30"> <div className="clearfix mt30 mb30">
<Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button> <Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
<a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a> <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
</div> </div>
</Form.Item> </Form.Item>
{/*</Form>*/} {/*</Form>*/}

8
public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
Unescape View File

@ -70,7 +70,13 @@ class GraduationTasksappraise extends Component{
// let category_id=this.props.match.params.category_id; // let category_id=this.props.match.params.category_id;
// //
// window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id; // window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
window.history.go(-1) let courseId=this.props.match.params.coursesId;
if(courseId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
Cancelvisible=()=>{ Cancelvisible=()=>{

17
public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
Unescape View File

@ -81,10 +81,13 @@ class GraduationTasksedit extends Component{
goback=()=>{ goback=()=>{
// let courseId=this.props.match.params.coursesId;
// window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id; let courseId = this.props.match.params.coursesId;
// goback = () => { if(courseId===undefined){
window.history.go(-1) this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
@ -233,8 +236,8 @@ class GraduationTasksedit extends Component{
// console.log(response) // console.log(response)
// GraduationTasksedittype=false; // GraduationTasksedittype=false;
// window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions"; // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
// this.goback() this.goback()
this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"); //this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -333,7 +336,7 @@ class GraduationTasksedit extends Component{
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<p className="clearfix mt10"> <p className="clearfix mt10">
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/students"} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</a></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">毕设任务</Link></WordsBtn> <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">毕设任务</Link></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>

13
public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
Unescape View File

@ -91,7 +91,7 @@ class GraduationTasksnew extends Component {
// GraduationTasksnewtype = false; // GraduationTasksnewtype = false;
// this.goback(); // this.goback();
if(response!==undefined){ if(response!==undefined){
this.props.history.push("/courses/" + this.props.match.params.coursesId + "/graduation_tasks/" + this.props.match.params.category_id + "/" + response.data.task_id + "/setting"); this.goback()
} }
// } // }
}).catch((error) => { }).catch((error) => {
@ -108,9 +108,11 @@ class GraduationTasksnew extends Component {
goback = () => { goback = () => {
let courseId = this.props.match.params.coursesId; let courseId = this.props.match.params.coursesId;
let category_id = this.props.match.params.category_id; if(courseId===undefined){
this.props.history.push("/courses");
window.location.href = "/courses/" + courseId + "/graduation_tasks/" + category_id; }else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
@ -307,8 +309,7 @@ class GraduationTasksnew extends Component {
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<p className="clearfix mt10"> <p className="clearfix mt10">
<WordsBtn style="grey" className="fl"> <Link to={"/courses/" + courseId + "/students"} <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">{this.props.current_user && this.props.current_user.course_name}</a></WordsBtn>
className="color-grey-6">{this.props.current_user && this.props.current_user.course_name}</Link></WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl"> <Link <WordsBtn style="grey" className="fl"> <Link
to={"/courses/" + courseId + "/graduation_tasks/" + category_id} className="color-grey-6">毕设任务</Link></WordsBtn> to={"/courses/" + courseId + "/graduation_tasks/" + category_id} className="color-grey-6">毕设任务</Link></WordsBtn>

10
public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
Unescape View File

@ -761,9 +761,11 @@ class GraduationTaskssettingapp extends Component{
goback=()=>{ goback=()=>{
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
let category_id=this.props.match.params.category_id; if(courseId===undefined){
this.props.history.push("/courses");
window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; }else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
isgoback=()=>{ isgoback=()=>{
@ -1046,7 +1048,7 @@ class GraduationTaskssettingapp extends Component{
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<p className="clearfix mt10"> <p className="clearfix mt10">
<Link to={"/courses/"+courseId+"/students"} className="color-grey-9 fl">{coursename}</Link> <a onClick={this.goback} className="color-grey-9 fl">{coursename}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<Link to={"/courses/"+courseId+"/graduation_tasks/"+settingdata.graduation_id} className="color-grey-9 fl">毕设任务</Link> <Link to={"/courses/"+courseId+"/graduation_tasks/"+settingdata.graduation_id} className="color-grey-9 fl">毕设任务</Link>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>

10
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -57,11 +57,15 @@ class GraduationTaskssettinglist extends Component{
let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state; let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state;
this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page); this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page);
} }
goback=()=>{ goback=()=>{
// window.history.back(-1) // window.history.back(-1)
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
let category_id=this.props.match.params.category_id; if(courseId===undefined){
window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
@ -1058,7 +1062,7 @@ class GraduationTaskssettinglist extends Component{
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<p className="clearfix mt10"> <p className="clearfix mt10">
<Link className="color-grey-9 fl" to={"/courses/"+courseId+"/students"}>{taskslistdata.course_name}</Link> <a className="color-grey-9 fl" onClick={this.goback}>{taskslistdata.course_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<Link className="color-grey-9 fl" to={"/courses/"+courseId+"/graduation_tasks/"+taskslistdata.graduation_id}>{taskslistdata.graduation_name}</Link> <Link className="color-grey-9 fl" to={"/courses/"+courseId+"/graduation_tasks/"+taskslistdata.graduation_id}>{taskslistdata.graduation_name}</Link>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>

9
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
Unescape View File

@ -55,7 +55,12 @@ class GraduationTasksquestions extends Component{
// let courseId=this.props.match.params.coursesId; // let courseId=this.props.match.params.coursesId;
// let category_id=this.props.match.params.category_id; // let category_id=this.props.match.params.category_id;
// window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; // window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
window.history.go(-1) let courseId = this.props.match.params.coursesId;
if(courseId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
} }
end=()=>{ end=()=>{
@ -300,7 +305,7 @@ class GraduationTasksquestions extends Component{
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<p className="clearfix mt10"> <p className="clearfix mt10">
<Link to={"/courses/"+courseId+"/students"} className="color-grey-9 fl">{questionslist.course_name}</Link> <a onClick={this.goback} className="color-grey-9 fl">{questionslist.course_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<Link to={"/courses/"+courseId+"/graduation_tasks/"+questionslist.graduation_id} className="color-grey-9 fl">{questionslist.graduation_name}</Link> <Link to={"/courses/"+courseId+"/graduation_tasks/"+questionslist.graduation_id} className="color-grey-9 fl">{questionslist.graduation_name}</Link>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>

17
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -28,6 +28,7 @@ function disabledDateTime() {
}; };
} }
class CoursesNew extends Component { class CoursesNew extends Component {
constructor(props) { constructor(props) {
@ -191,17 +192,7 @@ class CoursesNew extends Component {
).then((response) => { ).then((response) => {
// debugger // debugger
if (response.data.status === 0) { if (response.data.status === 0) {
// this.setState({ this.goback
// Modalstype: true,
// Modalstopval: response.data.message,
// ModalSave: this.cancelmodel,
// Loadtype: true,
// checkBoxValues: [],
// checkAllValue: false,
// // Realnamecertification : authentication,
// // professional_certification: values.Professionalcertification
// })
window.location.href = "/courses/" + coursesId+"/students";
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -262,7 +253,7 @@ class CoursesNew extends Component {
if(this.props.match.params.coursesId===undefined){ if(this.props.match.params.coursesId===undefined){
this.props.history.push("/courses"); this.props.history.push("/courses");
}else{ }else{
this.props.history.push(`/courses/${this.props.match.params.coursesId}`); this.props.history.push(this.props.current_user.first_category_url);
} }
// window.history.go(-1) // window.history.go(-1)
} }
@ -390,7 +381,7 @@ class CoursesNew extends Component {
const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => <Option key={z} value={z}>{z}</Option>); const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => <Option key={z} value={z}>{z}</Option>);
// console.log(this.props.current_user.user_school) // console.log(this.props.current_user.user_school)
// form合并了 // form合并了
console.log(options)
return ( return (
<React.Fragment> <React.Fragment>

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

@ -93,7 +93,7 @@ class ShixunsHome extends Component {
const CustomNextArrow = props => { const CustomNextArrow = props => {
return ( return (
<div {...props} id="bannerright" style={arrowStyler}> <div {...props} id="bannerright" style={arrowStyler}>
<img id="bannerrightimg" style={noneStyler} src={"images/educoder/banner-right.png"} /> <img id="bannerrightimg" style={noneStyler} src={"/images/educoder/banner-right.png"} />
</div> </div>
); );
}; };
@ -101,7 +101,7 @@ class ShixunsHome extends Component {
const CustomPrevArrow = props => { const CustomPrevArrow = props => {
return ( return (
<div {...props} id="bannerleft" style={arrowStylel}> <div {...props} id="bannerleft" style={arrowStylel}>
<img id="bannerleftimg" style={noneStyler} src={"images/educoder/banner-left.png"} /> <img id="bannerleftimg" style={noneStyler} src={"/images/educoder/banner-left.png"} />
</div> </div>
); );
}; };
@ -374,7 +374,7 @@ class ShixunsHome extends Component {
<li className="mt35 pr" key={key}> <li className="mt35 pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -388,7 +388,7 @@ class ShixunsHome extends Component {
<li className="pr" key={key}> <li className="pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -402,7 +402,7 @@ class ShixunsHome extends Component {
<li className="mt35 pr" key={key}> <li className="mt35 pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -418,7 +418,7 @@ class ShixunsHome extends Component {
return ( return (
<li key={key}> <li key={key}>
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/> <img src={'/images/'+item.image_url}/>
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -450,7 +450,7 @@ class ShixunsHome extends Component {
<li className="mt35 pr" key={key}> <li className="mt35 pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -464,7 +464,7 @@ class ShixunsHome extends Component {
<li className="pr" key={key}> <li className="pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -478,7 +478,7 @@ class ShixunsHome extends Component {
<li className="mt35 pr" key={key}> <li className="mt35 pr" key={key}>
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'/images/'+item.image_url} />
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
@ -494,7 +494,7 @@ class ShixunsHome extends Component {
return ( return (
<li key={key}> <li key={key}>
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/> <img src={'/images/'+item.image_url}/>
<span className="task-hide rankName">{item.username}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>

2
public/react/src/modules/paths/ShixunPathCard.js
Unescape View File

@ -38,7 +38,7 @@ class ShixunPathCard extends Component{
</div> </div>
<Link to={"/paths/"+item.id} className="square-img" > <Link to={"/paths/"+item.id} className="square-img" >
{/*target="_blank"*/} {/*target="_blank"*/}
<img alt="13?1543211263" src={item.image_url} style={{"display":"block"}}/> <img alt="13?1543211263" src={"/"+item.image_url} style={{"display":"block"}}/>
</Link> </Link>
<div className="square-main"> <div className="square-main">
<p className="task-hide"> <p className="task-hide">

11
public/react/src/modules/user/account/AccountBasicEdit.js
Unescape View File

@ -278,6 +278,7 @@ class AccountBasic extends Component {
this.setState({ this.setState({
departments: [], departments: [],
filterDepartments: [], filterDepartments: [],
departmentsName: '',
school_id: '', school_id: '',
department_id: '', department_id: '',
}) })
@ -412,7 +413,7 @@ class AccountBasic extends Component {
addChildOrgSuccess={this.addChildOrgSuccess} addChildOrgSuccess={this.addChildOrgSuccess}
></ApplyForAddChildOrgModal> ></ApplyForAddChildOrgModal>
<div className="basicForm"> <div className="basicForm courseNormalForm">
<style>{` <style>{`
.formItemInline { .formItemInline {
display: flex; display: flex;
@ -448,9 +449,7 @@ class AccountBasic extends Component {
.basicForm .cancelBtn { .basicForm .cancelBtn {
margin-left: 0px; margin-left: 0px;
} }
.basicForm .ant-input-lg {
height: 32px;
}
.basicForm .ant-form-item-label { .basicForm .ant-form-item-label {
width: 100px; width: 100px;
padding-right: 10px; padding-right: 10px;
@ -576,6 +575,7 @@ class AccountBasic extends Component {
<Form.Item <Form.Item
label="" label=""
className="formItemInline fl" className="formItemInline fl"
style={{ 'margin-top': '3px'}}
// style={{display:identity && identity=="student" ? "block":"none"}} // style={{display:identity && identity=="student" ? "block":"none"}}
> >
{getFieldDecorator('student_No', { {getFieldDecorator('student_No', {
@ -680,6 +680,7 @@ class AccountBasic extends Component {
<Form.Item <Form.Item
label="院系/部门" label="院系/部门"
className="formItemInline mb0" className="formItemInline mb0"
style={{ 'margin-top': '10px'}}
> >
{getFieldDecorator('org2', { {getFieldDecorator('org2', {
rules: [{ rules: [{
@ -730,7 +731,7 @@ class AccountBasic extends Component {
</Form.Item> */} </Form.Item> */}
</Form> </Form>
</div> </div>
<div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div> <div style={{color: '#989898', marginLeft: '20px', marginBottom: '10px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
</div> </div>
); );
} }

4
public/react/src/modules/user/account/AccountCertification.js
Unescape View File

@ -15,7 +15,6 @@ class AccountCertification extends Component {
} }
checkBasicInfo = (index) => { checkBasicInfo = (index) => {
if (index == 1) {
if ( this.props.basicInfo.base_info_completed == true) { if ( this.props.basicInfo.base_info_completed == true) {
this.showRealNameCertificationModal(index) this.showRealNameCertificationModal(index)
} else { } else {
@ -27,9 +26,6 @@ class AccountCertification extends Component {
} }
}) })
} }
} else if (index == 2) {
this.showRealNameCertificationModal(index)
}
} }

6
public/react/src/modules/user/account/AccountSecure.js
Unescape View File

@ -335,7 +335,7 @@ class AccountSecure extends Component {
</Button> </Button>
</Form.Item> </Form.Item>
<div className="mb20" style={{ marginLeft: '118px' }}> <div className="mb20" style={{ marginLeft: '204px' }}>
<Button type="primary" onClick={this.onPhoneSubmit}>确定</Button> <Button type="primary" onClick={this.onPhoneSubmit}>确定</Button>
<Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button> <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
</div> </div>
@ -398,7 +398,7 @@ class AccountSecure extends Component {
{ !secondsFlag ? "获取验证码":`重新发送${seconds}s`}</Button> { !secondsFlag ? "获取验证码":`重新发送${seconds}s`}</Button>
</Form.Item> </Form.Item>
<div className="mb20" style={{ marginLeft: '118px' }}> <div className="mb20" style={{ marginLeft: '204px' }}>
<Button type="primary" onClick={this.onEmailSubmit}>确定</Button> <Button type="primary" onClick={this.onEmailSubmit}>确定</Button>
<Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button> <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
</div> </div>
@ -471,7 +471,7 @@ class AccountSecure extends Component {
)} )}
</Form.Item> </Form.Item>
<div className="mb20" style={{ marginLeft: '118px' }}> <div className="mb20" style={{ marginLeft: '204px' }}>
<Button type="primary" onClick={this.onPasswordSubmit}>确定</Button> <Button type="primary" onClick={this.onPasswordSubmit}>确定</Button>
<Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button> <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
</div> </div>

30
public/react/src/modules/user/account/common.css
Unescape View File

@ -51,3 +51,33 @@ button.ant-btn.ant-btn-primary.grayBtn {
.basicForm .ant-form-item-label label { .basicForm .ant-form-item-label label {
color: #979797 color: #979797
} */ } */
.courseNormalForm .ant-select-show-search {
height: 40px;
}
.courseNormalForm .ant-select-auto-complete.ant-select .ant-input {
height: 40px;
}
.courseNormalForm .ant-select-search__field__mirror {
height: 40px;
}
.courseNormalForm .ant-input-lg {
height: 40px;
}
.courseNormalForm .ant-select-selection--single {
height: 40px;
}
.courseNormalForm .ant-select-auto-complete.ant-select .ant-select-selection--single {
height: 40px
}
.courseNormalForm .ant-input-affix-wrapper {
height: 40px;
}
/* 职业 */
.courseNormalForm .ant-select-selection-selected-value {
line-height: 38px
}
.courseNormalForm input {
height: 40px;
}

4
public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js
Unescape View File

@ -76,7 +76,7 @@ class ApplyForAddChildOrgModal extends Component{
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
okText="保存" okText="保存"
className="applyForModal" className="applyForModal courseNormalForm"
> >
<style>{` <style>{`
.applyForModal .ant-form-item-label { .applyForModal .ant-form-item-label {
@ -90,7 +90,7 @@ class ApplyForAddChildOrgModal extends Component{
width: 390px; width: 390px;
} }
`}</style> `}</style>
<Form> <Form className="">
<Form.Item <Form.Item
label="单位名称：" label="单位名称："
className="mt15 formItemInline hideRequireTag" className="mt15 formItemInline hideRequireTag"

6
public/react/src/modules/user/modal/ApplyForAddOrgModal.js
Unescape View File

@ -74,7 +74,7 @@ class ApplyForAddOrgModal extends Component{
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
okText="保存" okText="保存"
className="applyForModal" className="applyForModal courseNormalForm"
> >
<style>{` <style>{`
.applyForModal .ant-form-item-label { .applyForModal .ant-form-item-label {
@ -89,7 +89,7 @@ class ApplyForAddOrgModal extends Component{
} }
.applyForModal .formItemInline .ant-form-item-control .ant-cascader-picker,.applyForModal .formItemInline .ant-cascader-picker-large .ant-input{ .applyForModal .formItemInline .ant-form-item-control .ant-cascader-picker,.applyForModal .formItemInline .ant-cascader-picker-large .ant-input{
width: 100%; width: 100%;
height:32px!important; height:40px!important;
} }
.applyForModal .formItemInline .ant-input-lg{ .applyForModal .formItemInline .ant-input-lg{
font-size:14px!important; font-size:14px!important;
@ -102,7 +102,7 @@ class ApplyForAddOrgModal extends Component{
width: 196px; width: 196px;
} }
`}</style> `}</style>
<Form onSubmit={this.onOk}> <Form onSubmit={this.onOk} className="">
<Form.Item <Form.Item
label="单位全称：" label="单位全称："
className="mt15 formItemInline explain" className="mt15 formItemInline explain"

4
public/react/src/modules/user/modal/RealNameCertificationModal.js
Unescape View File

@ -147,7 +147,7 @@ class RealNameCertificationModal extends Component{
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
okText="保存" okText="保存"
className="applyForModal certificationModal" className="applyForModal certificationModal courseNormalForm"
bottomRender={ bottomRender={
certification && certification == 1? certification && certification == 1?
<div className="bottomRender"> <div className="bottomRender">
@ -186,7 +186,7 @@ class RealNameCertificationModal extends Component{
> >
<style>{` <style>{`
.applyForModal .ant-form-item{ .applyForModal .ant-form-item{
margin-bottom:15px; margin-bottom:18px;
} }
.applyForModal .ant-form-item-label { .applyForModal .ant-form-item-label {
width: 100px; width: 100px;

Write Preview
Loading…
Cancel
Save