提交 8bf40b81 编写于 作者: 刘英杰's avatar 刘英杰

V1.0.2.241215-250305

上级 94c3ceb4
流水线 #34996 已通过 ,包含阶段
in 2 minute 和 31 second
文件已添加
...@@ -116,7 +116,11 @@ _# 竞赛管理系统 ...@@ -116,7 +116,11 @@ _# 竞赛管理系统
- 赛事报名/成绩申报/奖励申请各列表和重新申请表单》“同步”上述表单变动; - 赛事报名/成绩申报/奖励申请各列表和重新申请表单》“同步”上述表单变动;
- 审批/详情》团队样式“同步”上述表单变动 - 审批/详情》团队样式“同步”上述表单变动
8. 优化全局附件预览方式; 8. 优化全局附件预览方式;
- 20250512
# 版本号:V1.0.2.241215-250305
# 备注:PC端修改项
# 部署:前端PC
1. 赛事报名/赛事报名重新发起》课程选择器〉查询数据后,选中数据不存在于查询数据中,选中数据则会被清空(完成,取消接口查询);
......
[data-v-3c560c22] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.tableNotPd[data-v-3c560c22] .ivu-card-body{padding:0 0 15px 0}.selectCompetitionNumber[data-v-3c560c22] .ivu-select-dropdown{width:500px!important;max-height:unset;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute}.filelist[data-v-3c560c22]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3c560c22]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;min-height:550px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}@media screen and (max-width:1500px){.containerTemplate{width:80%;height:90vh;overflow-y:auto}}@media screen and (min-width:1500px){.containerTemplate{width:60%;height:90vh;overflow-y:auto}}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px} [data-v-66707e90] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.tableNotPd[data-v-66707e90] .ivu-card-body{padding:0 0 15px 0}.selectCompetitionNumber[data-v-66707e90] .ivu-select-dropdown{width:500px!important;max-height:unset;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute}.filelist[data-v-66707e90]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-66707e90]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;min-height:550px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}@media screen and (max-width:1500px){.containerTemplate{width:80%;height:90vh;overflow-y:auto}}@media screen and (min-width:1500px){.containerTemplate{width:60%;height:90vh;overflow-y:auto}}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file \ No newline at end of file
.tableNotPd[data-v-14048c81]{border-radius:0!important;margin-bottom:20px}.tableNotPd[data-v-14048c81] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-14048c81] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-14048c81] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-14048c81] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-14048c81] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-14048c81]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-14048c81]:hover{color:red;transform:scale(1.5)}.tableNotPd[data-v-14b9dc3d]{border-radius:0!important;margin-bottom:20px}.tableNotPd[data-v-14b9dc3d] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-14b9dc3d] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-14b9dc3d] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.filelist[data-v-14b9dc3d]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-14b9dc3d]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-9667c174]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-9667c174]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-9667c174]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-9667c174]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-9667c174]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-9667c174]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-9667c174]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-9667c174]:hover{transform:scale(1.2)}.carClass[data-v-9667c174]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-9667c174] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .tableNotPd[data-v-14048c81]{border-radius:0!important;margin-bottom:20px}.tableNotPd[data-v-14048c81] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-14048c81] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-14048c81] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-14048c81] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-14048c81] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-14048c81]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-14048c81]:hover{color:red;transform:scale(1.5)}.tableNotPd[data-v-8d805862]{border-radius:0!important;margin-bottom:20px}.tableNotPd[data-v-8d805862] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-8d805862] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-8d805862] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.filelist[data-v-8d805862]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-8d805862]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-9667c174]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-9667c174]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-9667c174]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-9667c174]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-9667c174]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-9667c174]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-9667c174]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-9667c174]:hover{transform:scale(1.2)}.carClass[data-v-9667c174]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-9667c174] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file \ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.bb876714.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.760a789e.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.1af9eb73.js></script><script src=js/app~748942c6.562582a5.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.666f0f85.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.760a789e.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.eaeb94f8.js></script><script src=js/app~748942c6.a4d1e57d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
width: 100%; width: 100%;
" "
> >
V1.0.1.241215-250311 V1.0.2.241215-250311
</span> </span>
</div> </div>
</div> </div>
......
...@@ -153,9 +153,10 @@ ...@@ -153,9 +153,10 @@
multiple multiple
v-model="formValidate.course_id_list" v-model="formValidate.course_id_list"
filterable filterable
:remote-method="remoteMethod"
:loading="associatedCurriculum.loading"> :loading="associatedCurriculum.loading">
<Option v-for="(option, index) in associatedCurriculum.options" :value="option.value" :key="index">{{option.label}}</Option> <Option v-for="(option, index) in associatedCurriculum.options" :value="option.value" :key="index">{{option.label}}</Option>
<!-- :remote-method="remoteMethod"-->
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
...@@ -1842,7 +1843,7 @@ export default { ...@@ -1842,7 +1843,7 @@ export default {
courseChange(e){ courseChange(e){
if(this.formValidate.course_id_list.length > 3){ if(this.formValidate.course_id_list.length > 3){
this.$Message.warning('关联课程最多只能选择3门') this.$Message.warning('关联课程最多只能选择3门')
this.formValidate.course_id_list = this.formValidate.course_id_list.slice(0, 3); this.formValidate.course_id_list.pop();
} }
}, },
//学生个人赛事添加团队成员 //学生个人赛事添加团队成员
...@@ -2947,7 +2948,7 @@ export default { ...@@ -2947,7 +2948,7 @@ export default {
res.response.race_level = Number(res.response.race_level) res.response.race_level = Number(res.response.race_level)
res.response.money = String(res.response.money) res.response.money = String(res.response.money)
this.formValidate = res.response; this.formValidate = res.response;
this.formValidate.course_id_list = res.response.course_id ? res.response.course_id.split(';') : [], this.formValidate.course_id_list = res.response.course_id ? res.response.course_id.split(';').filter(cur=>cur) : []
this.formValidate.competitionTimeRange = [ this.formValidate.competitionTimeRange = [
res.response.begin_time ? res.response.begin_time.split(' 00:00')[0] : undefined, res.response.begin_time ? res.response.begin_time.split(' 00:00')[0] : undefined,
res.response.end_time ? res.response.end_time.split(' 00:00')[0] : undefined] res.response.end_time ? res.response.end_time.split(' 00:00')[0] : undefined]
......
...@@ -168,11 +168,12 @@ ...@@ -168,11 +168,12 @@
v-model="formValidate.course_id_list" v-model="formValidate.course_id_list"
filterable filterable
@on-change="courseChange" @on-change="courseChange"
:remote-method="remoteMethod"
:loading="associatedCurriculum.loading"> :loading="associatedCurriculum.loading">
<Option v-for="(option, index) in associatedCurriculum.options" :value="option.value" <Option v-for="(option, index) in associatedCurriculum.options" :value="option.value"
:key="index">{{ option.label }} :key="index">{{ option.label }}
</Option> </Option>
<!-- :remote-method="remoteMethod"-->
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
...@@ -1224,16 +1225,16 @@ ...@@ -1224,16 +1225,16 @@
</TabPane> </TabPane>
<TabPane label="添加教师" name="1"> <TabPane label="添加教师" name="1">
<div style="display: flex;"> <div style="display: flex;">
<!-- <RadioGroup v-model="formValidate3.is_lead">--> <!-- <RadioGroup v-model="formValidate3.is_lead">-->
<!-- <Radio--> <!-- <Radio-->
<!-- v-for="(item,idnex) in is_teacChekArray.filter(cur=>cur.value !== 0)"--> <!-- v-for="(item,idnex) in is_teacChekArray.filter(cur=>cur.value !== 0)"-->
<!-- :key="idnex"--> <!-- :key="idnex"-->
<!-- :label="item.value"--> <!-- :label="item.value"-->
<!-- border--> <!-- border-->
<!-- >--> <!-- >-->
<!-- {{ item.label }}--> <!-- {{ item.label }}-->
<!-- </Radio>--> <!-- </Radio>-->
<!-- </RadioGroup>--> <!-- </RadioGroup>-->
<div <div
style=" justify-content: flex-end;height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap"> style=" justify-content: flex-end;height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
<Input <Input
...@@ -1642,6 +1643,7 @@ export default { ...@@ -1642,6 +1643,7 @@ export default {
}, },
}, },
associatedCurriculum: { associatedCurriculum: {
initOptions:[],
loading: false, loading: false,
options: [] options: []
}, },
...@@ -1718,7 +1720,7 @@ export default { ...@@ -1718,7 +1720,7 @@ export default {
loading: false, loading: false,
} }
}, },
selectMemberTeacher:'0', selectMemberTeacher: '0',
selectMember: '0', selectMember: '0',
tabsName: '0', tabsName: '0',
value: [], value: [],
...@@ -2447,10 +2449,11 @@ export default { ...@@ -2447,10 +2449,11 @@ export default {
//方法集合", //方法集合",
methods: { methods: {
//限制关联课程为3门 //限制关联课程为3门
courseChange(e){ courseChange(e) {
if(this.formValidate.course_id_list.length > 3){ if (this.formValidate.course_id_list.length >= 4) {
this.$Message.warning('关联课程最多只能选择3门') this.$Message.warning('关联课程最多只能选择3门')
this.formValidate.course_id_list = this.formValidate.course_id_list.slice(0, 3); // this.formValidate.course_id_list = this.formValidate.course_id_list.slice(0, 3);
this.formValidate.course_id_list.pop()
} }
}, },
...@@ -2502,8 +2505,15 @@ export default { ...@@ -2502,8 +2505,15 @@ export default {
value: cur.id value: cur.id
} }
}) })
this.associatedCurriculum.initOptions = res.response.map(cur => {
return {
label: cur.name,
value: cur.id
}
})
this.associatedCurriculum.loading = false; this.associatedCurriculum.loading = false;
}) })
console.log("🚀查询关联课程数据🚀🚀,",this.formValidate.course_id_list)
}, },
//查询关联课程 //查询关联课程
remoteMethod(query) { remoteMethod(query) {
...@@ -2534,8 +2544,8 @@ export default { ...@@ -2534,8 +2544,8 @@ export default {
this.formValidate.way = Number(!Boolean(this.formValidate.way)) this.formValidate.way = Number(!Boolean(this.formValidate.way))
}, },
}); });
}else if (this.formValidate.report_code){ } else if (this.formValidate.report_code) {
console.log("🚀this.formValidate.report_code🚀🚀,",this.formValidate.report_code) console.log("🚀this.formValidate.report_code🚀🚀,", this.formValidate.report_code)
this.save() this.save()
} }
}, },
...@@ -3577,6 +3587,9 @@ export default { ...@@ -3577,6 +3587,9 @@ export default {
this.tableKeys++ this.tableKeys++
}, },
save(back = '') { save(back = '') {
//重新刷新课程数据
const fun = async (changecommitid) => { const fun = async (changecommitid) => {
// this.formValidate.competition_method = 0 // this.formValidate.competition_method = 0
let formValidate = _.cloneDeep(this.formValidate) let formValidate = _.cloneDeep(this.formValidate)
...@@ -3598,6 +3611,7 @@ export default { ...@@ -3598,6 +3611,7 @@ export default {
return api.FlowChangeCommit(data).then(res1 => { return api.FlowChangeCommit(data).then(res1 => {
this.$refs.save.load = false this.$refs.save.load = false
this.$refs.save1.load = false this.$refs.save1.load = false
// this.getAssociatedCourses()
return res1 return res1
}).finally(() => { }).finally(() => {
this.$refs.save.load = false this.$refs.save.load = false
...@@ -3605,7 +3619,10 @@ export default { ...@@ -3605,7 +3619,10 @@ export default {
}) })
}) })
if (back === 1 && res.code === 1) this.$router.back() if (back === 1 && res.code === 1) this.$router.back()
if (res.code === 1) this.FlowInit() if (res.code === 1) {
await this.FlowInit()
}
} }
switch (this.changecommitid) { switch (this.changecommitid) {
...@@ -3633,8 +3650,10 @@ export default { ...@@ -3633,8 +3650,10 @@ export default {
this.formValidate = { this.formValidate = {
...res.response.competition_sign, ...res.response.competition_sign,
money: String(res.response.competition_sign.money), money: String(res.response.competition_sign.money),
course_id_list: res.response.competition_sign.course_id ? res.response.competition_sign.course_id.split(';') : [], course_id_list: res.response.competition_sign.course_id ? res.response.competition_sign.course_id.split(';').filter(cur=>cur) : [],
} }
if (res.response.competition_sign.competition_type_name !== 'A类') this.formValidate.class_hour = String(0) if (res.response.competition_sign.competition_type_name !== 'A类') this.formValidate.class_hour = String(0)
this.formValidate.competitionTimeRange = [ this.formValidate.competitionTimeRange = [
res.response.competition_sign.begin_time !== null ? res.response.competition_sign.begin_time.split(' 00:00')[0] : undefined, res.response.competition_sign.begin_time !== null ? res.response.competition_sign.begin_time.split(' 00:00')[0] : undefined,
...@@ -3649,7 +3668,7 @@ export default { ...@@ -3649,7 +3668,7 @@ export default {
this.module_id = res.response.module_id this.module_id = res.response.module_id
this.module = res.response.module this.module = res.response.module
console.log("🚀🚀this.forformValidatemValidate🚀,", this.formValidate)
this.getAListOfRegistrationExperts() //获取专家数据 this.getAListOfRegistrationExperts() //获取专家数据
break; break;
} }
...@@ -3772,7 +3791,7 @@ export default { ...@@ -3772,7 +3791,7 @@ export default {
handleSubmit() { handleSubmit() {
this.$refs['formValidate'].validate(async (cur) => { this.$refs['formValidate'].validate(async (cur) => {
//&& this.formValidate.course_id_list.length > 0 //&& this.formValidate.course_id_list.length > 0
console.log("🚀🚀cur🚀,", cur,this.$refs['formValidate']) console.log("🚀🚀cur🚀,", cur, this.$refs['formValidate'])
if (cur) { if (cur) {
if (!!this.preparationPlan.length) { if (!!this.preparationPlan.length) {
if (this.timeState) { if (this.timeState) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或