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

Merge branch 'dev_aliyun' into dev_cxt

Browse Source
dev_hjm_a
cxt 5 years ago
parent 22993dfb7c 4bac2e5243
commit 0c6507624b
49 changed files with 254 additions and 151 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/ecs/course_managers_controller.rb
Unescape View File

@ -3,7 +3,8 @@ class Ecs::CourseManagersController < Ecs::CourseBaseController
before_action :check_major_manager_permission!, only: [:create, :destroy] before_action :check_major_manager_permission!, only: [:create, :destroy]
def create def create
@user = Ecs::CreateCourseManagerService.call(current_course, params[:user_id]) Ecs::CreateCourseManagerService.call(current_course, params[:user_ids])
render_ok
rescue Ecs::CreateCourseManagerService::Error => ex rescue Ecs::CreateCourseManagerService::Error => ex
render_error(ex.message) render_error(ex.message)
end end

2
app/controllers/polls_controller.rb
Unescape View File

@ -692,7 +692,7 @@ class PollsController < ApplicationController
else else
unified_setting = @poll.unified_setting unified_setting = @poll.unified_setting
end end
show_result = params[:show_result].to_i show_result = params[:show_result]
un_anonymous = params[:un_anonymous] ? true : false un_anonymous = params[:un_anonymous] ? true : false
# 统一设置或者分班为0，则更新问卷，并删除问卷分组 # 统一设置或者分班为0，则更新问卷，并删除问卷分组
if unified_setting || (course_group_ids.size == 0) if unified_setting || (course_group_ids.size == 0)

5
app/controllers/templates_controller.rb
Unescape View File

@ -0,0 +1,5 @@
class TemplatesController < ApplicationController
def show
@template = EcTemplate.find_by_name!(params[:name])
end
end

11
app/libs/wechat/app.rb
Unescape View File

@ -0,0 +1,11 @@
class Wechat::App
class << self
attr_accessor :appid, :secret
delegate :access_token, :jscode2session, to: :client
def client
@_client ||= Wechat::Client.new(appid, secret)
end
end
end

6
app/libs/wechat/client.rb
Unescape View File

@ -34,6 +34,10 @@ class Wechat::Client
jsapi_ticket jsapi_ticket
end end
def jscode2session(code)
request(:get, '/sns/jscode2session', appid: appid, secret: secret, js_code: code, grant_type: 'authorization_code')
end
def access_token_cache_key def access_token_cache_key
"#{base_cache_key}/access_token" "#{base_cache_key}/access_token"
end end
@ -49,7 +53,7 @@ class Wechat::Client
private private
def request(method, url, **params) def request(method, url, **params)
Rails.logger.error("[wechat] request: #{method} #{url} #{params.inspect}") Rails.logger.error("[wechat] request: #{method} #{url} #{params.except(:secret).inspect}")
client = Faraday.new(url: BASE_SITE) client = Faraday.new(url: BASE_SITE)
response = client.public_send(method, url, params) response = client.public_send(method, url, params)

10
app/libs/wechat/official_account.rb
Unescape View File

@ -2,20 +2,14 @@ class Wechat::OfficialAccount
class << self class << self
attr_accessor :appid, :secret attr_accessor :appid, :secret
delegate :access_token, :jsapi_ticket, to: :client
def js_sdk_signature(url, noncestr, timestamp) def js_sdk_signature(url, noncestr, timestamp)
data = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url } data = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url }
str = data.map { |k, v| "#{k}=#{v}" }.join('&') str = data.map { |k, v| "#{k}=#{v}" }.join('&')
Digest::SHA1.hexdigest(str) Digest::SHA1.hexdigest(str)
end end
def access_token
client.access_token
end
def jsapi_ticket
client.jsapi_ticket
end
def client def client
@_client ||= Wechat::Client.new(appid, secret) @_client ||= Wechat::Client.new(appid, secret)
end end

2
app/models/mirror_repository.rb
Unescape View File

@ -5,7 +5,7 @@ class MirrorRepository < ApplicationRecord
scope :published_mirror, -> { where(status: 1) } scope :published_mirror, -> { where(status: [1,2,3,5]) }
scope :published_main_mirror, -> { published_mirror.where(main_type: 1) } scope :published_main_mirror, -> { published_mirror.where(main_type: 1) }
scope :published_small_mirror, -> { published_mirror.where(main_type: 0) } scope :published_small_mirror, -> { published_mirror.where(main_type: 0) }

26
app/services/ecs/create_course_manager_service.rb
Unescape View File

@ -3,27 +3,29 @@ class Ecs::CreateCourseManagerService < ApplicationService
COURSE_MANAGER_COUNT_LIMIT = 2 # 课程管理员数量限制 COURSE_MANAGER_COUNT_LIMIT = 2 # 课程管理员数量限制
attr_reader :ec_course, :user_id attr_reader :ec_course, :user_ids
def initialize(ec_course, user_id) def initialize(ec_course, user_ids)
@ec_course = ec_course @ec_course = ec_course
@user_id = user_id @user_ids = user_ids
end end
def call def call
user = User.find_by(id: params[:user_id]) users_count = User.where(id: user_ids).count
raise Error, '该用户不存在' if user.blank? raise Error, '用户不存在' if users_count != user_ids.size
if ec_course.ec_course_users.exists?(user_id: user.id) if ec_course.ec_course_users.exists?(user_id: user_ids)
raise Error, '该用户已经是该课程的管理员了' raise Error, '用户已经是该课程的管理员'
end end
if ec_course.ec_course_users.count >= COURSE_MANAGER_COUNT_LIMIT if ec_course.ec_course_users.count + user_ids.size > COURSE_MANAGER_COUNT_LIMIT
raise Error, '该课程管理员数量已达上限' raise Error, "课程管理员数量过多（最多#{COURSE_MANAGER_COUNT_LIMIT}）"
end end
ec_course.ec_course_users.create!(user: user) ActiveRecord::Base.transaction do
user_ids.each do |user_id|
user ec_course.ec_course_users.create!(user_id: user_id)
end
end
end end
end end

