提交 7053bb4f 编写于 作者: 刘英杰's avatar 刘英杰

- 20240717更新

上级 d2fa94e5
流水线 #27887 已通过 ,包含阶段
in 42 second
.buttonFocus[data-v-40eaa8d2]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-40eaa8d2]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-40eaa8d2]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-7769bfe8]:focus{background-color:#2d8cf0;color:#fff}
\ No newline at end of file
.tableList[data-v-2ce56c92]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2ce56c92]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-2ce56c92]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2ce56c92]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2ce56c92]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-2ce56c92]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-2ce56c92]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-2ce56c92]:hover{transform:scale(1.2)}.carClass[data-v-2ce56c92]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-2ce56c92] .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
.tableList[data-v-cd819aec]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-cd819aec]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-cd819aec]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-cd819aec]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-cd819aec]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-cd819aec]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-cd819aec]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-cd819aec]:hover{transform:scale(1.2)}.carClass[data-v-cd819aec]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-cd819aec] .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
[data-v-e92c37f8] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-e92c37f8] .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-e92c37f8]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e92c37f8]:hover{color:red;transform:scale(1.5)}[data-v-50e36116] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-50e36116] .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-50e36116]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-50e36116]: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)} [data-v-1ddb1816] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-1ddb1816] .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-1ddb1816]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-1ddb1816]:hover{color:red;transform:scale(1.5)}[data-v-646029d0] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-646029d0] .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-646029d0]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-646029d0]: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)}
\ No newline at end of file \ No newline at end of file
.con[data-v-cc7f2272]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-cc7f2272]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-cc7f2272]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-cc7f2272]:hover{color:red;transform:scale(1.5)}[data-v-1e6167cb] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1e6167cb] .ivu-select-dropdown{width:500px;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}.con[data-v-1e6167cb]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1e6167cb]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-1e6167cb]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1e6167cb]:hover{color:red;transform:scale(1.5)}.con[data-v-517ce0f3]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-517ce0f3]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-517ce0f3]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-517ce0f3]:hover{color:red;transform:scale(1.5)}[data-v-b9f5d926] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-b9f5d926] .ivu-select-dropdown{width:500px;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}.con[data-v-b9f5d926]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-b9f5d926]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-b9f5d926]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-b9f5d926]:hover{color:red;transform:scale(1.5)}.cancel{cursor:not-allowed;color:#c5c8ce} .con[data-v-cc7f2272]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-cc7f2272]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-cc7f2272]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-cc7f2272]:hover{color:red;transform:scale(1.5)}[data-v-1e6167cb] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1e6167cb] .ivu-select-dropdown{width:500px;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}.con[data-v-1e6167cb]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1e6167cb]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-1e6167cb]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1e6167cb]:hover{color:red;transform:scale(1.5)}.con[data-v-7907c181]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-7907c181]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-7907c181]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-7907c181]:hover{color:red;transform:scale(1.5)}[data-v-b9f5d926] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-b9f5d926] .ivu-select-dropdown{width:500px;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}.con[data-v-b9f5d926]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-b9f5d926]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-b9f5d926]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-b9f5d926]:hover{color:red;transform:scale(1.5)}.cancel{cursor:not-allowed;color:#c5c8ce}
\ No newline at end of file \ No newline at end of file
.buttonFocus[data-v-2478f6cb]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-2478f6cb]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-2478f6cb]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-7769bfe8]:focus{background-color:#2d8cf0;color:#fff}
\ 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.064c214c.css rel=stylesheet><link href=css/app.9c550e7f.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.e61d2fe0.js></script><script src=js/app.6660944c.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.064c214c.css rel=stylesheet><link href=css/app.ad11fdf3.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.affefbbf.js></script><script src=js/app.b7b84ec3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
:key="item.id"> :key="item.id">
<FormItem :label="item.name" :prop="item.name"> <FormItem :label="item.name" :prop="item.name">
<span v-if="item.type == 'input'">{{ formData[item.id] }}</span> <span v-if="item.type == 'input'">{{ formData[item.id] }}</span>
<span v-if="item.type == 'textarea'">{{ formData[item.id] }}</span>
<!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 --> <!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 -->
<span v-if="item.type == 'select'"> <span v-if="item.type == 'select'">
{{ item.optList[item.optList.findIndex(a => a.value == formData[item.id])].label }} {{ item.optList[item.optList.findIndex(a => a.value == formData[item.id])].label }}
......
...@@ -682,7 +682,7 @@ ...@@ -682,7 +682,7 @@
//import引入的组件需要注入到对象中才能使用", //import引入的组件需要注入到对象中才能使用",
components: {}, components: {},
props: [ props: [
'signId', 'signId', 'runId'
], ],
data() { data() {
//这里存放数据", //这里存放数据",
...@@ -1285,10 +1285,7 @@ ...@@ -1285,10 +1285,7 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
async mounted() { async mounted() {
// clearInterval(this.countTimer)
// setInterval(() => {
// this.save()
// }, 1000 * 60 * 10)
this.getCompetiotionName() this.getCompetiotionName()
this.formValidate.flowid = this.$route.query.id; this.formValidate.flowid = this.$route.query.id;
// this.formValidate.files_list.module = this.$route.query.remark; // this.formValidate.files_list.module = this.$route.query.remark;
...@@ -2090,14 +2087,13 @@ ...@@ -2090,14 +2087,13 @@
await this.hooks.myEncapsulationFunction(async () => { await this.hooks.myEncapsulationFunction(async () => {
this.formValidate.flowid = 102 this.formValidate.flowid = 102
let data = _.cloneDeep(this.formValidate) let data = _.cloneDeep(this.formValidate)
// 存在 runid 则是重新发起新流程
if (this.runId) data.runid = this.runId
const res = await api.FlowSignSubmit(data) const res = await api.FlowSignSubmit(data)
this.$refs.handleSubmit.load = false this.$refs.handleSubmit.load = false
if (res.code === 1) setTimeout(() => {
this.$emit('GetSignList', '') this.$emit('GetSignList', '')
// this.$router.back() this.$emit('resultValue', false)
// window.open("about:blank", "_top").close()
}, 1500)
return res return res
}) })
// hook.publicMessage(res) // hook.publicMessage(res)
......
...@@ -1550,6 +1550,7 @@ ...@@ -1550,6 +1550,7 @@
}, },
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
async mounted() { async mounted() {
console.log("🚀🚀runId🚀,", this.runId)
this.getCompetiotionName() this.getCompetiotionName()
this.formValidate.flowid = this.$route.query.id; this.formValidate.flowid = this.$route.query.id;
this.flowid = this.$route.query.id; this.flowid = this.$route.query.id;
......
...@@ -200,12 +200,18 @@ ...@@ -200,12 +200,18 @@
> >
<Spin fix v-if="importLoading"></Spin> <Spin fix v-if="importLoading"></Spin>
<div style=" display: flex;justify-content: space-around;"> <div style=" display: flex;justify-content: space-around;">
<UpdateSignModal v-if="updateSignModal && signFlag === 1" @GetSignList="getCompetitionSignList" <UpdateSignModal
v-if="updateSignModal && signFlag === 1"
@GetSignList="getCompetitionSignList"
@resultValue="resultValue" @resultValue="resultValue"
:signId="signId"></UpdateSignModal> :signId="signId">
<UpdateSignModalStudentSIgn v-if="updateSignModal && signFlag === 0" @GetSignList="getCompetitionSignList" </UpdateSignModal>
<UpdateSignModalStudentSIgn
v-if="updateSignModal && signFlag === 0"
@GetSignList="getCompetitionSignList"
@resultValue="resultValue" @resultValue="resultValue"
:signId="signId"></UpdateSignModalStudentSIgn> :signId="signId">
</UpdateSignModalStudentSIgn>
</div> </div>
<template #footer> <template #footer>
<Button type="text" @click="importModal =false">关闭</Button> <Button type="text" @click="importModal =false">关闭</Button>
......
...@@ -130,7 +130,8 @@ ...@@ -130,7 +130,8 @@
"flowid": this.flowid, "flowid": this.flowid,
"module_id": this.module_id, "module_id": this.module_id,
"module": this.module, "module": this.module,
"competition_report": formValidate, // "competition_report": formValidate,
...formValidate,
'files_list': files_list, 'files_list': files_list,
} }
......
...@@ -648,6 +648,7 @@ ...@@ -648,6 +648,7 @@
cancel() { cancel() {
}, },
reset() { reset() {
console.log("🚀🚀🚀,", 1)
//重置 //重置
this.search = { this.search = {
"name": "", "name": "",
...@@ -655,7 +656,7 @@ ...@@ -655,7 +656,7 @@
"type": "", "type": "",
"batch": "", "batch": "",
"way": "", "way": "",
"is_tea": 0, "is_tea": this.$route.path === '/eventCatalogue-teacherDirectory' ? 1 : 0,
"approval_state": "", "approval_state": "",
"h_id": "", "h_id": "",
"page_index": 1, "page_index": 1,
......
...@@ -982,6 +982,7 @@ ...@@ -982,6 +982,7 @@
form_name: row.form_name, form_name: row.form_name,
transferParams: JSON.stringify({ transferParams: JSON.stringify({
...this.transferParams, ...this.transferParams,
flow_id: this.init.flow_id1,
page_index: this.init.page_index, page_index: this.init.page_index,
page_size: this.init.page_size, page_size: this.init.page_size,
}), }),
......
...@@ -1332,6 +1332,7 @@ ...@@ -1332,6 +1332,7 @@
flowInfo: '流程详细信息', flowInfo: '流程详细信息',
transferParams: JSON.stringify({ transferParams: JSON.stringify({
...this.transferParams, ...this.transferParams,
flow_id: this.init.flow_id1,
page_index: this.init.page_index, page_index: this.init.page_index,
page_size: this.init.page_size, page_size: this.init.page_size,
}), }),
......
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<div style=" display: flex;justify-content: space-around;"> <div style=" display: flex;justify-content: space-around;">
<UpdateSignModal v-if="sign.updateSignModal && sign.signFlag === 1" @GetSignList="GetFlowTaskList" <UpdateSignModal v-if="sign.updateSignModal && sign.signFlag === 1" @GetSignList="GetFlowTaskList"
@resultValue="resultValue" @resultValue="resultValue"
:signId="sign.signId"></UpdateSignModal> :signId="sign.signId" :runId="sign.runId"></UpdateSignModal>
<UpdateSignModalStudentSIgn v-if="sign.updateSignModal && sign.signFlag === 0" @GetSignList="GetFlowTaskList" <UpdateSignModalStudentSIgn v-if="sign.updateSignModal && sign.signFlag === 0" @GetSignList="GetFlowTaskList"
@resultValue="resultValue" @resultValue="resultValue"
:signId="sign.signId" :runId="sign.runId"></UpdateSignModalStudentSIgn> :signId="sign.signId" :runId="sign.runId"></UpdateSignModalStudentSIgn>
...@@ -1392,6 +1392,7 @@ ...@@ -1392,6 +1392,7 @@
flowInfo: '流程详细信息', flowInfo: '流程详细信息',
transferParams: JSON.stringify({ transferParams: JSON.stringify({
...this.transferParams, ...this.transferParams,
flow_id: this.init.flow_id1,
page_index: this.init.page_index, page_index: this.init.page_index,
page_size: this.init.page_size, page_size: this.init.page_size,
}), }),
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或