提交 2d77a71e 编写于 作者: 刘英杰's avatar 刘英杰

- 20240531

    - 菜单名称,“师生奖励申请”改为“奖励申请”;
    - “师生奖励总金额”改为“奖励总额” ;
    - 更新奖励申请“详情”和“表单填写”的团队信息接口;
    - 修复统计列表Vue原型属性,初始读取不到问题;
上级 9f4d900b
流水线 #26440 已失败 ,包含阶段
in 9 second
# 竞赛管理系统
_# 竞赛管理系统
- 更新日志
- 20240517
......@@ -32,3 +32,4 @@
- 菜单名称,“师生奖励申请”改为“奖励申请”;
- “师生奖励总金额”改为“奖励总额” ;
- 更新奖励申请“详情”和“表单填写”的团队信息接口;
- 修复统计列表Vue原型属性,初始读取不到问题;
文件已删除
.carClass[data-v-3d3a183c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3d3a183c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3d3a183c] .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-3d3a183c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3d3a183c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3d3a183c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3d3a183c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3d3a183c]:hover{transform:scale(1.2)}.container[data-v-3d3a183c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3d3a183c],.tableList[data-v-2f00f10e]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2f00f10e]{border-collapse:collapse}.tableList .container1 .row[data-v-2f00f10e]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2f00f10e]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2f00f10e]{width:500px;height:50px;text-align:center}.Atext[data-v-2f00f10e]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-2f00f10e]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-3d3a183c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3d3a183c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3d3a183c] .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-3d3a183c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3d3a183c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3d3a183c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3d3a183c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3d3a183c]:hover{transform:scale(1.2)}.container[data-v-3d3a183c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3d3a183c],.tableList[data-v-66ca3d4c]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-66ca3d4c]{border-collapse:collapse}.tableList .container1 .row[data-v-66ca3d4c]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-66ca3d4c]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-66ca3d4c]{width:500px;height:50px;text-align:center}.Atext[data-v-66ca3d4c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-66ca3d4c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.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
.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-53896667]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-53896667]{border-collapse:collapse}.tableList .container1 .row[data-v-53896667]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-53896667]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-53896667]{width:500px;height:50px;text-align:center}.Atext[data-v-53896667]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-53896667]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-91d0b704] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-91d0b704] .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-91d0b704]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-91d0b704]: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-1fc2f394]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-1fc2f394]{border-collapse:collapse}.tableList .container1 .row[data-v-1fc2f394]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-1fc2f394]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-1fc2f394]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-1fc2f394]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-1fc2f394]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-1fc2f394]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-91d0b704] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-91d0b704] .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-91d0b704]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-91d0b704]: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-02791d86]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-02791d86]{border-collapse:collapse}.tableList .container1 .row[data-v-02791d86]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-02791d86]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-02791d86]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-02791d86]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-02791d86]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-02791d86]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-5f6d4b39] .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-5f6d4b39]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5f6d4b39]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-5f6d4b39]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-5f6d4b39]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-5f6d4b39]:hover{transform:scale(1.2)}.container[data-v-5f6d4b39]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-5f6d4b39],.tableList[data-v-543e557c]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-543e557c]{border-collapse:collapse}.tableList .container1 .row[data-v-543e557c]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-543e557c]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-543e557c]{width:500px;height:50px;text-align:center}.Atext[data-v-543e557c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-543e557c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-5f6d4b39] .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-5f6d4b39]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5f6d4b39]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-5f6d4b39]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-5f6d4b39]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-5f6d4b39]:hover{transform:scale(1.2)}.container[data-v-5f6d4b39]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-5f6d4b39],.tableList[data-v-c93daaec]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-c93daaec]{border-collapse:collapse}.tableList .container1 .row[data-v-c93daaec]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-c93daaec]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-c93daaec]{width:500px;height:50px;text-align:center}.Atext[data-v-c93daaec]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-c93daaec]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ 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.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.de3d1bab.js></script><script src=js/app.bd5f9c39.js></script></body></html>
\ 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.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.c4379b07.js></script><script src=js/app.81a9090a.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
无法预览此类型文件
......@@ -1058,7 +1058,7 @@
async getGetCertificateList() {
this.loading = true
let data = {
"role_id": this.$roleId,
"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"h_id": this.search.h_id,
"name": this.search.name,
"level": this.search.level,
......
......@@ -243,6 +243,7 @@
import _ from "lodash";
import UpdateSignModal from './components/UpdateSignModal.vue'
import {fourtableButtonAuthentication} from "../../hook";
import Cookies from "js-cookie";
export default {
......@@ -659,6 +660,9 @@
}
},
computed: {
roleId() {
return Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : ''
},
searchButton() {
return this.search.way === '' && this.search.level === '' && this.search.name === '' && this.search.approval_state === ''
},
......@@ -884,7 +888,7 @@
async getCompetitionSignList() {
this.loading = true
let data = {
"role_id": this.$roleId,
"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"name": this.search.name,
"level": this.search.level,
"way": this.search.way,
......
......@@ -355,6 +355,7 @@
import {GetHierarchyNameSelect} from "@api/requestUtils";
import {publicState} from "@/configState";
import dayjs from "dayjs";
import Cookies from "js-cookie";
export default {
name: 'list',
......@@ -1133,7 +1134,7 @@
async getGetCertificateList() {
this.loading = true
let data = {
"role_id": this.$roleId,
"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"h_id": this.search.h_id,
"name": this.search.name,
"level": this.search.level,
......
......@@ -272,6 +272,7 @@
import updateCertificateModal from './components/updateCertificateModalrewardForTeachersAndStudents.vue'
import * as api from "@api/requestUtils";
import _ from "lodash";
import Cookies from "js-cookie";
export default {
//import引入的组件需要注入到对象中才能使用",
......@@ -621,7 +622,7 @@
},
],
search: {
"role_Id": this.$roleId,
"role_Id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"name": "",
"level": "",
"type": "",
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或