1
app/views/ecs/course_managers/create.json.jbuilder
Unescape View File

@ -1 +0,0 @@
json.partial! 'ecs/shared/user', user: @user

3
app/views/graduation_tasks/_public_navigation.json.jbuilder
Unescape View File

@ -2,4 +2,5 @@ json.partial! "graduation_topics/show_navigation", locals: {course: course, grad
json.task_status task_curr_status(graduation, course)[:status] json.task_status task_curr_status(graduation, course)[:status]
json.task_name graduation.name json.task_name graduation.name
json.task_id graduation.id json.task_id graduation.id
json.status graduation.status json.status graduation.status
json.end_time graduation.end_time

3
app/views/templates/show.json.jbuilder
Unescape View File

@ -0,0 +1,3 @@
json.template do
json.partial! 'attachments/attachment_simple', attachment: @template.attachments.last
end

1
config/routes.rb
Unescape View File

@ -821,6 +821,7 @@ Rails.application.routes.draw do
post :feedback post :feedback
end end
end end
resource :template, only: [:show]
end end
namespace :admins do namespace :admins do

5
public/react/src/modules/courses/Index.js
Unescape View File

@ -661,6 +661,11 @@ class CoursesIndex extends Component{
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
} }
></Route> ></Route>
<Route path="/courses/:coursesId/course_groups"
render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
}
></Route>
{/* 普通作业 */} {/* 普通作业 */}
<Route path="/courses/:coursesId/common_homeworks/:category_id" exact <Route path="/courses/:coursesId/common_homeworks/:category_id" exact

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

