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

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

Browse Source 
# Conflicts:
#	app/controllers/subjects_controller.rb
#	public/react/src/App.js
#	public/react/src/modules/courses/coursesPublic/Addcourses.js
#	public/react/src/modules/modals/Certifiedprofessional.js
#	public/react/src/modules/modals/certfed.css
dev_hs
杨树明 6 years ago
parent 09df772c2f 926a8748f2
commit c61f3c1e8b
17 changed files with 1226 additions and 1129 deletions
Show Stats Download Patch File Download Diff File

15
app/controllers/subjects_controller.rb
Unescape View File

@ -85,6 +85,16 @@ class SubjectsController < ApplicationController
# 合作团队
@shixuns = @subject.shixuns.published.pluck(:id)
@courses = @subject.courses if @subject.excellent
@members = @subject.subject_members.includes(:user)
shixuns = @subject.shixuns.published.pluck(:id)
challenge_ids = Challenge.where(shixun_id: shixuns).pluck(:id)
# 实训路径中的所有实训标签
@tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
# 用户获取的实训标签
# @user_tags = @subject.shixuns.map(&:user_tags_name).flatten.uniq
@user_tags = user_shixun_tags challenge_ids, @user.id
@my_subject_progress = @subject.my_subject_progress
# 访问数变更
@subject.increment!(:visits)
end
@ -163,8 +173,9 @@ class SubjectsController < ApplicationController
tag_ids = @shixuns.joins(:shixun_tag_repertoires).pluck(:tag_repertoire_id).uniq
@tags = TagRepertoire.select([:id, :name]).where(id: tag_ids)
unless @search.blank?
@shixuns = @shixuns.where("name like ?", "%#{@search}%")
unless params[:search].blank?
@shixuns = @shixuns.joins(:user).where("shixuns.name like ? or concat(users.lastname, users.firstname) like ?",
"%#{@search}%", "%#{@search}%").distinct
end
unless @type.nil? || @type == "" || @type == "all"

22
app/views/subjects/show.json.jbuilder
Unescape View File

@ -24,3 +24,25 @@ if @subject.excellent
json.course_status subject_course_status course
end
end
json.members @members do |member|
json.partial! 'subject_member', locals: { user: member.user }
json.role member.role
end
# 技能标签
json.tags @tags do |tag|
unless tag.blank?
json.tag_name tag
json.status @user_tags.include?(tag)
end
end
# 我的进展
json.progress do
json.my_score @subject.my_subject_score
json.all_score @subject.all_score
json.learned @subject.my_subject_progress
json.time @subject.my_consume_time
end

2
public/react/scripts/build.js
Unescape View File

@ -198,6 +198,8 @@ function generateNewIndexJsp() {
var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
// .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
// ${cdnHost} 加了cdn后，这个文件里的字体文件加载会有跨域的报错 ../fonts/fontawesome-webfont.eot
// TODO tpi 评测结果关闭也使用了fontawesome
.replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
.replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
.replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)

BIN
public/react/src/images/cert/shimingrenzheng.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/react/src/images/cert/zhiyerenzheng.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

15
public/react/src/modules/courses/coursesPublic/Addcourses.js
Unescape View File

@ -213,11 +213,9 @@ class Addcourses extends Component{
student:student
}
).then((response) => {
console.log(217);
console.log(response);
if(response === undefined){
this.setState({
Addcoursestype:false,
// Addcoursestype:false,
isSpin:false
});
return
@ -260,7 +258,7 @@ class Addcourses extends Component{
});
this.setState({
Addcoursestype:false
});
})
if(Addcoursestype===true){
this.props.hideAddcoursestype();
}
@ -276,14 +274,15 @@ class Addcourses extends Component{
}
this.setState({
Addcoursestype:false,
isSpin:false
})
});
}).catch((error) => {
console.log(error);
console.log("报错了报错报错了");
console.log(error)
this.setState({
Addcoursestype:false,
isSpin:false
})
});
})
// if(value===0){

156
public/react/src/modules/courses/coursesPublic/SelectSetting.js
Unescape View File

