提交 20973e97 编写于 作者: 刘英杰's avatar 刘英杰

V20240417 应急添加成绩申报和师生奖励

上级 3cbc9941
无法预览此类型文件
<!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.8be0473e.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.85f930d9.js></script><script src=js/app.a48f11ef.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.8be0473e.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.4efdd74b.js></script><script src=js/app.a329a78f.js></script></body></html>
\ No newline at end of file \ No newline at end of file
文件已删除
...@@ -69,17 +69,23 @@ export function storageAddEventListener(fun) { ...@@ -69,17 +69,23 @@ export function storageAddEventListener(fun) {
export async function myEncapsulationFunction(fun) { export async function myEncapsulationFunction(fun) {
// Spin.show() // Spin.show()
Message.loading({
duration: 0,
content: '正在提交中...',
})
let res = await fun() let res = await fun()
Message.destroy()
try { try {
switch (res.code) { switch (res.code) {
case 1 : case 1 :
Message['success']({ Message['success']({
background: true, background: true,
content: res.msg content: res.msg,
duration: 2,
}); });
break; break;
default : default :
Message['error']({ Message['error']({
background: true, background: true,
content: res.msg_detail, content: res.msg_detail,
......
...@@ -49,6 +49,18 @@ export default { ...@@ -49,6 +49,18 @@ export default {
// auth: ['admin'], // auth: ['admin'],
// //
// }, // },
{
path: '/reportWorkloadAndSubsidy',
title: '成绩申报(测试)',
header: 'home',
icon: ''
},
{
path: '/rewardForTeachersAndStudents',
title: '师生奖励(测试)',
header: 'home',
icon: ''
},
] ]
} }
...@@ -171,65 +171,69 @@ ...@@ -171,65 +171,69 @@
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center">成绩申报上传</h1> <h1 style="display: flex;justify-content: center">成绩申报上传</h1>
<table border="1" class="container1"> <table border="1" class="container1">
<tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index"> <tr v-for="(item,index) in drawerKeyValueArray" :key="index">
<th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th> <th class="colTitle">{{ item.title }}</th>
<td v-if="item[0]==='level'" class="colContent">{{ ['国家级', '省一级', '省二级'][item[1]] }}</td> <td class="colContent">{{ item.value }}</td>
<!-- <th v-if="item[0]==='team_id'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='team_id'" class="colContent">-->
<!-- <template>-->
<!-- <a @click="teamInfo(item[1])">详细</a>-->
<!-- </template>-->
<!-- </td>-->
<th v-if="item[0]==='competition_level_id'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='competition_level_id'" class="colContent">
{{ ['', '国家级', '省一级', '省二级', '国际级'][item[1]] }}
</td>
<th v-if="item[0]==='approval_state'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='approval_state'" class="colContent">
{{ ['未审批', '审批中', '审批通过', '审批不通过'][item[1]] }}
</td>
<th v-if="item[0]==='competition_type_id'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='competition_type_id'" class="colContent">
{{ ['', 'A类', 'B类'][item[1]] }}
</td>
<th v-if="item[0]==='way'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='way'" class="colContent">
{{ ['团队', '个人'][item[1]] }}
</td>
<th v-if="item[0]!=='studentExcellenceFileList'&&item[0]!=='StudentExcellence'&&item[0]!=='teacherExcellenceFileList'&&item[0]!=='competition_type_id'&&item[0]!=='team_id'&&item[0]!=='level' &&item[0]!=='competition_level_id'&& item[0]!=='way'&& item[0]!=='approval_state'"
class="colTitle">{{
item[2]
}}
</th>
<td v-if="item[0]!=='studentExcellenceFileList'&&item[0]!=='StudentExcellence'&&item[0]!=='teacherExcellenceFileList'&&item[0]!=='competition_type_id'&&item[0]!=='team_id'&&item[0]!=='level'&&item[0]!=='competition_level_id' && item[0]!=='way'&& item[0]!=='approval_state'"
class="colContent">{{
item[1]
}}
</td>
<th v-if="item[0]==='teacherExcellenceFileList'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='teacherExcellenceFileList'" class="colContent">
<a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center"
v-for="(ite,inde) in item[1]"
:key="inde">
{{ ite.file_name }}
</a>
</td>
<th v-if="item[0]==='studentExcellenceFileList'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='studentExcellenceFileList'" class="colContent">
<a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center"
v-for="(ite,inde) in item[1]"
:key="inde">
{{ ite.file_name }}
</a>
</td>
</tr> </tr>
<!-- <tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index">-->
<!-- <th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='level'" class="colContent">{{ ['国家级', '省一级', '省二级'][item[1]] }}</td>-->
<!-- &lt;!&ndash; <th v-if="item[0]==='team_id'" class="colTitle">{{ item[2] }}</th>&ndash;&gt;-->
<!-- &lt;!&ndash; <td v-if="item[0]==='team_id'" class="colContent">&ndash;&gt;-->
<!-- &lt;!&ndash; <template>&ndash;&gt;-->
<!-- &lt;!&ndash; <a @click="teamInfo(item[1])">详细</a>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </td>&ndash;&gt;-->
<!-- <th v-if="item[0]==='competition_level_id'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='competition_level_id'" class="colContent">-->
<!-- {{ ['', '国家级', '省一级', '省二级', '国际级'][item[1]] }}-->
<!-- </td>-->
<!-- <th v-if="item[0]==='approval_state'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='approval_state'" class="colContent">-->
<!-- {{ ['未审批', '审批中', '审批通过', '审批不通过'][item[1]] }}-->
<!-- </td>-->
<!-- <th v-if="item[0]==='competition_type_id'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='competition_type_id'" class="colContent">-->
<!-- {{ ['', 'A类', 'B类'][item[1]] }}-->
<!-- </td>-->
<!-- <th v-if="item[0]==='way'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='way'" class="colContent">-->
<!-- {{ ['团队', '个人'][item[1]] }}-->
<!-- </td>-->
<!-- <th v-if="item[0]!=='studentExcellenceFileList'&&item[0]!=='StudentExcellence'&&item[0]!=='teacherExcellenceFileList'&&item[0]!=='competition_type_id'&&item[0]!=='team_id'&&item[0]!=='level' &&item[0]!=='competition_level_id'&& item[0]!=='way'&& item[0]!=='approval_state'"-->
<!-- class="colTitle">{{-->
<!-- item[2]-->
<!-- }}-->
<!-- </th>-->
<!-- <td v-if="item[0]!=='studentExcellenceFileList'&&item[0]!=='StudentExcellence'&&item[0]!=='teacherExcellenceFileList'&&item[0]!=='competition_type_id'&&item[0]!=='team_id'&&item[0]!=='level'&&item[0]!=='competition_level_id' && item[0]!=='way'&& item[0]!=='approval_state'"-->
<!-- class="colContent">{{-->
<!-- item[1]-->
<!-- }}-->
<!-- </td>-->
<!-- <th v-if="item[0]==='teacherExcellenceFileList'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='teacherExcellenceFileList'" class="colContent">-->
<!-- <a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center"-->
<!-- v-for="(ite,inde) in item[1]"-->
<!-- :key="inde">-->
<!-- {{ ite.file_name }}-->
<!-- </a>-->
<!-- </td>-->
<!-- <th v-if="item[0]==='studentExcellenceFileList'" class="colTitle">{{ item[2] }}</th>-->
<!-- <td v-if="item[0]==='studentExcellenceFileList'" class="colContent">-->
<!-- <a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center"-->
<!-- v-for="(ite,inde) in item[1]"-->
<!-- :key="inde">-->
<!-- {{ ite.file_name }}-->
<!-- </a>-->
<!-- </td>-->
<!-- </tr>-->
<tr> <tr>
<th>附件</th> <th>附件</th>
<td class="colContent"> <td class="colContent">
...@@ -1117,21 +1121,27 @@ export default { ...@@ -1117,21 +1121,27 @@ export default {
'竞赛形式', '竞赛形式',
'竞赛类别', '竞赛类别',
'赛事级别', '赛事级别',
// '证书名称',
// '获奖奖金',
// '证书描述',
'赛事编号', '赛事编号',
// '教师证书',
// '学生证书',
// '审批意见'
]; ];
cur.push(data[index]) cur.push(data[index])
}) })
this.drawerKeyValueArray = [
{title: '赛事名称', value: res.response.competitionname},
{title: '赛事编号', value: res.response.report_code},
{title: '赛项名称', value: res.response.competitionsubitem_name},
// {title: '赛事类型', value: ['学生赛', '教师赛'][res.response.bonus.competition_method]},
{title: '主办单位', value: res.response.sponsor},
{title: '赛事级别', value: res.response.competition_level_name},
{title: '赛事类别', value: res.response.competition_type_name},
{title: '竞赛形式', value: ['团队', '个人', '不限'][res.response.way]},
{title: '比赛开始时间', value: res.response.begin_time},
{title: '比赛结束时间', value: res.response.end_time},
{title: '审批状态', value: publicState.flowApprovalState[res.response.approval_state]},
// {title: '批次', value: res.response.bonus.competitionbatch_name},
]
}, },
// 删除 // 删除
......
...@@ -582,7 +582,6 @@ export default { ...@@ -582,7 +582,6 @@ export default {
], ],
loading: false, loading: false,
tableData: [ tableData: [
{}, {},
], ],
......
此差异已折叠。
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<template #is_succeed="{row}"> <template #is_succeed="{row}">
<tag :color="['','error','success'][row.is_succeed]"> {{ ['', '失败', '成功'][row.is_succeed] }}</tag> <tag :color="['','error','success'][row.is_succeed]"> {{ ['', '失败', '成功'][row.is_succeed] }}</tag>
</template> </template>
<template #messageinfo="{row}"> <template #messageinfo="{row}">
<Ellipsis :text="row.messageinfo" :height="60" tooltip transfer/> <Ellipsis :text="row.messageinfo" :height="60" tooltip transfer/>
</template> </template>
...@@ -77,7 +76,6 @@ ...@@ -77,7 +76,6 @@
<template #remark="{row}"> <template #remark="{row}">
<Ellipsis :text="row.remark" :height="60" tooltip transfer/> <Ellipsis :text="row.remark" :height="60" tooltip transfer/>
</template> </template>
</Table> </Table>
<div style="height: 60px;display: flex;align-items: center;"> <div style="height: 60px;display: flex;align-items: center;">
<Page <Page
...@@ -225,14 +223,12 @@ export default { ...@@ -225,14 +223,12 @@ export default {
{ {
title: '链接', title: '链接',
slot: 'meg_link', slot: 'meg_link',
show: true, show: true,
minWidth: 250, minWidth: 250,
}, },
{ {
title: '失败原因', title: '失败原因',
slot: 'remark', slot: 'remark',
show: true, show: true,
minWidth: 250, minWidth: 250,
}, },
......
...@@ -117,6 +117,7 @@ service.interceptors.response.use( ...@@ -117,6 +117,7 @@ service.interceptors.response.use(
// errorCreate(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`); // errorCreate(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`);
// break; // break;
default: default:
Message.destroy()
// 不是正确的 code // 不是正确的 code
// errorCreate(`${dataAxios.msg_detail}: ${response.config.url}`); // errorCreate(`${dataAxios.msg_detail}: ${response.config.url}`);
errorCreate(`${dataAxios.msg_detail}`); errorCreate(`${dataAxios.msg_detail}`);
......
...@@ -63,6 +63,26 @@ export default { ...@@ -63,6 +63,26 @@ export default {
}, },
component: () => import('@/pages/competitionCount/listOfCollegeGrants.vue') component: () => import('@/pages/competitionCount/listOfCollegeGrants.vue')
}, },
{
path: `reportWorkloadAndSubsidy`,
name: `reportWorkloadAndSubsidy`,
meta: {
...meta,
title: '成绩申报(测试)',
closable: false
},
component: () => import('@/pages/competitionCount/reportWorkloadAndSubsidy.vue')
},
{
path: `rewardForTeachersAndStudents`,
name: `rewardForTeachersAndStudents`,
meta: {
...meta,
title: '师生奖励(测试)',
closable: false
},
component: () => import('@/pages/competitionCount/rewardForTeachersAndStudents.vue')
},
] ]
}; };
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或