@ -232,6 +232,11 @@ class ListPageIndex extends Component{
(props) => (<StudentsList {...this.props} {...props} {...this.state} />) (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/courses/:coursesId/course_groups"
render={
(props) => (<StudentsList {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/courses/:coursesId/exercises/:Id" <Route path="/courses/:coursesId/exercises/:Id"
render={ render={

2
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -242,7 +242,7 @@ class Fileslistitem extends Component{
{ {
discussMessage.is_lock === true ? discussMessage.is_lock === true ?
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>
:"" :""

2
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -593,7 +593,7 @@ class Fileslists extends Component{
modalname:"立即发布", modalname:"立即发布",
visible:true, visible:true,
typs:"start", typs:"start",
Topval:"学生将能立即查看和下载发布资源", Topval:"学生将能立即收到资源",
// Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
// Botval:`本操作只对"未发布"的分班有效`, // Botval:`本操作只对"未发布"的分班有效`,
// starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), // starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),

2
public/react/src/modules/courses/boards/BoardsListItem.js
Unescape View File

@ -70,7 +70,7 @@ class BoardsListItem extends Component{
{ !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> } { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
{ {
discussMessage.is_public == false ? (<Tooltip title={`${isAdminOrStudent ? '私有属性' : '私有属性，非课堂成员不能访问'}`} placement="bottom"> discussMessage.is_public == false ? (<Tooltip title={'私有属性，非课堂成员不能访问'} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip>) : "" </Tooltip>) : ""
} }

8
public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
Unescape View File

@ -308,15 +308,11 @@ class CommonWorkDetailIndex extends Component{
onClick={() => this.setState({moduleName: '参考答案'})} onClick={() => this.setState({moduleName: '参考答案'})}
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin() ?
<Link <Link
onClick={() => this.setState({moduleName: '设置'})} onClick={() => this.setState({moduleName: '设置'})}
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>: to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
""
}
{/* { this.props.tabRightComponents } */} {/* { this.props.tabRightComponents } */}

2
public/react/src/modules/courses/busyWork/CommonWorkItem.js
Unescape View File

@ -175,7 +175,7 @@ class CommonWorkItem extends Component{
{/* 只有非课堂成员且作业是私有的情况下才会为true */} {/* 只有非课堂成员且作业是私有的情况下才会为true */}
{ {
item.private_icon===true ? item.private_icon===true ?
(<Tooltip title={ isAdminOrStudent ? "私有属性" : "私有属性，非课堂成员不能访问"} placement="bottom" > (<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom" >
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip>) : "" </Tooltip>) : ""
} }

20
public/react/src/modules/courses/busyWork/CommonWorkSetting.js
Unescape View File

@ -1055,7 +1055,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
@ -1087,7 +1087,7 @@ class CommonWorkSetting extends Component{
<span>截止时间：</span> <span>截止时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1210,8 +1210,8 @@ class CommonWorkSetting extends Component{
{/* 开启时间 */} {/* 开启时间 */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>开启时间：</span> <span>开启时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1244,7 +1244,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1283,7 +1283,7 @@ class CommonWorkSetting extends Component{
{/* 匿评数量 */} {/* 匿评数量 */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>匿评数量：</span> <span>匿评数量：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num} onInput={this.evaluation_num_change} <Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num} onInput={this.evaluation_num_change}
disabled={anonymous_comment && !noAuth? false : true} min={0} max={100} disabled={anonymous_comment && !noAuth? false : true} min={0} max={100}
@ -1296,7 +1296,7 @@ class CommonWorkSetting extends Component{
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>缺评扣分：</span> <span>缺评扣分：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={absence_penalty} onInput={this.absence_penalty_change} <Input type="number" className="mr10" style={{width:"100px" }} value={absence_penalty} onInput={this.absence_penalty_change}
disabled={ anonymous_comment && !noAuth ? false : true} min={0} max={100} disabled={ anonymous_comment && !noAuth ? false : true} min={0} max={100}
@ -1343,7 +1343,7 @@ class CommonWorkSetting extends Component{
<span>结束时间：</span> <span>结束时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1371,7 +1371,7 @@ class CommonWorkSetting extends Component{
{/* 违规匿评扣分： */} {/* 违规匿评扣分： */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>违规匿评扣分：</span> <span>违规匿评扣分：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={appeal_penalty} onInput={this.appeal_penalty_change} <Input type="number" className="mr10" style={{width:"100px" }} value={appeal_penalty} onInput={this.appeal_penalty_change}
disabled={ anonymous_appeal && !noAuth ? false : true} min={0} max={100} disabled={ anonymous_appeal && !noAuth ? false : true} min={0} max={100}
@ -1393,7 +1393,7 @@ class CommonWorkSetting extends Component{
</div> </div>
<div className={"mb30 ml60"}> <div className={"mb30 ml60"}>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<RadioGroup onChange={this.ta_mode_change} value={ta_mode}> <RadioGroup onChange={this.ta_mode_change} value={ta_mode}>
<Radio style={radioStyle} value={1} disabled={noAuth}> <Radio style={radioStyle} value={1} disabled={noAuth}>
普通模式<span className={"font-14 color-grey-9 ml10"}>（选中，则取各助教最终评分的平均分）</span> 普通模式<span className={"font-14 color-grey-9 ml10"}>（选中，则取各助教最终评分的平均分）</span>

8
public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
Unescape View File

@ -144,13 +144,11 @@ class WorkDetailPageHeader extends Component{
{view_answer == true && <Link {view_answer == true && <Link
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin()?
<Link <Link
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>: to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
""
}
{ this.props.tabRightComponents } { this.props.tabRightComponents }

33
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -1055,7 +1055,7 @@ class Coursesleftnav extends Component{
iem.category_id===0?"": iem.category_id===0?"":
iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"? iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
( (
iem.category_name.length<13? iem.category_name&&iem.category_name.length<13?
<span className={"fr mr20 color999 Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span> <span className={"fr mr20 color999 Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
: :
<Tooltip placement="right" key={index} title={iem.category_name} visible={toopvisibleindexs===undefined?false:toopvisibleindexs===index?true:false}> <Tooltip placement="right" key={index} title={iem.category_name} visible={toopvisibleindexs===undefined?false:toopvisibleindexs===index?true:false}>
@ -1064,7 +1064,7 @@ class Coursesleftnav extends Component{
) )
: :
( (
iem.category_name.length<13? iem.category_name&&iem.category_name.length<13?
<Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index} onMouseEnter={(e)=>this.twosandianshowyss(e)}> <Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index} onMouseEnter={(e)=>this.twosandianshowyss(e)}>
<i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i> <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
</Popover> </Popover>
@ -1147,15 +1147,26 @@ class Coursesleftnav extends Component{
{/*title={iem.category_name.length<10?"":iem.category_name}*/} {/*title={iem.category_name.length<10?"":iem.category_name}*/}
<li className="clearfix Draggableli" key={index} style={{ width: '244px'}} > <li className="clearfix Draggableli" key={index} style={{ width: '244px'}} >
<Tooltip placement="right" key={index} title={iem.category_name}> {
<a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} > iem.category_name&&iem.category_name.length<13?
{/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/} <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
{/*{iem.category_name.length<10?"":*/} {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
{/* iem.category_name}*/} {/*{iem.category_name.length<10?"":*/}
<span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide Draggablelichild":"fl ml38 maxwidth170 task-hide Draggablelichild"}>{iem.category_name}</span> {/* iem.category_name}*/}
<span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span> <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide Draggablelichild":"fl ml38 maxwidth170 task-hide Draggablelichild"}>{iem.category_name}</span>
</a> <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
</Tooltip> </a>
:
<Tooltip placement="right" key={index} title={iem.category_name}>
<a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
{/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
{/*{iem.category_name.length<10?"":*/}
{/* iem.category_name}*/}
<span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide Draggablelichild":"fl ml38 maxwidth170 task-hide Draggablelichild"}>{iem.category_name}</span>
<span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
</a>
</Tooltip>
}
</li> </li>
</a> </a>

4
public/react/src/modules/courses/coursesPublic/AppraiseModal.js
Unescape View File

@ -153,7 +153,7 @@ class AppraiseModal extends Component{
</style> </style>
<div className="clearfix"> <div className="clearfix">
<p className={"font mt10 mb10 ml10"}> <p className={"font mt10 mb10 ml10"}>
可见:(学生可查看老师的评阅内容） 可见(学生可查看老师的评阅内容）
</p> </p>
{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/} {/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见 (学生查看老师的评阅内容）</Radio>*/} {/*<Radio value={0} style={radioStyle} className={"newfont"}>可见 (学生查看老师的评阅内容）</Radio>*/}
@ -167,7 +167,7 @@ class AppraiseModal extends Component{
/> />
<p className={"font mt10 mb10 ml10"}> <p className={"font mt10 mb10 ml10"}>
不可见:(仅对课堂老师可见） 不可见(仅对课堂老师可见）
</p> </p>
<WordNumberTextarea <WordNumberTextarea
placeholder={"请填写评阅内容"} placeholder={"请填写评阅内容"}

2
public/react/src/modules/courses/elearning/Elearning.js
Unescape View File

@ -371,7 +371,7 @@ class Elearning extends Component{
<Progress percent={learned} showInfo={false} /> <Progress percent={learned} showInfo={false} />
</div> </div>
<div style={{marginTop:"7px",textAlign: "left"}}> <div style={{marginTop:"7px",textAlign: "left"}}>
<span className="font-16">上次学至</span><span style={{color:"#4CADFF",marginLeft:"25px"}}>{last_shixun}</span> <span className="font-16">上次学习内容</span><span style={{color:"#4CADFF",marginLeft:"25px"}}>{last_shixun}</span>
</div> </div>

2
public/react/src/modules/courses/exercise/ExerciseListItem.js
Unescape View File

@ -134,7 +134,7 @@ class ExerciseListItem extends Component{
{ {
item.lock_status === 0 ? item.lock_status === 0 ?
<Tooltip title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip> </Tooltip>
:"" :""

4
public/react/src/modules/courses/exercise/Exercisesetting.js
Unescape View File

@ -104,6 +104,10 @@ class Exercisesetting extends Component{
if(this.props.Commonheadofthetestpaper!=undefined){ if(this.props.Commonheadofthetestpaper!=undefined){
this.editSetting() this.editSetting()
} }
if(this.props.isAdmin() === false){
this.cancelEdit()
}
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
if(prevProps.Commonheadofthetestpaper!= this.props.Commonheadofthetestpaper){ if(prevProps.Commonheadofthetestpaper!= this.props.Commonheadofthetestpaper){

2
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -256,7 +256,7 @@ class GraduateTaskItem extends Component{
{ {
this.props.discussMessage.private_icon===true? this.props.discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>
: :

5
public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
Unescape View File

@ -189,7 +189,8 @@ class GraduationAcross extends Component{
cross_teachers: item.cross_teachers, cross_teachers: item.cross_teachers,
student_id:item.student_id, student_id:item.student_id,
user_name:item.user_name, user_name:item.user_name,
work_id:item.work_id work_id:item.work_id,
cross_groups:item.cross_groups
} }
return list; return list;
}), }),
@ -395,7 +396,7 @@ class GraduationAcross extends Component{
` `
} }
</style>:""} </style>:""}
<div id="closeIcon" onClick={()=>this.props.modalCloss()}> <div id="closeIcon" onClick={this.props.modalCloss}>
<i className="iconfont icon-shanchudiao"></i> <i className="iconfont icon-shanchudiao"></i>
</div> </div>
<style> <style>

1
public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
Unescape View File

@ -93,6 +93,7 @@ class GraduationTaskDetail extends Component{
this.setState({ this.setState({
acrossVisible:false acrossVisible:false
}) })
this.getdatas()
} }

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -720,7 +720,7 @@ class GraduationTasks extends Component{
<li className="li_line"><a className="color-grey-9" onClick={() => { this.publish() }}>立即发布</a></li> <li className="li_line"><a className="color-grey-9" onClick={() => { this.publish() }}>立即发布</a></li>
<li className="li_line"><a className="color-grey-9" onClick={() => { this.end() }}>立即截止</a></li> <li className="li_line"><a className="color-grey-9" onClick={() => { this.end() }}>立即截止</a></li>
{course_public===true?<li className="li_line"><a className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>:""} {course_public===true?<li className="li_line"><a className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>:""}
<li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li> {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li>*/}
</div> </div>
</div> </div>
</div>:""} </div>:""}

2
public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
Unescape View File

@ -103,7 +103,7 @@ class GraduateTopicItem extends Component{
} }
{ {
discussMessage.private_icon===true? discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>
:"" :""

2
public/react/src/modules/courses/graduation/topics/index.js
Unescape View File

@ -447,7 +447,7 @@ onBoardsNew=()=>{
{ {
course_public && course_public==1 ? <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(2)}>设为公开</a></li>:"" course_public && course_public==1 ? <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(2)}>设为公开</a></li>:""
} }
<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li> {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>*/}
{/* <li className="li_line"><a href="javascript:void(0)" className="color-grey-9">加入题库</a></li> */} {/* <li className="li_line"><a href="javascript:void(0)" className="color-grey-9">加入题库</a></li> */}
</div> </div>
</div> </div>

3
public/react/src/modules/courses/members/modal/AddAdminModal.js
Unescape View File

@ -96,6 +96,9 @@ class AddAdminModal extends Component{
}).then((result)=>{ }).then((result)=>{
if(result.data.status==0){ if(result.data.status==0){
this.props.showNotification('操作成功。') this.props.showNotification('操作成功。')
if (this.props.isCourseAdmin()) {
window.location.reload()
}
// this.fetchAll() // this.fetchAll()
this.setVisible(false) this.setVisible(false)
this.props.changeAdminSuccess && this.props.changeAdminSuccess() this.props.changeAdminSuccess && this.props.changeAdminSuccess()

30
public/react/src/modules/courses/members/studentsList.js
Unescape View File

@ -16,7 +16,9 @@ import DownloadMessageysl from "../../modals/DownloadMessageysl";
import CreateGroupByImportModal from './modal/CreateGroupByImportModal' import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
const Search =Input.Search; const Search =Input.Search;
const TYPE_STUDENTS = 1
const TYPE_COURSE_GOURP_PARENT = 2
const TYPE_COURSE_GOURP_CHILD = 3
const buildColumns = (that,isParent) => { const buildColumns = (that,isParent) => {
const { course_groups , sortedInfo } = that.state const { course_groups , sortedInfo } = that.state
let showSorter = isParent==true let showSorter = isParent==true
@ -581,6 +583,16 @@ class studentsList extends Component{
// console.log(paramsString); // console.log(paramsString);
// console.log(checkBoxValues); // console.log(checkBoxValues);
// console.log(searchValue); // console.log(searchValue);
let pageType = TYPE_STUDENTS
if (this.props.match.path.endsWith('students')) {
} else if (course_group_id) {
pageType = TYPE_COURSE_GOURP_PARENT
} else {
pageType = TYPE_COURSE_GOURP_CHILD
}
return( return(
<React.Fragment > <React.Fragment >
<DownloadMessageysl <DownloadMessageysl
@ -590,7 +602,7 @@ class studentsList extends Component{
modalsType={this.state.DownloadType} modalsType={this.state.DownloadType}
/> />
<Titlesearchsection <Titlesearchsection
title={isParent ? "学生列表" : title={isParent ? (pageType == TYPE_STUDENTS ? "全部学生" : "学生列表"):
<React.Fragment> <React.Fragment>
<span>{course_group_name || '未分班'}</span> <span>{course_group_name || '未分班'}</span>
{isAdmin && invite_code && <React.Fragment> {isAdmin && invite_code && <React.Fragment>
@ -617,15 +629,21 @@ class studentsList extends Component{
searchPlaceholder={ '请输入姓名、学号进行搜索' } searchPlaceholder={ '请输入姓名、学号进行搜索' }
firstRowRight={ firstRowRight={
<React.Fragment> <React.Fragment>
{ isSuperAdmin && <React.Fragment> {
// pageType !== TYPE_STUDENTS &&
isSuperAdmin && <React.Fragment>
<CreateGroupByImportModal ref="createGroupByImportModal" {...this.props} <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}
createGroupImportSuccess={this.createGroupImportSuccess} createGroupImportSuccess={this.createGroupImportSuccess}
></CreateGroupByImportModal> ></CreateGroupByImportModal>
<WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn> <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
</React.Fragment> } </React.Fragment> }
{ !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> } {
{ isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> } // pageType !== TYPE_STUDENTS &&
{ isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> } !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
{
isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
{
isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
<style>{` <style>{`
.drop_down_menu li a { .drop_down_menu li a {
padding: 0px; padding: 0px;

5
public/react/src/modules/courses/members/teacherList.js
Unescape View File

@ -98,7 +98,7 @@ function buildColumns(that) {
return ( return (
<ConditionToolTip title={`暂未有分班信息，不能操作`} condition={noGroups}> <ConditionToolTip title={`暂未有分班信息，不能操作`} condition={noGroups}>
<span className="drop_down" style={{color: '#29BD8B', display: 'inline-block'}}> <span className="drop_down" style={{color: '#29BD8B', display: 'inline-block'}}>
{ arg_course_groups.length == 0 ? '不限' : arg_course_groups.map(item => item.name).join(', ') } { arg_course_groups.length == 0 ? '全部分班' : arg_course_groups.map(item => item.name).join(', ') }
{ isAdmin && { isAdmin &&
<React.Fragment> <React.Fragment>
<i className="iconfont icon-xiajiantou font-12 ml2"></i> <i className="iconfont icon-xiajiantou font-12 ml2"></i>
@ -645,6 +645,9 @@ class studentsList extends Component{
<React.Fragment> <React.Fragment>
{/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> } {/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> }
{ isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */} { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */}
{ isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
</React.Fragment> </React.Fragment>
} }
secondRowLeft={ secondRowLeft={

10
public/react/src/modules/courses/poll/PollDetailTabForth.js
Unescape View File

@ -86,6 +86,10 @@ class PollDetailTabForth extends Component{
if(this.props.pollDetail!=undefined){ if(this.props.pollDetail!=undefined){
this.editSetting(); this.editSetting();
} }
if(this.props.isAdmin() === false){
this.cancelEdit()
}
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
if(prevProps.pollDetail!= this.props.pollDetail){ if(prevProps.pollDetail!= this.props.pollDetail){
@ -546,7 +550,7 @@ class PollDetailTabForth extends Component{
<div className="clearfix mb5"> <div className="clearfix mb5">
<span className="font-16 mr15 fl mt6">发布时间：</span> <span className="font-16 mr15 fl mt6">发布时间：</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={un_change_unified ? "发布时间已过，不能再修改":""}> <Tooltip placement="bottom" title={un_change_unified ?this.props.isAdmin()? "发布时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -575,7 +579,7 @@ class PollDetailTabForth extends Component{
<div className="clearfix"> <div className="clearfix">
<span className="mr15 fl mt10 font-16">截止时间：</span> <span className="mr15 fl mt10 font-16">截止时间：</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={un_change_end ? "截止时间已过，不能再修改":""}> <Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -640,7 +644,7 @@ class PollDetailTabForth extends Component{
</div> </div>
</div> </div>
{ {
flagPageEdit ? flagPageEdit&& this.props.isAdmin() === true ?
<div className="clearfix mt30 mb30"> <div className="clearfix mt30 mb30">
<Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">提交</Button> <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">提交</Button>
<a className="defalutCancelbtn fl" onClick={this.cancelEdit}>取消</ a> <a className="defalutCancelbtn fl" onClick={this.cancelEdit}>取消</ a>

4
public/react/src/modules/courses/poll/PollDetailTabForthRules.js
Unescape View File

@ -413,7 +413,7 @@ class PollDetailTabForthRules extends Component{
</div> </div>
</div> </div>
<div className="fl pr20 with25 yskspickersy"> <div className="fl pr20 with25 yskspickersy">
<Tooltip placement="bottom" title={rule.e_timeflag ? "发布时间已过，不能再修改":""}> <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"发布时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -439,7 +439,7 @@ class PollDetailTabForthRules extends Component{
</p> </p>
</div> </div>
<div className="fl mr20 yskspickersy"> <div className="fl mr20 yskspickersy">
<Tooltip placement="bottom" title={rule.e_timeflag ? "截止时间已过，不能再修改":""}> <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}

2
public/react/src/modules/courses/poll/PollListItem.js
Unescape View File

@ -63,7 +63,7 @@ class PollListItem extends Component{
} }
{ {
item.lock_status === 0 ? item.lock_status === 0 ?
<Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`} placement="bottom"> <Tooltip title={"私有属性,非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip> </Tooltip>
:"" :""

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

@ -1535,6 +1535,7 @@ class Listofworksstudentone extends Component {
// console.log("获取作品列表"); // console.log("获取作品列表");
// console.log("935"); // console.log("935");
// debugger // debugger
let searchtype=this.props.history.location.search;
let urll = `/homework_commons/${homeworkid}/works_list.json`; let urll = `/homework_commons/${homeworkid}/works_list.json`;
var datasysl = { var datasysl = {
search: this.state.searchtext, search: this.state.searchtext,
@ -1587,13 +1588,14 @@ class Listofworksstudentone extends Component {
if(this.props.isAdmin() === true){ if(this.props.isAdmin() === true){
if(result.data.update_score===true){ if(result.data.update_score===true){
if(bool===true){ if(bool===true){
if(searchtype==="?tab=0"){
try { try {
this.props.yslslowCheckresults(); this.props.yslslowCheckresults();
}catch (e) { }catch (e) {
} }
this.setComputeTimet(); this.setComputeTimet();
}
} }
} }
} }
@ -2625,9 +2627,11 @@ class Listofworksstudentone extends Component {
// return // return
// } // }
this.setState({ this.setState({
loadingstate: true loadingstate: true,
page:1,
limit:20,
}) })
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, this.state.page, this.state.limit); this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1,20);
// console.log(value) // console.log(value)
@ -2639,9 +2643,11 @@ class Listofworksstudentone extends Component {
// this.onSearch(); // this.onSearch();
// console.log("使用了回车键"); // console.log("使用了回车键");
this.setState({ this.setState({
loadingstate: true loadingstate: true,
page:1,
limit:20,
}) })
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1,20);
} }
} }
//排序 //排序
@ -3242,21 +3248,25 @@ class Listofworksstudentone extends Component {
{/*作品状态GraduationTaskssettinglist*/} {/*作品状态GraduationTaskssettinglist*/}
<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}> <ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
<li className="clearfix " > <li className="clearfix " >
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
</li>
<li className="clearfix mt10">
<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}> <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
{/*{course_is_end===true?"":<span>*/} {/*{course_is_end===true?"":<span>*/}
{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/} {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
{/* (this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/} {/* (this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
{/* 查看最新成绩*/} {/* 查看最新成绩*/}
{/* </div>:""):*/} {/* </div>:""):*/}
{/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
{/* (this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/} {/* (this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
{/* 查看最新成绩*/} {/* 查看最新成绩*/}
{/* </div>:"")*/} {/* </div>:"")*/}
{/*}*/} {/*}*/}
{/*</span>}*/} {/*</span>}*/}
<span className="search-newyslw fr ml20"> <span className="search-newyslw fr ml20">
<Search <Search
placeholder="请输入姓名或学号搜索" placeholder="请输入姓名或学号搜索"
@ -3269,10 +3279,6 @@ class Listofworksstudentone extends Component {
></Search> ></Search>
</span> </span>
</div> </div>
</li>
<li className="clearfix mt10">
<span className="fl mr10 color-grey-8 ">作品状态：</span> <span className="fl mr10 color-grey-8 ">作品状态：</span>
<span className="fl "><a id="graduation_comment_no_limit" <span className="fl "><a id="graduation_comment_no_limit"
className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "} className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
@ -3342,6 +3348,7 @@ class Listofworksstudentone extends Component {
` `
.edu-position-hide li a:hover { .edu-position-hide li a:hover {
background: #F0F0F0; background: #F0F0F0;
color: #05101A;
} }
` `
} }
@ -3567,7 +3574,7 @@ class Listofworksstudentone extends Component {
<div className="fr"> <div className="fr">
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
{/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/} {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
{/* {computeTimetype===true?*/} {/* {computeTimetype===true?*/}
{/* (this.props.isNotMember()===false?*/} {/* (this.props.isNotMember()===false?*/}
@ -3800,7 +3807,7 @@ class Listofworksstudentone extends Component {
</style> </style>
<div className="fr"> <div className="fr">
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
{/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/} {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
{/* {computeTimetype===true?*/} {/* {computeTimetype===true?*/}

8
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -236,7 +236,7 @@ class ShixunHomeworkPage extends Component {
onClick={(e) => this.ChangeTab(2)}> onClick={(e) => this.ChangeTab(2)}>
代码查重</a> : ""} 代码查重</a> : ""}
{parseInt(tab) === 3? {parseInt(tab) === 3?
<style>{ <style>{this.props.isAdmin()?
` `
.poll_list a.active:after { .poll_list a.active:after {
content: ''; content: '';
@ -247,13 +247,13 @@ class ShixunHomeworkPage extends Component {
background-color: #4CACFF; background-color: #4CACFF;
position: absolute; position: absolute;
} }
` `:""
}</style> }</style>
:""} :""}
{this.props.isAdmin() ?
<a className={parseInt(tab) === 3 ? "active" : ""} <a className={parseInt(tab) === 3 ? "active" : ""}
onClick={(e) => this.ChangeTab(3)} onClick={(e) => this.ChangeTab(3)}
>设置</a>:""} >{this.props.isAdmin()?"设置":"得分规则"}</a>
{/*{this.props.isAdmin() ? <a*/} {/*{this.props.isAdmin() ? <a*/}
{/* className="fr color-blue font-16"*/} {/* className="fr color-blue font-16"*/}
{/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/} {/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}

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

@ -337,7 +337,7 @@ class ShixunhomeWorkItem extends Component{
{ {
this.props.discussMessage.private_icon===true? this.props.discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>
: :

17
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -147,7 +147,9 @@ class Trainingjobsetting extends Component {
if(this.props.isAdmin() === false){
this.cancelEdit()
}
} }
// componentWillReceiveProps(nextProps) { // componentWillReceiveProps(nextProps) {
// // console.log("+++++++++916"); // // console.log("+++++++++916");
@ -1721,7 +1723,7 @@ class Trainingjobsetting extends Component {
flagPageEditsthrees:deadline, flagPageEditsthrees:deadline,
flagPageEditsfor:endtime, flagPageEditsfor:endtime,
completionefficiencyscore:true, completionefficiencyscore:true,
work_efficiencys:true, work_efficiencys:this.state.work_efficiencys,
unifiedsetting:this.state.unifiedsetting, unifiedsetting:this.state.unifiedsetting,
latedeductiontwo:20, latedeductiontwo:20,
}); });
@ -1837,7 +1839,7 @@ class Trainingjobsetting extends Component {
flagPageEditsthrees:deadline, flagPageEditsthrees:deadline,
flagPageEditsfor:endtime, flagPageEditsfor:endtime,
completionefficiencyscore:true, completionefficiencyscore:true,
work_efficiencys:true, work_efficiencys:datas.data.work_efficiency,
unifiedsetting:datas.data.unified_setting, unifiedsetting:datas.data.unified_setting,
latedeductiontwo:20, latedeductiontwo:20,
}); });
@ -2076,7 +2078,10 @@ class Trainingjobsetting extends Component {
// console.log(this.props.isAdmin()) // console.log(this.props.isAdmin())
// console.log(this.state.code_review===false) // console.log(this.state.code_review===false)
// console.log("引入的分值"); // console.log("引入的分值");
// console.log(this.state.work_efficiencys); console.log(this.state.work_efficiencys);
return ( return (
<div className=" clearfix " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}> <div className=" clearfix " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}>
{this.state.showmodel===true?<ShixunWorkModal {this.state.showmodel===true?<ShixunWorkModal
@ -2181,7 +2186,7 @@ class Trainingjobsetting extends Component {
<div> <div>
<div className="clearfix mb5 ml15"> <div className="clearfix mb5 ml15">
<span className="font-16 fl mt3" style={{color:"#999999"}}>发布时间：</span> <span className="font-16 fl mt3" style={{color:"#999999"}}>发布时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?this.props.isAdmin()?"发布时间已过，则不能修改":"": ""}>
<div className="fl yskspickers"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -2214,7 +2219,7 @@ class Trainingjobsetting extends Component {
</p> </p>
<div className="clearfix ml15 mb5"> <div className="clearfix ml15 mb5">
<span className=" fl mt3 font-16" style={{color:"#999999"}}>截止时间：</span> <span className=" fl mt3 font-16" style={{color:"#999999"}}>截止时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?this.props.isAdmin()?"截止时间已过，则不能修改":"": ""}>
<div className="fl yskspickers"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}

29
public/react/src/modules/message/js/MessagSub.js
Unescape View File

@ -545,7 +545,7 @@ class MessagSub extends Component {
{/*下面内容页面*/} {/*下面内容页面*/}
<div className="bor-top-greyE mycenter"> <div className="bor-top-greyE mycenter">
{/*这里可以进行数据处理*/} {/*这里可以进行数据处理*/}
<div className="myw100baifenbi"> <div className="myw100baifenbi edu-back-white">
<Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}> <Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
{ {
@ -641,23 +641,24 @@ class MessagSub extends Component {
})} })}
</Spin> </Spin>
{/*页数*/}
{data === undefined ? ""
:
(count > 10 ?
<div style={{textAlign: "center"}} className="new_expand mt10">
<div className="edu-txt-center mt30">
<Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit}
total={count}></Pagination>
</div>
</div> : ""
)
}
</div> </div>
</div> </div>
{/*页数*/}
{data === undefined ? ""
:
(count > 10 ?
<div style={{textAlign: "center"}} className="new_expand mt10">
<div className="edu-txt-center mt30">
<Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit}
total={count}></Pagination>
</div>
</div> : ""
)
}
</div> </div>
) )
} }

8
public/react/src/modules/message/js/MessagePrivate.js
Unescape View File

@ -8,6 +8,7 @@ import moment from 'moment';
import {getImageUrl,markdownToHTML} from 'educoder'; import {getImageUrl,markdownToHTML} from 'educoder';
import "../css/messagemy.css" import "../css/messagemy.css"
import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
import NoneData from '../../../modules/courses/coursesPublic/NoneData'
//私信页面 //私信页面
class MessagePrivate extends Component{ class MessagePrivate extends Component{
constructor(props) { constructor(props) {
@ -160,11 +161,8 @@ class MessagePrivate extends Component{
<Spin size="large" className="myw100baifenbi" spinning={isSpin}> <Spin size="large" className="myw100baifenbi" spinning={isSpin}>
{ {
data===undefined?"":data.length===0? data===undefined?<NoneData></NoneData> :data.length===0?
<div className="edu-tab-con-box clearfix edu-txt-center"> <NoneData></NoneData>
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
</div>
:data.map((item,key)=>{ :data.map((item,key)=>{
return( return(
<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}> <div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>

11
public/react/src/modules/page/main/CodeRepositoryViewContainer.js
Unescape View File

@ -21,8 +21,11 @@ function getNewTreeData(treeData, curKey, child, level) {
data.forEach((item) => { data.forEach((item) => {
// 这里不能用indexOf 同一级可能出现test目录和test.py文件 // 这里不能用indexOf 同一级可能出现test目录和test.py文件
if (item.key == curKey) { if (item.key == curKey) {
child = addPrePath(child, curKey); if (child && child.length) { // 可能没有子节点
item.children = child; child = addPrePath(child, curKey);
item.children = child;
}
item.isLeaf = false;
} else { } else {
if (item.children) { if (item.children) {
loop(item.children); loop(item.children);
@ -153,6 +156,10 @@ class CodeRepositoryViewContainer extends Component {
}); });
} }
map2OldData = (treeData) => { map2OldData = (treeData) => {
if (!treeData || treeData.length == 0) {
return []
}
if (!treeData || treeData.length === 0) return treeData; if (!treeData || treeData.length === 0) return treeData;
treeData = treeData.map(item => { treeData = treeData.map(item => {
return { return {

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

@ -222,7 +222,7 @@ export function TPMIndexHOC(WrappedComponent) {
# 课程权限判断 # 课程权限判断
ADMIN = 0 # 超级管理员 ADMIN = 0 # 超级管理员
BUSINESS = 1 # 运营人员 BUSINESS = 1 # 运营人员
CREATOR = 2 # 课程创建者 CREATOR = 2 # 课程创建者 课堂管理员
PROFESSOR = 3 # 课程老师 PROFESSOR = 3 # 课程老师
ASSISTANT_PROFESSOR = 4 # 课程助教 ASSISTANT_PROFESSOR = 4 # 课程助教
STUDENT = 5 # 学生 STUDENT = 5 # 学生
@ -233,6 +233,9 @@ export function TPMIndexHOC(WrappedComponent) {
isSuperAdmin = () => { isSuperAdmin = () => {
// return false // return false
return this.state.coursedata&&this.state.coursedata.course_identity === 0 return this.state.coursedata&&this.state.coursedata.course_identity === 0
}
isCourseAdmin = () => {
return this.state.coursedata&&this.state.coursedata.course_identity === 2
} }
//超管、运维0-1 //超管、运维0-1
isClassManagement = () => { isClassManagement = () => {
@ -537,6 +540,8 @@ export function TPMIndexHOC(WrappedComponent) {
isSuperAdmin:this.isSuperAdmin, isSuperAdmin:this.isSuperAdmin,
isAdminOrCreator:this.isAdminOrCreator, isAdminOrCreator:this.isAdminOrCreator,
isClassManagement:this.isClassManagement, isClassManagement:this.isClassManagement,
isCourseAdmin:this.isCourseAdmin,
isAdmin: this.isAdmin, isAdmin: this.isAdmin,
isAdminOrTeacher: this.isAdminOrTeacher, isAdminOrTeacher: this.isAdminOrTeacher,
isStudent: this.isStudent, isStudent: this.isStudent,

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

@ -284,7 +284,7 @@ class AccountSecure extends Component {
<div className="description"> <div className="description">
{ {
basicInfo && basicInfo.phone ? basicInfo && basicInfo.phone ?
<span>{ regPhoneAndEmail(basicInfo.phone) }</span> <span>{ basicInfo.phone }</span>
: :
<span style={{color: '#EA320E'}}>未绑定</span> <span style={{color: '#EA320E'}}>未绑定</span>
} }
@ -348,7 +348,7 @@ class AccountSecure extends Component {
<div className="description"> <div className="description">
{ {
basicInfo && basicInfo.mail ? basicInfo && basicInfo.mail ?
<span>{ regPhoneAndEmail(basicInfo.mail) }</span> <span>{ basicInfo.mail }</span>
: :
<span style={{color: '#EA320E'}}>未绑定</span> <span style={{color: '#EA320E'}}>未绑定</span>
} }

4
public/react/src/modules/user/usersInfo/InfosTopics.js
Unescape View File

@ -297,8 +297,8 @@ class InfosTopics extends Component{
let categorylist=[ let categorylist=[
{val:"普通作业",type:"normal"}, {val:"普通作业",type:"normal"},
{val:"分组作业",type:"group"}, {val:"分组作业",type:"group"},
{val:"毕设选题",type:"gtopic"}, // {val:"毕设选题",type:"gtopic"},
{val:"毕设任务",type:"gtask"}, // {val:"毕设任务",type:"gtask"},
{val:"试卷",type:"exercise"}, {val:"试卷",type:"exercise"},
{val:"问卷",type:"poll"}, {val:"问卷",type:"poll"},
] ]

22
public/react/src/modules/user/usersInfo/video/InfosVideo.js
Unescape View File

@ -288,12 +288,22 @@ function InfoVideo (props) {
个视频 个视频
</span> </span>
{categoryObj.category == 'all' && <CRoundSelect {...props} {/*{categoryObj.category == 'all' && <CRoundSelect {...props}*/}
width={'90px'} {/*width={'90px'}*/}
items={_items} {/*items={_items}*/}
onSortChange={onSortChange} {/*onSortChange={onSortChange}*/}
sortKey={sortKey } {/*sortKey={sortKey }*/}
></CRoundSelect>} {/*></CRoundSelect>}*/}
{categoryObj.category == 'all' &&<div className="fr">
<li className="drop_down">
<span className="color-grey-9 font-12">{sortKey=="published_at-desc"?"最新上传":"最早上传"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
<ul className="drop_down_normal">
<li onClick={()=>onSortChange("published_at-desc",0)}>最新上传</li>
<li onClick={()=>onSortChange("published_at-asc",1)}>最早上传</li>
</ul>
</li>
</div>}
</div> </div>

Write Preview
Loading…
Cancel
Save