@ -632,89 +632,89 @@ class Selectsetting extends Component{
{this.state.newfileListtypes===true?<p className={"color-red"}>请先上传资源</p>:""}
{/*<p className={"winth540"}>*/}
{/*<style>{`*/}
{/*.ant-checkbox-wrapper{*/}
{/*margin-left:0px !important;*/}
{/*margin-top:10px;*/}
{/*}*/}
{/*`}</style>*/}
{/*<div className={this.state.fileListtype===true?"mt30":""}>*/}
{/*<Checkbox*/}
{/*checked={is_public}*/}
{/*onChange={this.onChangepublics}>*/}
{/*<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>*/}
{/*</Checkbox>*/}
{/*</div>*/}
{/*/!*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*!/*/}
{/*/!*{this.state.course_groupss&&this.state.course_groupss.length>0?<Checkbox*!/*/}
{/*/!*checked={unified_setting}*!/*/}
{/*/!*onChange={this.onChangesettings}>*!/*/}
{/*/!*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*!/*/}
{/*/!*</Checkbox>:""}*!/*/}
<p className={"winth540"}>
<style>{`
.ant-checkbox-wrapper{
margin-left:0px !important;
margin-top:10px;
}
`}</style>
{/*<style>*/}
{/*{`*/}
{/*.Selectleft20{*/}
{/*margin-left: 20px !important;*/}
{/*width: 176px;*/}
{/*height: 40px; */}
{/*}*/}
{/*.resourcebox{*/}
{/*max-height:150px;*/}
{/*overflow: auto;*/}
{/*}*/}
{/*`}*/}
{/*</style>*/}
<div className={this.state.fileListtype===true?"mt30":""}>
<Checkbox
checked={is_public}
onChange={this.onChangepublics}>
<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>
</Checkbox>
</div>
{/*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*/}
{/*{this.state.course_groupss&&this.state.course_groupss.length>0?<Checkbox*/}
{/*checked={unified_setting}*/}
{/*onChange={this.onChangesettings}>*/}
{/*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*/}
{/*</Checkbox>:""}*/}
<style>
{`
.Selectleft20{
margin-left: 20px !important;
width: 176px;
height: 40px;
}
.resourcebox{
max-height:150px;
overflow: auto;
}
`}
</style>
{/*/!*this.props.has_course_groups&&this.props.has_course_groups===true?:""*!/*/}
{/*<div className={"resourcebox"}>*/}
{/*{unified_setting===false?*/}
{/*this.state.course_groups&&this.state.course_groups.map((item,key)=>{*/}
{/*return(*/}
{/*<div className={"mt10 "} key={key}>*/}
{/*this.props.has_course_groups&&this.props.has_course_groups===true?:""*/}
<div className={"resourcebox"}>
{unified_setting===false?
this.state.course_groups&&this.state.course_groups.map((item,key)=>{
return(
<div className={"mt10 "} key={key}>
{/*<Select placeholder="请选择分班名称"*/}
{/*value={item.course_group_id}*/}
{/*style={{ width: 200 }}*/}
{/*onChange={(e,index)=>this.selectassigngroups(e,index,key)}*/}
{/*>*/}
{/*{ this.state.course_groupss&&this.state.course_groupss.map((item,key)=>{*/}
{/*return(*/}
{/*<Option value={item.id} key={key}>{item.name}</Option>*/}
{/*)*/}
{/*})}*/}
{/*</Select>*/}
{/*<DatePicker*/}
{/*showToday={false}*/}
{/*dropdownClassName="hideDisable"*/}
{/*showTime={{ format: 'HH:mm' }}*/}
{/*format="YYYY-MM-DD HH:mm"*/}
{/*locale={locale}*/}
{/*placeholder="请选择发布时间"*/}
{/*id={"startimes"}*/}
{/*className={"Selectleft20"}*/}
{/*width={"200px"}*/}
{/*value={item.publish_time===undefined||item.publish_time===""?"":item.publish_time===null?"":moment(item.publish_time, dateFormat)}*/}
{/*onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}*/}
{/*// onChange={ this.onChangeTimepublish }*/}
{/*disabledTime={disabledDateTime}*/}
{/*disabledDate={disabledDate}*/}
{/*/>*/}
{/*{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}*/}
{/*{key===course_groups.length-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}*/}
{/*</div>*/}
{/*)*/}
{/*}):""}*/}
{/*</div>*/}
{/*</p>*/}
<Select placeholder="请选择分班名称"
value={item.course_group_id}
style={{ width: 200 }}
onChange={(e,index)=>this.selectassigngroups(e,index,key)}
>
{ this.state.course_groupss&&this.state.course_groupss.map((item,key)=>{
return(
<Option value={item.id} key={key}>{item.name}</Option>
)
})}
</Select>
<DatePicker
showToday={false}
dropdownClassName="hideDisable"
showTime={{ format: 'HH:mm' }}
format="YYYY-MM-DD HH:mm"
locale={locale}
placeholder="请选择发布时间"
id={"startimes"}
className={"Selectleft20"}
width={"200px"}
value={item.publish_time===undefined||item.publish_time===""?"":item.publish_time===null?"":moment(item.publish_time, dateFormat)}
onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}
// onChange={ this.onChangeTimepublish }
disabledTime={disabledDateTime}
disabledDate={disabledDate}
/>
{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
{key===course_groups.length-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}
</div>
)
}):""}
</div>
</p>
<style>
{`
#startime .ant-calendar-picker-icon{
@ -723,7 +723,7 @@ class Selectsetting extends Component{
`}
</style>
{unified_setting===true?
<p className={this.state.fileListtype===true?"mt30":""}>
<p className={"mt10"}>
<span>
<DatePicker
showToday={false}

144
public/react/src/modules/courses/coursesPublic/sendResource.js
Unescape View File

@ -469,81 +469,81 @@ class Sendresource extends Component{
{newfileListtype===true&&this.state.fileListtype===false?<p className={"color-red"}>请先上传资源</p>:""}
{/*<p className={"winth540"}>*/}
{/*<style>{`*/}
{/*.ant-checkbox-wrapper{*/}
{/*margin-left:0px !important;*/}
{/*margin-top:10px;*/}
{/*}*/}
{/*`}</style>*/}
{/*<div className={this.state.fileListtype===true?"mt30":""}></div><Checkbox checked={is_public} onChange={this.onChangepublic}>*/}
{/*<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>*/}
{/*</Checkbox>*/}
{/*/!*{this.state.course_groups_count&&this.state.course_groups_count>0?<Checkbox checked={is_unified_setting} onChange={this.onChangesetting}>*!/*/}
{/*/!*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*!/*/}
{/*/!*</Checkbox>:""}*!/*/}
{/*<style>{`*/}
{/*.Selectleft20{*/}
{/*margin-left: 20px !important;*/}
{/*width: 176px;*/}
{/*height: 40px; */}
{/*}*/}
{/*#startimes .ant-calendar-picker-icon{*/}
{/*margin-top:-11px;*/}
{/*}*/}
{/*.resourcebox{*/}
{/*max-height:150px;*/}
{/*overflow: auto;*/}
{/*}*/}
{/*`}</style>*/}
{/*<div className={"resourcebox"}>*/}
{/*{is_unified_setting===false?*/}
{/*course_group_publish_times.map((item,key)=>{*/}
{/*return(*/}
{/*<div className={"mt10"} key={key}>*/}
{/*<Select placeholder="请选择分班名称"*/}
{/*value={item.course_group_id}*/}
{/*style={{ width: 200 }}*/}
{/*onChange={(e,index)=>this.selectassigngroups(e,index,key)}*/}
{/*>*/}
{/*{course_groups&&course_groups.map((item,key)=>{*/}
{/*return(*/}
{/*<Option value={item.id} key={key}>{item.name}</Option>*/}
{/*)*/}
{/*})}*/}
{/*</Select>*/}
{/*<DatePicker*/}
{/*dropdownClassName="hideDisable"*/}
{/*showTime={{ format: 'HH:mm' }}*/}
{/*locale={locale}*/}
{/*showToday={false}*/}
{/*format={dateFormat}*/}
{/*placeholder="请选择发布时间"*/}
{/*id={"startimes"}*/}
{/*className={"Selectleft20 "}*/}
{/*width={"200px"}*/}
{/*value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}*/}
{/*onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}*/}
{/*// onChange={ this.onChangeTimepublish }*/}
{/*disabledTime={disabledDateTime}*/}
{/*disabledDate={disabledDate}*/}
{/*/>*/}
{/*{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}*/}
{/*{key===course_group_publish_times.length-1&&key<this.state.course_groups_count-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}*/}
{/*</div>*/}
{/*)*/}
{/*})*/}
<p className={"winth540"}>
<style>{`
.ant-checkbox-wrapper{
margin-left:0px !important;
margin-top:10px;
}
`}</style>
{/*:""}*/}
{/*</div>*/}
<div className={this.state.fileListtype===true?"mt30":""}></div><Checkbox checked={is_public} onChange={this.onChangepublic}>
<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>
</Checkbox>
{/*</p>*/}
{/*{this.state.course_groups_count&&this.state.course_groups_count>0?<Checkbox checked={is_unified_setting} onChange={this.onChangesetting}>*/}
{/*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*/}
{/*</Checkbox>:""}*/}
<style>{`
.Selectleft20{
margin-left: 20px !important;
width: 176px;
height: 40px;
}
#startimes .ant-calendar-picker-icon{
margin-top:-11px;
}
.resourcebox{
max-height:150px;
overflow: auto;
}
`}</style>
<div className={"resourcebox"}>
{is_unified_setting===false?
course_group_publish_times.map((item,key)=>{
return(
<div className={"mt10"} key={key}>
<Select placeholder="请选择分班名称"
value={item.course_group_id}
style={{ width: 200 }}
onChange={(e,index)=>this.selectassigngroups(e,index,key)}
>
{course_groups&&course_groups.map((item,key)=>{
return(
<Option value={item.id} key={key}>{item.name}</Option>
)
})}
</Select>
<DatePicker
dropdownClassName="hideDisable"
showTime={{ format: 'HH:mm' }}
locale={locale}
showToday={false}
format={dateFormat}
placeholder="请选择发布时间"
id={"startimes"}
className={"Selectleft20 "}
width={"200px"}
value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}
onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}
// onChange={ this.onChangeTimepublish }
disabledTime={disabledDateTime}
disabledDate={disabledDate}
/>
{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
{key===course_group_publish_times.length-1&&key<this.state.course_groups_count-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}
</div>
)
})
:""}
</div>
</p>
{is_unified_setting===true?<p className={this.state.fileListtype===true?"mt30":"mt10"}>
{is_unified_setting===true?<p className={"mt10"}>
<span>
<DatePicker
dropdownClassName="hideDisable"

32
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -2033,7 +2033,7 @@ class Studentshavecompletedthelist extends Component {
page:1,
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
// notlimiteds = () => {
// this.setState({
@ -2160,7 +2160,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2177,7 +2177,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2195,7 +2195,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
}
@ -2218,7 +2218,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
}
funtaskstatustwo = (checkedValues, data) => {
@ -2240,7 +2240,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2257,7 +2257,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2278,7 +2278,7 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.props.setcourse_groupysls(checkedValues)
}
@ -2299,7 +2299,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
};
//搜索学生按钮输入 老师
@ -2316,7 +2316,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
// console.log(value)
@ -2353,6 +2353,8 @@ class Studentshavecompletedthelist extends Component {
//排序
funordersy = (e) => {
console.log(this.state.course_groupyslstwo);
debugger
if (e === "end_at") {
// 时间
// 时间排序是从小到大
@ -2367,7 +2369,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
}
if (e === "score") {
@ -2385,7 +2387,7 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
}
if (e === "student_id") {
@ -2402,7 +2404,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
}
}
setExerciseReviewAndAnswer = () => {
@ -2588,6 +2590,7 @@ class Studentshavecompletedthelist extends Component {
{data === undefined ? "" : <Table
dataSource={data}
columns={columnsys}
className="mysjysltable1"
pagination={false}
loading={loadingstate}
// onChange={this.TablePaginationsy}
@ -2683,6 +2686,7 @@ class Studentshavecompletedthelist extends Component {
{datas === undefined ? "" : <Table
dataSource={datas}
columns={columnss}
className="mysjysltable2"
pagination={false}
loading={false}
/>}
@ -2716,6 +2720,7 @@ class Studentshavecompletedthelist extends Component {
dataSource={data}
columns={columnstwo}
// showHeader={false}
className="mysjysltable3"
pagination={false}
loading={false}
@ -2789,6 +2794,7 @@ class Studentshavecompletedthelist extends Component {
dataSource={datas}
columns={columns}
pagination={false}
className="mysjysltable4"
loading={loadingstate}
/>}</div>
</div>

52
public/react/src/modules/modals/Certifiedprofessional.js
Unescape View File

@ -1,7 +1,9 @@
import React, { Component } from 'react';
import { Modal} from 'antd';
import axios from 'axios';
import certfed from './certfed.css';
import shimingrenzheng from '../../../src/images/cert/shimingrenzheng.png';
import zhiyerenzheng from '../../../src/images/cert/zhiyerenzheng.png';
import './certfed.css';
//认证职业
class Certifiedprofessional extends Component {
@ -53,7 +55,7 @@ class Certifiedprofessional extends Component {
};
setDownload=()=>{
window.location.href="/account/certification"
}
@ -61,6 +63,7 @@ class Certifiedprofessional extends Component {
render() {
// console.log("加入金品课堂2");
// console.log(this.props);
let{occupation} =this.state;
return(
<Modal
keyboard={false}
@ -74,21 +77,48 @@ class Certifiedprofessional extends Component {
heigth="307px"
>
<div className="educouddiv">
<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{fontSize: "16px",marginTop:"26px"}}>请在完成条件后重试</p></div>
<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{fontSize: "16px"}}>请在完成条件后重试</p></div>
{
occupation=== 3?
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className="mr30">
<span className="fontsizecoirlysltwo">未实名认证</span>
<div className="mr55 imgysldivone">
<img className="yslimgwidthte"
src={shimingrenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未实名认证</span>
</div>
<div >
<span className="fontsizecoirlysltwo">未职业认证</span>
<div className="imgysldivone">
<img className="yslimgwidthte"
src={zhiyerenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未职业认证</span>
</div>
</div>
:occupation=== 2?
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className="imgysldivone">
<img className="yslimgwidthte"
src={zhiyerenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未职业认证</span>
</div>
</div>
<div className="clearfix edu-txt-center mt60">
:
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className=" imgysldivone">
<img className="yslimgwidthte"
src={shimingrenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未实名认证</span>
</div>
</div>
}
<div className="clearfix edu-txt-center mt28">
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即认证</a>
<a className="task-btn mr60 w90" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange w90" onClick={()=>this.setDownload()}>立即认证</a>
</div>
</div>
</Modal>

23
public/react/src/modules/modals/certfed.css
Unescape View File

@ -19,3 +19,26 @@
font-size: 14px;
color: #979797;
}
.imgysldivone{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.yslimgwidthte{
width: 40px;
height: 37px;
}
.mr55{
margin-right: 55px;
}
.mt28{
margin-top: 28px;
}
.w90{
width: 90px;
}
.mr60{
margin-right: 60px;
}

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

@ -449,7 +449,7 @@ class DetailCardsEditAndAdd extends Component{
<Spin spinning={hometypepvisible} size="large" style={{marginTop:'15%'}}>
<div className="newupload_conbox">
<div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ type===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ parseInt(type)===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
{
ChooseShixunList && ChooseShixunList.tags.map((item,key)=>{
return(

3
public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
Unescape View File

@ -81,6 +81,7 @@ class DetailCardsEditAndEdit extends Component{
//打开选择实训弹框初始化tag标签和列表
changeTag(id,search){
this.setState({
ChooseShixunListshixun_list:[],
page:1,
@ -481,7 +482,7 @@ class DetailCardsEditAndEdit extends Component{
<Spin spinning={hometypepvisible} size="large" style={{marginTop:'15%'}}>
<div className="newupload_conbox">
<div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ type===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ parseInt(type)===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
{
ChooseShixunList && ChooseShixunList.tags.map((item,key)=>{
return(

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

@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?9`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?9`));
// index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?9`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')

2
public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
Unescape View File

@ -43,6 +43,8 @@ function doCreateUploader (options) {
retryDuration: $('#retryDuration').val() || 2,
region: $('#region').val() || 'ap-southeast-1',
userId: $('#userId').val() || 1829848226361863, // 1303984639806000,
// 解决取消上传后无法继续上传同文件的问题
// https://workorder.console.aliyun.com/console.htm#/ticket/detail/?ticketId=FLASELR
enableUploadProgress: false,
// 添加文件成功
addFileSuccess: function (uploadInfo) {

1
public/react/src/modules/user/usersInfo/video/VideoUploadList.js
Unescape View File

@ -70,6 +70,7 @@ function VideoUploadList (props) {
&& file.name.indexOf('.webm') == -1
) {
showNotification(`不支持的视频格式`)
clearInput()
return;
}
if (file.size > 200 * 1024 * 1024) {

Write Preview
Loading…
Cancel
Save