Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
C
competitionWeb
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
competitionWeb
提交
ea99d95e
提交
ea99d95e
编写于
5月 31, 2024
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
- 20240530
- 更新文档多项...
上级
ab22331c
流水线
#26430
已通过 ,包含阶段
in 1 minute 和 20 second
变更
20
流水线
1
展开全部
显示空白字符变更
内嵌
并排
正在显示
20 个修改的文件
包含
212 行增加
和
258 行删除
+212
-258
README.md
README.md
+1
-0
chunk-0c2d31c7.3656741d.css
dist/css/chunk-0c2d31c7.3656741d.css
+1
-1
chunk-7271ef9a.ba80909d.css
dist/css/chunk-7271ef9a.ba80909d.css
+1
-0
chunk-9798bce6.ab0405c0.css
dist/css/chunk-9798bce6.ab0405c0.css
+0
-1
chunk-a825dcf0.a34268aa.css
dist/css/chunk-a825dcf0.a34268aa.css
+1
-0
index.html
dist/index.html
+1
-1
app.3827dc71.js
dist/js/app.3827dc71.js
+3
-3
chunk-0c2d31c7.22b51a88.js
dist/js/chunk-0c2d31c7.22b51a88.js
+1
-0
chunk-7271ef9a.b32c5b82.js
dist/js/chunk-7271ef9a.b32c5b82.js
+1
-0
chunk-8496bb78.c355979a.js
dist/js/chunk-8496bb78.c355979a.js
+0
-1
chunk-9798bce6.c08650ba.js
dist/js/chunk-9798bce6.c08650ba.js
+0
-1
chunk-a825dcf0.219d1de3.js
dist/js/chunk-a825dcf0.219d1de3.js
+2
-2
chunk-vendors.d17fb6d2.js
dist/js/chunk-vendors.d17fb6d2.js
+1
-1
eventStatistics.js
src/menu/modules/eventStatistics.js
+2
-2
updateCertificateModalachievementDeclaration.vue
...mponents/updateCertificateModalachievementDeclaration.vue
+77
-88
updateCertificateModalrewardForTeachersAndStudents.vue
...ts/updateCertificateModalrewardForTeachersAndStudents.vue
+70
-78
reportWorkloadAndSubsidy.vue
src/pages/competitionCount/reportWorkloadAndSubsidy.vue
+5
-5
rewardForTeachersAndStudents.vue
src/pages/competitionCount/rewardForTeachersAndStudents.vue
+14
-5
CompetitionSignForm.vue
src/pages/flowAssemble/flowComponent/CompetitionSignForm.vue
+30
-67
account.js
src/store/modules/admin/modules/account.js
+1
-2
未找到文件。
README.md
浏览文件 @
ea99d95e
...
@@ -27,3 +27,4 @@
...
@@ -27,3 +27,4 @@
-
隐藏成绩申报“详情”和“表单填写”团队获奖奖项;
-
隐藏成绩申报“详情”和“表单填写”团队获奖奖项;
-
师生奖励,团队成员金额为null 才通过比例自动计算成员奖金;
-
师生奖励,团队成员金额为null 才通过比例自动计算成员奖金;
-
赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
-
赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
-
更新文档多项...
dist/css/chunk-
8496bb78.5dc314e3
.css
→
dist/css/chunk-
0c2d31c7.3656741d
.css
浏览文件 @
ea99d95e
[
data-v-637492aa
]
.ivu-select-single
.ivu-select-selection
.ivu-select-placeholder
{
color
:
#515a6e
}
[
data-v-637492aa
]
.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-637492aa
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-637492aa
]
: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
{
margin-left
:
auto
;
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
[
data-v-7a03186c
]
.ivu-select-single
.ivu-select-selection
.ivu-select-placeholder
{
color
:
#515a6e
}
[
data-v-7a03186c
]
.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-7a03186c
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-7a03186c
]
: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
{
margin-left
:
auto
;
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
\ No newline at end of file
\ No newline at end of file
dist/css/chunk-7
74bdcbc.11a5b686
.css
→
dist/css/chunk-7
271ef9a.ba80909d
.css
浏览文件 @
ea99d95e
.carClass
[
data-v-4dd61861
]
{
border-radius
:
0
!important
;
margin-bottom
:
20px
}
.carClass
[
data-v-4dd61861
]
.ivu-card
{
display
:
block
;
background
:
#fff
;
border-radius
:
0
!important
;
font-size
:
14px
;
position
:
relative
;
transition
:
all
.2s
ease-in-out
}
[
data-v-4dd61861
]
.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-4dd61861
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-4dd61861
]
:hover
{
color
:
red
;
transform
:
scale
(
1.5
)}
.teamCardExtraText
[
data-v-4dd61861
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
.Atext
[
data-v-4dd61861
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
;
position
:
absolute
}
.Atext
[
data-v-4dd61861
]
:hover
{
transform
:
scale
(
1.2
)}
.container
[
data-v-4dd61861
]
{
width
:
100%
;
min-height
:
687px
;
height
:
auto
;
align-content
:
center
;
overflow-y
:
auto
}
.container
[
data-v-4dd61861
],
.tableList
[
data-v-2748ecda
]
{
display
:
flex
;
justify-content
:
center
;
flex-wrap
:
wrap
}
.tableList
.container1
[
data-v-2748ecda
]
{
border-collapse
:
collapse
}
.tableList
.container1
.row
[
data-v-2748ecda
]
{
width
:
100%
;
height
:
100%
}
.tableList
.container1
.colTitle
[
data-v-2748ecda
]
{
text-align
:
center
;
width
:
200px
;
height
:
50px
}
.tableList
.container1
.colContent
[
data-v-2748ecda
]
{
width
:
500px
;
height
:
50px
;
text-align
:
center
}
.Atext
[
data-v-2748ecda
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
.teamCardExtraText
[
data-v-2748ecda
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
.carClass
[
data-v-214d7e31
]
{
border-radius
:
0
!important
;
margin-bottom
:
20px
}
.carClass
[
data-v-214d7e31
]
.ivu-card
{
display
:
block
;
background
:
#fff
;
border-radius
:
0
!important
;
font-size
:
14px
;
position
:
relative
;
transition
:
all
.2s
ease-in-out
}
[
data-v-214d7e31
]
.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-214d7e31
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-214d7e31
]
:hover
{
color
:
red
;
transform
:
scale
(
1.5
)}
.teamCardExtraText
[
data-v-214d7e31
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
.Atext
[
data-v-214d7e31
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
;
position
:
absolute
}
.Atext
[
data-v-214d7e31
]
:hover
{
transform
:
scale
(
1.2
)}
.container
[
data-v-214d7e31
]
{
width
:
100%
;
min-height
:
687px
;
height
:
auto
;
align-content
:
center
;
overflow-y
:
auto
}
.container
[
data-v-214d7e31
],
.tableList
[
data-v-72322178
]
{
display
:
flex
;
justify-content
:
center
;
flex-wrap
:
wrap
}
.tableList
.container1
[
data-v-72322178
]
{
border-collapse
:
collapse
}
.tableList
.container1
.row
[
data-v-72322178
]
{
width
:
100%
;
height
:
100%
}
.tableList
.container1
.colTitle
[
data-v-72322178
]
{
text-align
:
center
;
width
:
200px
;
height
:
50px
}
.tableList
.container1
.colContent
[
data-v-72322178
]
{
width
:
500px
;
height
:
50px
;
text-align
:
center
}
.Atext
[
data-v-72322178
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
.teamCardExtraText
[
data-v-72322178
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
\ No newline at end of file
\ No newline at end of file
dist/css/chunk-9798bce6.ab0405c0.css
已删除
100644 → 0
浏览文件 @
ab22331c
.carClass
[
data-v-5dcee804
]
{
border-radius
:
0
!important
;
margin-bottom
:
20px
}
.carClass
[
data-v-5dcee804
]
.ivu-card
{
display
:
block
;
background
:
#fff
;
border-radius
:
0
!important
;
font-size
:
14px
;
position
:
relative
;
transition
:
all
.2s
ease-in-out
}
[
data-v-5dcee804
]
.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-5dcee804
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-5dcee804
]
:hover
{
color
:
red
;
transform
:
scale
(
1.5
)}
.teamCardExtraText
[
data-v-5dcee804
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
.Atext
[
data-v-5dcee804
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
;
position
:
absolute
}
.Atext
[
data-v-5dcee804
]
:hover
{
transform
:
scale
(
1.2
)}
.container
[
data-v-5dcee804
]
{
width
:
100%
;
min-height
:
687px
;
height
:
auto
;
align-content
:
center
;
overflow-y
:
auto
}
.container
[
data-v-5dcee804
],
.tableList
[
data-v-784d685d
]
{
display
:
flex
;
justify-content
:
center
;
flex-wrap
:
wrap
}
.tableList
.container1
[
data-v-784d685d
]
{
border-collapse
:
collapse
}
.tableList
.container1
.row
[
data-v-784d685d
]
{
width
:
100%
;
height
:
100%
}
.tableList
.container1
.colTitle
[
data-v-784d685d
]
{
text-align
:
center
;
width
:
200px
;
height
:
50px
}
.tableList
.container1
.colContent
[
data-v-784d685d
]
{
width
:
500px
;
height
:
50px
;
text-align
:
center
}
.Atext
[
data-v-784d685d
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
.teamCardExtraText
[
data-v-784d685d
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
\ No newline at end of file
dist/css/chunk-a825dcf0.a34268aa.css
0 → 100644
浏览文件 @
ea99d95e
.carClass
[
data-v-2fbc6ff0
]
{
border-radius
:
0
!important
;
margin-bottom
:
20px
}
.carClass
[
data-v-2fbc6ff0
]
.ivu-card
{
display
:
block
;
background
:
#fff
;
border-radius
:
0
!important
;
font-size
:
14px
;
position
:
relative
;
transition
:
all
.2s
ease-in-out
}
[
data-v-2fbc6ff0
]
.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-2fbc6ff0
]
:hover
{
color
:
#1e93ff
;
background-color
:
#f7f7f7
}
.fileddelete
[
data-v-2fbc6ff0
]
:hover
{
color
:
red
;
transform
:
scale
(
1.5
)}
.teamCardExtraText
[
data-v-2fbc6ff0
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
.Atext
[
data-v-2fbc6ff0
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
;
position
:
absolute
}
.Atext
[
data-v-2fbc6ff0
]
:hover
{
transform
:
scale
(
1.2
)}
.container
[
data-v-2fbc6ff0
]
{
width
:
100%
;
min-height
:
687px
;
height
:
auto
;
align-content
:
center
;
overflow-y
:
auto
}
.container
[
data-v-2fbc6ff0
],
.tableList
[
data-v-7466e3e0
]
{
display
:
flex
;
justify-content
:
center
;
flex-wrap
:
wrap
}
.tableList
.container1
[
data-v-7466e3e0
]
{
border-collapse
:
collapse
}
.tableList
.container1
.row
[
data-v-7466e3e0
]
{
width
:
100%
;
height
:
100%
}
.tableList
.container1
.colTitle
[
data-v-7466e3e0
]
{
text-align
:
center
;
width
:
200px
;
height
:
50px
}
.tableList
.container1
.colContent
[
data-v-7466e3e0
]
{
width
:
500px
;
height
:
50px
;
text-align
:
center
}
.Atext
[
data-v-7466e3e0
]
{
margin-bottom
:
.7vw
;
margin-top
:
.7vw
;
font-size
:
16px
}
.teamCardExtraText
[
data-v-7466e3e0
]
{
font-size
:
18px
;
font-weight
:
600
;
font-family
:
宋体
;
color
:
#1e93ff
}
\ No newline at end of file
dist/index.html
浏览文件 @
ea99d95e
<!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.ff4613ed.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.09317091.js
></script><script
src=
js/app.2d970b3d.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.ff4613ed.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.d17fb6d2.js
></script><script
src=
js/app.3827dc71.js
></script></body></html>
\ No newline at end of file
\ No newline at end of file
dist/js/app.
2d970b3d
.js
→
dist/js/app.
3827dc71
.js
浏览文件 @
ea99d95e
此差异已折叠。
点击以展开。
dist/js/chunk-0c2d31c7.22b51a88.js
0 → 100644
浏览文件 @
ea99d95e
此差异已折叠。
点击以展开。
dist/js/chunk-7271ef9a.b32c5b82.js
0 → 100644
浏览文件 @
ea99d95e
此差异已折叠。
点击以展开。
dist/js/chunk-8496bb78.c355979a.js
已删除
100644 → 0
浏览文件 @
ab22331c
此差异已折叠。
点击以展开。
dist/js/chunk-9798bce6.c08650ba.js
已删除
100644 → 0
浏览文件 @
ab22331c
此差异已折叠。
点击以展开。
dist/js/chunk-
774bdcbc.20aa25c8
.js
→
dist/js/chunk-
a825dcf0.219d1de3
.js
浏览文件 @
ea99d95e
此差异已折叠。
点击以展开。
dist/js/chunk-vendors.
09317091
.js
→
dist/js/chunk-vendors.
d17fb6d2
.js
浏览文件 @
ea99d95e
此差异已折叠。
点击以展开。
src/menu/modules/eventStatistics.js
浏览文件 @
ea99d95e
...
@@ -51,13 +51,13 @@ export default {
...
@@ -51,13 +51,13 @@ export default {
// },
// },
{
{
path
:
'
/reportWorkloadAndSubsidy
'
,
path
:
'
/reportWorkloadAndSubsidy
'
,
title
:
'
成绩申报
'
,
title
:
'
成绩申报
列表
'
,
header
:
'
home
'
,
header
:
'
home
'
,
icon
:
''
icon
:
''
},
},
{
{
path
:
'
/rewardForTeachersAndStudents
'
,
path
:
'
/rewardForTeachersAndStudents
'
,
title
:
'
师生奖励
'
,
title
:
'
奖励申请列表
'
,
header
:
'
home
'
,
header
:
'
home
'
,
icon
:
''
icon
:
''
},
},
...
...
src/pages/competitionCount/components/updateCertificateModalachievementDeclaration.vue
浏览文件 @
ea99d95e
...
@@ -341,6 +341,7 @@
...
@@ -341,6 +341,7 @@
</Card>
</Card>
</div>
</div>
<div
v-if=
"formValidate.competition_method == 0"
>
<!-- (团队信息)学生补助信息:-->
<!-- (团队信息)学生补助信息:-->
<div
<div
style=
" width: 100%;height: 5vh;display: flex;align-items: center;color: white; background-color: #2C8CF0"
>
style=
" width: 100%;height: 5vh;display: flex;align-items: center;color: white; background-color: #2C8CF0"
>
...
@@ -412,6 +413,7 @@
...
@@ -412,6 +413,7 @@
</Card>
</Card>
</div>
</div>
</div>
</div>
</div>
<!-- 展开卡片-->
<!-- 展开卡片-->
<div
class=
"Atext ivu-text-center"
>
<div
class=
"Atext ivu-text-center"
>
<!-- 1收起 0展开-->
<!-- 1收起 0展开-->
...
@@ -424,26 +426,27 @@
...
@@ -424,26 +426,27 @@
<br>
<br>
<FormItem
:key=
"fileKey"
>
<FormItem
:key=
"fileKey"
>
<div
style=
"display: flex;justify-content: flex-start;box-sizing: border-box"
>
<div
style=
"display: flex;justify-content: flex-start;box-sizing: border-box"
>
<Upload
style=
"margin-right: 10px"
:multiple=
"false"
:before-upload=
"PersonalExcellenceBeforeUpload"
:on-error=
"onError"
:on-success=
"onsuccess"
:on-format-error=
"onFormatError"
:show-upload-list=
"true"
type=
"drag"
action=
""
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
教师证书
</p>
</div>
</Upload>
<!-- <Upload-->
<!-- <Upload-->
<!-- style="margin-right: 10px"-->
<!-- style="margin-right: 10px"-->
<!-- :multiple="false"-->
<!-- :multiple="false"-->
<!-- :before-upload="TeamExcellenceBeforeUpload"-->
<!-- :before-upload="PersonalExcellenceBeforeUpload"-->
<!-- :on-error="onError"-->
<!-- :on-success="onsuccess"-->
<!-- :on-format-error="onFormatError"-->
<!-- :show-upload-list="true"-->
<!-- type="drag"-->
<!-- action=""-->
<!-- >-->
<!-- <div style="padding: 20px 30px; width: 100%;">-->
<!-- <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>-->
<!-- <p>教师证书</p>-->
<!-- </div>-->
<!-- </Upload>-->
<!-- <Upload-->
<!-- style="margin-right: 10px"-->
<!-- :multiple="false"-->
<!-- :before-upload="StudentExcellenceBeforeUpload"-->
<!-- :on-error="onError"-->
<!-- :on-error="onError"-->
<!-- :on-success="onsuccess"-->
<!-- :on-success="onsuccess"-->
<!-- :on-format-error="onFormatError"-->
<!-- :on-format-error="onFormatError"-->
...
@@ -456,6 +459,7 @@
...
@@ -456,6 +459,7 @@
<!-- </div>-->
<!-- </div>-->
<!-- </Upload>-->
<!-- </Upload>-->
<Upload
<Upload
v-if=
"formValidate.competition_method === 0"
style=
"margin-right: 10px"
style=
"margin-right: 10px"
:multiple=
"false"
:multiple=
"false"
:before-upload=
"StudentExcellenceBeforeUpload"
:before-upload=
"StudentExcellenceBeforeUpload"
...
@@ -467,22 +471,7 @@
...
@@ -467,22 +471,7 @@
action=
""
>
action=
""
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
学生证书
</p>
<p>
学生身份证明材料
</p>
</div>
</Upload>
<Upload
style=
"margin-right: 10px"
:multiple=
"false"
:before-upload=
"StudentExcellenceBeforeUpload"
:on-error=
"onError"
:on-success=
"onsuccess"
:on-format-error=
"onFormatError"
:show-upload-list=
"true"
type=
"drag"
action=
""
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
学生毕业证书
</p>
</div>
</div>
</Upload>
</Upload>
<Upload
<Upload
...
@@ -494,9 +483,9 @@
...
@@ -494,9 +483,9 @@
:show-upload-list=
"true"
:show-upload-list=
"true"
type=
"drag"
type=
"drag"
action=
""
>
action=
""
>
<div
style=
"padding: 20px 10px; width: 1
00%
;"
>
<div
style=
"padding: 20px 10px; width: 1
50px
;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
其他
(公示文件等)
</p>
<p>
其他
</p>
</div>
</div>
</Upload>
</Upload>
...
@@ -669,7 +658,7 @@
...
@@ -669,7 +658,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -718,7 +707,7 @@
...
@@ -718,7 +707,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -843,7 +832,7 @@
...
@@ -843,7 +832,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -894,7 +883,7 @@
...
@@ -894,7 +883,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
...
src/pages/competitionCount/components/updateCertificateModalrewardForTeachersAndStudents.vue
浏览文件 @
ea99d95e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<template
#title
>
<template
#title
>
<div
<div
style=
"width: 100%;height:100%; display: flex;justify-content: center;align-items: center;position: relative;"
>
style=
"width: 100%;height:100%; display: flex;justify-content: center;align-items: center;position: relative;"
>
<h2
v-title-text-color
>
师生奖励
</h2>
<h2
v-title-text-color
>
奖励申请
</h2>
<div
style=
" height: 5vh;display: flex; right:0;position: absolute;"
>
<div
style=
" height: 5vh;display: flex; right:0;position: absolute;"
>
<div
style=
"margin-left: auto;display: flex;align-items: center;"
>
<div
style=
"margin-left: auto;display: flex;align-items: center;"
>
<h3
v-title-text-color
style=
"font-size: 18px;"
>
师生奖励总金额:
<h3
v-title-text-color
style=
"font-size: 18px;"
>
师生奖励总金额:
...
@@ -278,7 +278,7 @@
...
@@ -278,7 +278,7 @@
</Card>
</Card>
<div
v-if=
"formValidate.is_tea === 0"
>
<!-- 学生奖励-->
<!-- 学生奖励-->
<div
<div
style=
" width: 100%;height: 5vh;display: flex;align-items: center;color: white; background-color: #2C8CF0;"
>
style=
" width: 100%;height: 5vh;display: flex;align-items: center;color: white; background-color: #2C8CF0;"
>
...
@@ -365,6 +365,7 @@
...
@@ -365,6 +365,7 @@
</Table>
</Table>
</Card>
</Card>
</div>
</div>
</div>
...
@@ -394,25 +395,12 @@
...
@@ -394,25 +395,12 @@
>
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
教师证书
</p>
<p>
教师
获奖
证书
</p>
</div>
</div>
</Upload>
</Upload>
<!-- <Upload-->
<!-- style="margin-right: 10px"-->
<!-- :multiple="false"-->
<!-- :before-upload="TeamExcellenceBeforeUpload"-->
<!-- :on-error="onError"-->
<!-- :on-success="onsuccess"-->
<!-- :on-format-error="onFormatError"-->
<!-- :show-upload-list="true"-->
<!-- type="drag"-->
<!-- action="">-->
<!-- <div style="padding: 20px 30px; width: 100%;">-->
<!-- <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>-->
<!-- <p>学生证书</p>-->
<!-- </div>-->
<!-- </Upload>-->
<Upload
<Upload
v-if=
"formValidate.is_tea === 0"
style=
"margin-right: 10px"
style=
"margin-right: 10px"
:multiple=
"false"
:multiple=
"false"
:before-upload=
"StudentExcellenceBeforeUpload"
:before-upload=
"StudentExcellenceBeforeUpload"
...
@@ -424,10 +412,11 @@
...
@@ -424,10 +412,11 @@
action=
""
>
action=
""
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<div
style=
"padding: 20px 30px; width: 100%;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
学生证书
</p>
<p>
学生
获奖
证书
</p>
</div>
</div>
</Upload>
</Upload>
<Upload
<Upload
:multiple=
"false"
:multiple=
"false"
:before-upload=
"publicDocumetsExcellenceBeforeUpload"
:before-upload=
"publicDocumetsExcellenceBeforeUpload"
:on-error=
"onError"
:on-error=
"onError"
...
@@ -436,9 +425,9 @@
...
@@ -436,9 +425,9 @@
:show-upload-list=
"true"
:show-upload-list=
"true"
type=
"drag"
type=
"drag"
action=
""
>
action=
""
>
<div
style=
"padding: 20px 10px; width: 1
00%
;"
>
<div
style=
"padding: 20px 10px; width: 1
50px
;"
>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<Icon
type=
"ios-cloud-upload"
size=
"52"
style=
"color: #3399ff"
></Icon>
<p>
其他
(公示文件等)
</p>
<p>
其他
</p>
</div>
</div>
</Upload>
</Upload>
...
@@ -580,7 +569,7 @@
...
@@ -580,7 +569,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -637,7 +626,7 @@
...
@@ -637,7 +626,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -687,7 +676,7 @@
...
@@ -687,7 +676,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -965,6 +954,7 @@
...
@@ -965,6 +954,7 @@
},
},
'
ze
'
:
()
=>
{
'
ze
'
:
()
=>
{
this
.
formValidate
.
bonus_total
=
value
this
.
formValidate
.
bonus_total
=
value
},
},
}
}
...
@@ -1222,6 +1212,7 @@
...
@@ -1222,6 +1212,7 @@
this
.
loading
=
false
this
.
loading
=
false
})
})
this
.
loading
=
false
this
.
loading
=
false
this
.
$emit
(
'
isAuth
'
,
this
.
formValidate
.
approval_state
)
return
res
return
res
})
})
...
@@ -1369,6 +1360,7 @@
...
@@ -1369,6 +1360,7 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted
()
{
mounted
()
{
this
.
GetHierarchySelect
()
this
.
GetHierarchySelect
()
this
.
getCompetiotionName
()
this
.
getCompetiotionName
()
this
.
formValidate
.
flowid
=
this
.
$route
.
query
.
id
;
this
.
formValidate
.
flowid
=
this
.
$route
.
query
.
id
;
...
...
src/pages/competitionCount/reportWorkloadAndSubsidy.vue
浏览文件 @
ea99d95e
...
@@ -270,10 +270,10 @@
...
@@ -270,10 +270,10 @@
<span
style=
"color: #1e93ff"
>
{{
item
.
student_list
.
length
}}
</span>
<span
style=
"color: #1e93ff"
>
{{
item
.
student_list
.
length
}}
</span>
位)
</h3>
位)
</h3>
</
template
>
</
template
>
<
!-- <template #extra>--
>
<
template
#extra
>
<!-- <div class="teamCardExtraText">{{ item.hierarchy_name }}</div>--
>
<div
class=
"teamCardExtraText"
>
{{
item
.
hierarchy_name
}}
</div
>
<
!-- </template>--
>
<
/
template
>
<Table
v-if=
"!!item.guide_teacher_list.length"
:columns=
"guidecolumnsTeacher"
<Table
v-if=
"!!item.guide_teacher_list.length"
:columns=
"guidecolumnsTeacher"
:data=
"item.guide_teacher_list"
>
:data=
"item.guide_teacher_list"
>
...
@@ -517,7 +517,7 @@
...
@@ -517,7 +517,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -568,7 +568,7 @@
...
@@ -568,7 +568,7 @@
// key: 'sfzh'
// key: 'sfzh'
// },
// },
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
...
src/pages/competitionCount/rewardForTeachersAndStudents.vue
浏览文件 @
ea99d95e
...
@@ -69,14 +69,17 @@
...
@@ -69,14 +69,17 @@
>
>
<!-- <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;"
>
<updateCertificateModal
@
closeModal=
"closeModal"
@
getData=
"getData"
ref=
"updateCertificateModal"
<updateCertificateModal
@
closeModal=
"closeModal"
@
isAuth=
"isAuth"
@
getData=
"getData"
ref=
"updateCertificateModal"
v-if=
"CertificateModal"
v-if=
"CertificateModal"
:winningMaterialId=
"Id"
:winningMaterialId=
"Id"
></updateCertificateModal>
></updateCertificateModal>
</div>
</div>
<
template
#footer
>
<
template
#footer
>
<div
style=
"display: flex;justify-content: center"
>
<div
style=
"display: flex;justify-content: center"
>
<cs-button
ref=
"load"
type=
"primary"
cs-style=
"width: 12vw;margin-right:10px;"
<cs-button
:disabled=
"isAuth1 === 2"
ref=
"load"
type=
"primary"
cs-style=
"width: 12vw;margin-right:10px;"
cs-text=
"提交流程"
cs-text=
"提交流程"
:cs-click=
"handleSubmit"
:cs-click=
"handleSubmit"
></cs-button>
></cs-button>
...
@@ -295,7 +298,7 @@
...
@@ -295,7 +298,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -352,7 +355,7 @@
...
@@ -352,7 +355,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -402,7 +405,7 @@
...
@@ -402,7 +405,7 @@
key
:
'
sfzh
'
key
:
'
sfzh
'
},
},
{
{
title
:
'
教学院系
'
,
title
:
'
学院
'
,
minWidth
:
150
,
minWidth
:
150
,
key
:
'
dept
'
key
:
'
dept
'
},
},
...
@@ -448,6 +451,7 @@
...
@@ -448,6 +451,7 @@
importModal
:
false
,
importModal
:
false
,
importLoading
:
false
,
importLoading
:
false
,
CertificateModal
:
false
,
CertificateModal
:
false
,
isAuth1
:
0
,
init
:
{
init
:
{
modal
:
{
modal
:
{
...
@@ -666,6 +670,10 @@
...
@@ -666,6 +670,10 @@
watch
:
{},
watch
:
{},
//方法集合",
//方法集合",
methods
:
{
methods
:
{
isAuth
(
value
)
{
this
.
isAuth1
=
value
//接收师生奖励表单状态;审批通过则禁用按钮
},
closeModal
()
{
closeModal
()
{
//关闭生成获奖材料modal
//关闭生成获奖材料modal
this
.
CertificateModal
=
false
this
.
CertificateModal
=
false
...
@@ -903,6 +911,7 @@
...
@@ -903,6 +911,7 @@
this
.
init
.
tableData
=
res
.
response
.
data
this
.
init
.
tableData
=
res
.
response
.
data
this
.
init
.
dataCount
=
res
.
response
.
data_count
this
.
init
.
dataCount
=
res
.
response
.
data_count
this
.
init
.
tableLoading
=
false
this
.
init
.
tableLoading
=
false
console
.
log
(
"
🚀🚀🚀,
"
,
res
)
return
res
return
res
})
})
},
},
...
...
src/pages/flowAssemble/flowComponent/CompetitionSignForm.vue
浏览文件 @
ea99d95e
...
@@ -644,46 +644,6 @@
...
@@ -644,46 +644,6 @@
</div>
</div>
<!--手动添加赛项列表-->
<!-- <Modal-->
<!-- v-model="selectionOfEvents"-->
<!-- title="选择编号"-->
<!-- width="60"-->
<!-- :styles="{top:'10px'}"-->
<!-- :closable="false"-->
<!-- >-->
<!-- <template #header>-->
<!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<!-- <h3>选择编号</h3>-->
<!-- <Input style="width: 20vw" v-model="contestItem.condition"-->
<!-- placeholder="请输入编号或赛项名称、赛事名称搜索..."></Input>-->
<!-- </div>-->
<!-- </template>-->
<!-- <Table :columns="columnsCompetitionItem" :data="dataCompetitionItem" :loading="contestItem.loading">-->
<!-- <template #radio="{row}">-->
<!-- <input style="width: 30px;height: 30px;cursor: pointer;accent-color: #1e93ff" type="radio"-->
<!-- :value="row.name"-->
<!-- @click="tableRadio(row)"-->
<!-- name="name"></input>-->
<!-- </template>-->
<!-- </Table>-->
<!-- <div class="ivu-text-center ivu-mt">-->
<!-- <Page-->
<!-- :total="contestItem.total"-->
<!-- :current.sync="contestItem.pageIndex"-->
<!-- show-total-->
<!-- show-sizer-->
<!-- :page-size="contestItem.pageSize"-->
<!-- @on-change="contestItemhandleChangePage"-->
<!-- @on-page-size-change="contestItemhandleChangePageSize"-->
<!-- />-->
<!-- </div>-->
<!-- <template #footer>-->
<!-- <Button type="primary" @click="saveTheEventSingleOption" style="width: 15%;">确定</Button>-->
<!-- <Button type="text" @click="selectionOfEvents = false" style="width: 15%;">关闭</Button>-->
<!-- </template>-->
<!-- </Modal>-->
<!-- 创建 团队添加队员抽屉-->
<!-- 创建 团队添加队员抽屉-->
<Drawer
title=
"添加团队队员"
width=
"100%"
:transfer=
"false"
:z-index=
"99999"
<Drawer
title=
"添加团队队员"
width=
"100%"
:transfer=
"false"
:z-index=
"99999"
v-model=
"addTeamMembers.Drawer"
>
v-model=
"addTeamMembers.Drawer"
>
...
@@ -733,7 +693,7 @@
...
@@ -733,7 +693,7 @@
<
template
#right
>
<
template
#right
>
<div
style=
"padding: 1vw;"
:key=
"kkk"
>
<div
style=
"padding: 1vw;"
:key=
"kkk"
>
<Tabs>
<Tabs>
<TabPane
label=
"添加学生"
>
<TabPane
label=
"添加学生"
:disabled=
"tabsName ==1"
>
<div
style=
"display: flex;"
></div>
<div
style=
"display: flex;"
></div>
<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"
>
...
@@ -961,7 +921,7 @@
...
@@ -961,7 +921,7 @@
<
template
#right
>
<
template
#right
>
<div
style=
"padding: 1vw"
:key=
"kkk"
>
<div
style=
"padding: 1vw"
:key=
"kkk"
>
<Tabs>
<Tabs>
<TabPane
label=
"添加学生"
>
<TabPane
label=
"添加学生"
:disabled=
"tabsName == 1"
>
<div
style=
"display: flex;"
></div>
<div
style=
"display: flex;"
></div>
<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"
>
...
@@ -1981,6 +1941,8 @@
...
@@ -1981,6 +1941,8 @@
})
})
},
},
async
TeamAndMemberSel
()
{
async
TeamAndMemberSel
()
{
if
(
this
.
signid
)
{
this
.
loading3
=
true
this
.
loading3
=
true
await
new
Promise
((
resolve
)
=>
{
await
new
Promise
((
resolve
)
=>
{
hook
.
getInitListRequest
(()
=>
{
hook
.
getInitListRequest
(()
=>
{
...
@@ -2009,6 +1971,7 @@
...
@@ -2009,6 +1971,7 @@
})
})
})
})
this
.
loading3
=
false
this
.
loading3
=
false
}
},
},
createATeam
()
{
createATeam
()
{
this
.
$refs
[
'
formValidate1
'
].
validate
((
value
)
=>
{
this
.
$refs
[
'
formValidate1
'
].
validate
((
value
)
=>
{
...
...
src/store/modules/admin/modules/account.js
浏览文件 @
ea99d95e
...
@@ -46,8 +46,7 @@ export default {
...
@@ -46,8 +46,7 @@ export default {
Cookies
.
remove
(
'
admin-competition-roleId
'
)
Cookies
.
remove
(
'
admin-competition-roleId
'
)
// console.log("dsadass"+res.response.access_token.token_content);
// console.log("dsadass"+res.response.access_token.token_content);
// util.cookies.set('token', res.token);
// util.cookies.set('token', res.token);
asc
.
getApiFlowViewApiFlowViewGetFlowListCount
().
then
(
res
=>
{
await
asc
.
getApiFlowViewApiFlowViewGetFlowListCount
().
then
(
res
=>
{
window
.
sessionStorage
.
setItem
(
'
aaa
'
,
JSON
.
stringify
(
res
.
response
));
window
.
sessionStorage
.
setItem
(
'
aaa
'
,
JSON
.
stringify
(
res
.
response
));
// this.asc++
// this.asc++
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录