提交 927cdab5 编写于 作者: 刘英杰's avatar 刘英杰

- 20240913 b) GetBatchBySelect获取批次接口,前端默认获取第一项批次;

上级 f19df02e
流水线 #29283 已通过 ,包含阶段
in 52 second
...@@ -80,3 +80,16 @@ _# 竞赛管理系统 ...@@ -80,3 +80,16 @@ _# 竞赛管理系统
1. 赛事申请: 1. 赛事申请:
- 教师调整获取赛事编号追加批次字段作为查询条件 - 教师调整获取赛事编号追加批次字段作为查询条件
- 学生调整获取赛事编号追加批次字段作为查询条件 - 学生调整获取赛事编号追加批次字段作为查询条件
- 20240913
1. GetBatchBySelect获取批次接口,前端默认获取第一项批次;
1. 学生、教师赛事目录
2. 统计
1. 学生、教师赛事报名
2. 学生、教师成绩申报
3. 学生、教师奖励申请
.buttonFocus[data-v-0d09c7c1]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-0d09c7c1]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-0d09c7c1]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-0b6ff987]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-0b6ff987]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-5a3bcc38] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1} .buttonFocus[data-v-6ee6ab98]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-6ee6ab98]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-6ee6ab98]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-5a3bcc38] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1}
\ No newline at end of file \ No newline at end of file
.carClass[data-v-34f7439c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-34f7439c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-34f7439c] .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-34f7439c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-34f7439c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-34f7439c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-34f7439c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-34f7439c]:hover{transform:scale(1.2)}.container[data-v-34f7439c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-34f7439c],.tableList[data-v-48fd9ef9]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-48fd9ef9]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-48fd9ef9]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-48fd9ef9]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-48fd9ef9]{width:500px;height:50px;text-align:center}.Atext[data-v-48fd9ef9]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-48fd9ef9]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-48fd9ef9]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-48fd9ef9] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-34f7439c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-34f7439c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-34f7439c] .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-34f7439c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-34f7439c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-34f7439c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-34f7439c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-34f7439c]:hover{transform:scale(1.2)}.container[data-v-34f7439c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-34f7439c],.tableList[data-v-677e2bfb]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-677e2bfb]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-677e2bfb]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-677e2bfb]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-677e2bfb]{width:500px;height:50px;text-align:center}.Atext[data-v-677e2bfb]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-677e2bfb]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-677e2bfb]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-677e2bfb] .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
[data-v-5570dc2d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-5570dc2d] .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-5570dc2d]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5570dc2d]: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)}.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} [data-v-5570dc2d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-5570dc2d] .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-5570dc2d]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5570dc2d]: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)}.tableList[data-v-6937a670]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-6937a670]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-6937a670]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-6937a670]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-6937a670]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-6937a670]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-6937a670]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-6937a670]:hover{transform:scale(1.2)}.carClass[data-v-6937a670]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-6937a670] .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
.cyrIcon[data-v-48678f52]{color:#515a6e}.cyrIcon[data-v-48678f52]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-48678f52]:active{color:#3f485c}
\ No newline at end of file
.cyrIcon[data-v-d068f4c6]{color:#515a6e}.cyrIcon[data-v-d068f4c6]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-d068f4c6]:active{color:#3f485c}
\ No newline at end of file
.teamCardExtraText[data-v-155b2e7a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-155b2e7a]{height:100vh;width:100vw}.container .header[data-v-155b2e7a]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-155b2e7a],.container .header .h_right[data-v-155b2e7a]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-155b2e7a]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-155b2e7a]{width:100%;height:92%;display:flex;flex-wrap:wrap;align-content:flex-start;justify-content:center;overflow-y:auto;position:relative}.container .content .tableList[data-v-155b2e7a]{display:flex;justify-content:center;flex-wrap:wrap;max-width:1200px}.container .content .tableList .container1[data-v-155b2e7a]{border-collapse:collapse;box-sizing:border-box;width:100%;margin-bottom:20px}.container .content .tableList .container1 .row[data-v-155b2e7a]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-155b2e7a]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-155b2e7a]{height:50px;text-align:center}.container .content .card[data-v-155b2e7a]{padding:5px 5px}.container .content .teamInfo[data-v-155b2e7a]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-155b2e7a]:hover{transform:scale(1.3)}.container .content .aText[data-v-155b2e7a]:hover{transform:scale(1.2)}.container .content .Atext[data-v-155b2e7a]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-155b2e7a]:hover{transform:scale(1.2)}.carClass[data-v-155b2e7a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-155b2e7a] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .teamCardExtraText[data-v-240dda80]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-240dda80]{height:100vh;width:100vw}.container .header[data-v-240dda80]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-240dda80],.container .header .h_right[data-v-240dda80]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-240dda80]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-240dda80]{width:100%;height:92%;display:flex;flex-wrap:wrap;align-content:flex-start;justify-content:center;overflow-y:auto;position:relative}.container .content .tableList[data-v-240dda80]{display:flex;justify-content:center;flex-wrap:wrap;max-width:1200px}.container .content .tableList .container1[data-v-240dda80]{border-collapse:collapse;box-sizing:border-box;width:100%;margin-bottom:20px}.container .content .tableList .container1 .row[data-v-240dda80]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-240dda80]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-240dda80]{height:50px;text-align:center}.container .content .card[data-v-240dda80]{padding:5px 5px}.container .content .teamInfo[data-v-240dda80]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-240dda80]:hover{transform:scale(1.3)}.container .content .aText[data-v-240dda80]:hover{transform:scale(1.2)}.container .content .Atext[data-v-240dda80]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-240dda80]:hover{transform:scale(1.2)}.carClass[data-v-240dda80]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-240dda80] .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
.buttonFocus[data-v-0d09c7c1]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-0d09c7c1]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-0d09c7c1]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-0b6ff987]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-0b6ff987]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-e2eec3de] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1} .buttonFocus[data-v-6ee6ab98]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-6ee6ab98]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-6ee6ab98]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-e2eec3de] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1}
\ No newline at end of file \ No newline at end of file
.carClass[data-v-e3bdd618]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-e3bdd618] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-e3bdd618] .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-e3bdd618]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e3bdd618]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-e3bdd618]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-e3bdd618]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-e3bdd618]:hover{transform:scale(1.2)}.container[data-v-e3bdd618]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-e3bdd618],.tableList[data-v-4cc9cc00]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-4cc9cc00]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-4cc9cc00]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-4cc9cc00]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-4cc9cc00]{width:500px;height:50px;text-align:center}.Atext[data-v-4cc9cc00]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-4cc9cc00]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-4cc9cc00]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4cc9cc00] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-e3bdd618]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-e3bdd618] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-e3bdd618] .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-e3bdd618]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e3bdd618]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-e3bdd618]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-e3bdd618]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-e3bdd618]:hover{transform:scale(1.2)}.container[data-v-e3bdd618]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-e3bdd618],.tableList[data-v-1d908a60]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-1d908a60]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-1d908a60]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-1d908a60]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-1d908a60]{width:500px;height:50px;text-align:center}.Atext[data-v-1d908a60]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-1d908a60]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-1d908a60]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-1d908a60] .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
.buttonFocus[data-v-6ee6ab98]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-6ee6ab98]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-6ee6ab98]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}
\ No newline at end of file
.buttonFocus[data-v-0d09c7c1]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-0d09c7c1]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-0d09c7c1]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-0b6ff987]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-0b6ff987]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.33522996.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.c21551cb.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.f4d55406.js></script><script src=js/app~748942c6.bbee4df9.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.33522996.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.c21551cb.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.4a7dde4c.js></script><script src=js/app~748942c6.a15bd642.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
this.handleMatchMedia(); this.handleMatchMedia();
}, },
beforeDestroy() { beforeDestroy() {
off(window, 'resize', this.handleWindowResize); off(window, 'resize', this.handleWindowResize);
} }
} }
......
...@@ -150,7 +150,6 @@ export function getUserRoleOneName() { ...@@ -150,7 +150,6 @@ export function getUserRoleOneName() {
export function getUserRole() { export function getUserRole() {
//validate user is a admin //validate user is a admin
return false
if (Cookies.get('admin-competition-userinfo')) { if (Cookies.get('admin-competition-userinfo')) {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo'))) let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info ? info.role[0].split('').includes('员') : false return info ? info.role[0].split('').includes('员') : false
......
<template> <template>
<Submenu :name="menu.path" :key="key"> <Submenu :key="key" :name="menu.path">
<template slot="title"> <template slot="title">
<i-menu-side-title :menu="menu"/> <i-menu-side-title :menu="menu"/>
<Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData"/> <Badge v-if="badgeData" class="i-layout-menu-side-badge" v-bind="badgeData"/>
</template> </template>
<template v-for="(item, index) in menu.children"> <template v-for="(item, index) in menu.children">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index"> <i-menu-side-item v-if="item.children === undefined || !item.children.length" :key="index" :menu="item">
<template slot="slot"> <template slot="slot">
<div v-if="isAuth(item.path)" class="aaa">{{ strategy(item.path) }}</div> <div v-if="isAuth(item.path)" :key="key1" class="aaa">{{ strategy(item.path) }}</div>
</template> </template>
</i-menu-side-item> </i-menu-side-item>
<i-menu-side-submenu v-else :menu="item" :key="index"/> <i-menu-side-submenu v-else :key="index+'xx'" :menu="item"/>
</template> </template>
</Submenu> </Submenu>
</template> </template>
...@@ -42,16 +42,30 @@ ...@@ -42,16 +42,30 @@
}, },
data() { data() {
return { return {
key1: 3221,
data: {}, data: {},
key: 123, key: 123,
timer: {}
} }
}, },
mounted() { mounted() {
this.$bus.$on('watchLocalStorage', this.watchLocalStorage)
}, },
methods: { methods: {
getRandomInt(min, max) {
min = Math.ceil(min);
max = Math.floor(max);
return Math.floor(Math.random() * (max - min + 1)) + min;
},
// 生成一个1到10之间的随机整数
watchLocalStorage(value) {
// this.key1 = this.key1 + value + this.getRandomInt(1, 9999);
clearTimeout(this.timer)
this.timer = setTimeout(() => {
this.key1++
console.log("🚀🚀watchLocalStorage🚀,", this.key1);
}, 1500)
},
returnApprovalCount(key) { returnApprovalCount(key) {
//基于key返回三项统计 //基于key返回三项统计
return JSON.parse(window.sessionStorage.getItem('aaa')) ? JSON.parse(window.sessionStorage.getItem('aaa'))[key] : 0; return JSON.parse(window.sessionStorage.getItem('aaa')) ? JSON.parse(window.sessionStorage.getItem('aaa'))[key] : 0;
...@@ -115,7 +129,6 @@ ...@@ -115,7 +129,6 @@
return strategy[String(path)]() return strategy[String(path)]()
}, },
isAuth(path) { isAuth(path) {
let pathArray = [ let pathArray = [
'/flow-myFlowList', '/flow-myFlowList',
...@@ -133,8 +146,6 @@ ...@@ -133,8 +146,6 @@
'/flow-awaitDoneList-eventCatalogue', '/flow-awaitDoneList-eventCatalogue',
'/flow-processedList-eventCatalogue', '/flow-processedList-eventCatalogue',
'/flow-myFlowList-eventCatalogue', '/flow-myFlowList-eventCatalogue',
] ]
return pathArray.includes(path) return pathArray.includes(path)
}, },
......
...@@ -180,6 +180,7 @@ new Vue({ ...@@ -180,6 +180,7 @@ new Vue({
this.$store.dispatch('admin/account/load'); this.$store.dispatch('admin/account/load');
// 初始化全屏监听 // 初始化全屏监听
this.$store.dispatch('admin/layout/listenFullscreen') this.$store.dispatch('admin/layout/listenFullscreen')
}, },
watch: { watch: {
// 监听路由 控制侧边栏显示 标记当前顶栏菜单(如需要) // 监听路由 控制侧边栏显示 标记当前顶栏菜单(如需要)
......
<template> <template>
<div> <div>
<Card ref="card"> <Card ref="card">
<template #title> <template #title>
<div style="height: auto"> <div style="height: auto">
<cs-search-cond-form <cs-search-cond-form
@watchIsTea="watchIsTea" @watchIsTea="watchIsTea"
ref="search" ref="search"
...@@ -16,11 +13,9 @@ ...@@ -16,11 +13,9 @@
:params="search" :params="search"
></cs-search-cond-form> ></cs-search-cond-form>
</div> </div>
<!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>--> <!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>-->
</template> </template>
<Table <Table
:columns="columns" :columns="columns"
:data="tableData" :data="tableData"
...@@ -276,6 +271,7 @@ ...@@ -276,6 +271,7 @@
}, },
data() { data() {
return { return {
firstBatch: '',
signFlag: '', signFlag: '',
// 搜索项 // 搜索项
searchCondList: [ searchCondList: [
...@@ -527,21 +523,20 @@ ...@@ -527,21 +523,20 @@
key: 'competitionname', key: 'competitionname',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '赛项名称', title: '赛项名称',
key: 'competitionsubitem_name', key: 'competitionsubitem_name',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '赛事编号', title: '赛事编号',
key: 'report_code', key: 'report_code',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '主办单位', title: '主办单位',
...@@ -563,14 +558,13 @@ ...@@ -563,14 +558,13 @@
key: 'competition_level_name', key: 'competition_level_name',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
{ {
title: '赛事类别', title: '赛事类别',
key: 'competition_type_name', key: 'competition_type_name',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
// { // {
// title: '比赛时间', // title: '比赛时间',
...@@ -601,18 +595,18 @@ ...@@ -601,18 +595,18 @@
// minWidth: 150, // minWidth: 150,
// }, // },
{ {
title: '竞赛形式(团/个)', title: '竞赛形式',
slot: 'way', slot: 'way',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '计划培训量', title: '计划培训量',
key: 'class_hour', key: 'class_hour',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
// { // {
// title: '参赛队数量(队/人)', // title: '参赛队数量(队/人)',
...@@ -628,19 +622,27 @@ ...@@ -628,19 +622,27 @@
// show: true, // show: true,
// minWidth: 200, // minWidth: 200,
// }, // },
{
title: '审批状态',
slot: 'approval_state',
show: true,
minWidth: 120,
},
{ {
title: '竞赛开始时间', title: '竞赛开始时间',
key: 'begin_time', key: 'begin_time',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '竞赛结束时间', title: '竞赛结束时间',
key: 'end_time', key: 'end_time',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
// { // {
// title: '竞赛的其他要求', // title: '竞赛的其他要求',
...@@ -649,14 +651,7 @@ ...@@ -649,14 +651,7 @@
// show: true, // show: true,
// minWidth: 200, // minWidth: 200,
// }, // },
{
title: '审批状态',
slot: 'approval_state',
show: true,
minWidth: 120,
},
{ {
title: '操作', title: '操作',
...@@ -687,12 +682,10 @@ ...@@ -687,12 +682,10 @@
is_tea: 0, is_tea: 0,
batch: '', batch: '',
type: '', type: '',
way: '', way: '',
name: '', name: '',
approval_state: '', approval_state: '',
level: '', level: '',
wayCurrentValue: '', wayCurrentValue: '',
nameCurrentValue: '', nameCurrentValue: '',
approval_stateCurrentValue: '', approval_stateCurrentValue: '',
...@@ -753,12 +746,11 @@ ...@@ -753,12 +746,11 @@
return this.search.way === '' && this.search.level === '' && this.search.name === '' && this.search.approval_state === '' return this.search.way === '' && this.search.level === '' && this.search.name === '' && this.search.approval_state === ''
}, },
}, },
mounted() { async mounted() {
await this.GetBatchBySelect()
this.getCompetitionSignList() this.getCompetitionSignList()
this.GetLevelBySelect() this.GetLevelBySelect()
this.GetTypeBySelect() this.GetTypeBySelect()
this.GetBatchBySelect()
}, },
methods: { methods: {
updateViewFile(e) { updateViewFile(e) {
...@@ -800,15 +792,22 @@ ...@@ -800,15 +792,22 @@
}) })
}, },
watchIsTea(is_tea) { async watchIsTea(is_tea) {
//监听是否选择身份 是刷新批次 //监听是否选择身份 是刷新批次
this.search.is_tea = is_tea this.search.is_tea = is_tea
this.GetBatchBySelect() await this.GetBatchBySelect()
this.getCompetitionSignList()
}, },
GetBatchBySelect() { GetBatchBySelect() {
//获取批次 //获取批次
this.asc.getApiCommonGetBatchBySelect({competition_method: this.search.is_tea}).then(res => { this.loading = true
return this.asc.getApiCommonGetBatchBySelect({competition_method: this.search.is_tea}).then(res => {
//搜索框 //搜索框
this.firstBatch = res.response[0].id //获取首个批次
this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.searchCondList.forEach(cur => { this.searchCondList.forEach(cur => {
if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => { if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => {
return { return {
...@@ -817,6 +816,8 @@ ...@@ -817,6 +816,8 @@
} }
}) })
}) })
this.loading = false
return res
}) })
}, },
GetTypeBySelect() { GetTypeBySelect() {
...@@ -849,7 +850,7 @@ ...@@ -849,7 +850,7 @@
this.searchFun() this.searchFun()
}, },
csreset() { async csreset() {
// 重置 // 重置
this.search = { this.search = {
way: '', way: '',
...@@ -859,14 +860,13 @@ ...@@ -859,14 +860,13 @@
is_tea: 0, is_tea: 0,
type: '', type: '',
batch: '', batch: '',
// wayCurrentValue: '',
// nameCurrentValue: '',
// approval_stateCurrentValue: '',
// levelCurrentValue: '',
//
levelArray: [], levelArray: [],
} }
this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.$refs.search.searchCondObj.is_tea = 0
await this.GetBatchBySelect()
this.searchFun() this.searchFun()
}, },
generateStudentOrTeacherRewards(row, key) { generateStudentOrTeacherRewards(row, key) {
...@@ -988,11 +988,6 @@ ...@@ -988,11 +988,6 @@
this.getCompetitionSignList() this.getCompetitionSignList()
}, },
async searchFun() { async searchFun() {
// this.search.wayCurrentValuethis = this.search.name
// this.search.levelCurrentValue = this.search.level
// this.search.wayCurrentValue = this.search.way
// this.search.approval_stateCurrentValue = this.search.approval_state
//
this.pageKey++ this.pageKey++
this.init.page_index = 1 this.init.page_index = 1
const res = await this.getCompetitionSignList() const res = await this.getCompetitionSignList()
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<template #title> <template #title>
<div style="height:auto"> <div style="height:auto">
<cs-search-cond-form <cs-search-cond-form
ref="search"
@watchIsTea="watchIsTea" @watchIsTea="watchIsTea"
:searchCondList="searchCondList" :searchCondList="searchCondList"
:labelWidth="120" :labelWidth="120"
...@@ -314,16 +315,10 @@ ...@@ -314,16 +315,10 @@
components: {updateCertificateModal}, components: {updateCertificateModal},
data() { data() {
return { return {
firstBatch: "",
imporFileLoading: false, imporFileLoading: false,
// 搜索项 // 搜索项
searchCondList: [ searchCondList: [
{
id: 'is_tea',
name: '参赛身份',
type: 'select',
show: true,
optList: [{label: '学生', value: 0}, {label: '教师', value: 1}]
},
{ {
id: 'batch', id: 'batch',
name: '赛事批次', name: '赛事批次',
...@@ -331,6 +326,8 @@ ...@@ -331,6 +326,8 @@
show: true, show: true,
optList: [] optList: []
}, },
{ {
id: 'name', id: 'name',
name: '赛事名称', name: '赛事名称',
...@@ -371,14 +368,21 @@ ...@@ -371,14 +368,21 @@
name: '审批状态', name: '审批状态',
type: 'select', type: 'select',
show: true, show: true,
optList: [{value: 0, label: '未审批'}, optList: [
{value: 0, label: '未审批'},
{value: 1, label: '审批中'}, {value: 1, label: '审批中'},
{value: 2, label: '审批通过'}, {value: 2, label: '审批通过'},
{value: 3, label: '审批不通过'}, {value: 3, label: '审批不通过'},
{value: 4, label: '退回'},] {value: 4, label: '退回'},
]
},
{
id: 'is_tea',
name: '参赛身份',
type: 'select',
show: true,
optList: [{label: '学生', value: 0}, {label: '教师', value: 1}]
}, },
], ],
teamObjectData: {}, teamObjectData: {},
columnsStudent: [ columnsStudent: [
...@@ -582,14 +586,14 @@ ...@@ -582,14 +586,14 @@
key: 'competitionname', key: 'competitionname',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '赛项名称', title: '赛项名称',
slot: 'competitionsubitem_name', slot: 'competitionsubitem_name',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '赛事编号', title: '赛事编号',
...@@ -611,14 +615,14 @@ ...@@ -611,14 +615,14 @@
slot: 'competition_level_id', slot: 'competition_level_id',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
{ {
title: '竞赛类别', title: '竞赛类别',
slot: 'competition_type_id', slot: 'competition_type_id',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
// { // {
// title: '获奖团队', // title: '获奖团队',
...@@ -632,14 +636,14 @@ ...@@ -632,14 +636,14 @@
key: 'createby', key: 'createby',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '比赛形式', title: '比赛形式',
slot: 'way', slot: 'way',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '赛事奖项', title: '赛事奖项',
...@@ -882,11 +886,14 @@ ...@@ -882,11 +886,14 @@
return info.role.indexOf('["管理员"]') !== -1 return info.role.indexOf('["管理员"]') !== -1
} }
}, },
mounted() { async mounted() {
await this.GetBatchBySelect()
this.getGetCertificateList()
this.GetHierarchyNameSelect() this.GetHierarchyNameSelect()
this.GetLevelBySelect() this.GetLevelBySelect()
this.getGetCertificateList()
this.GetBatchBySelect()
this.GetTypeBySelect() this.GetTypeBySelect()
}, },
methods: { methods: {
...@@ -929,8 +936,14 @@ ...@@ -929,8 +936,14 @@
}, },
GetBatchBySelect() { GetBatchBySelect() {
//获取批次 //获取批次
this.asc.getApiCommonGetBatchBySelect({competition_method: this.search.is_tea}).then(res => { this.loading = true
return this.asc.getApiCommonGetBatchBySelect({competition_method: this.search.is_tea}).then(res => {
//搜索框 //搜索框
this.firstBatch = res.response[0].id //获取首个批次
this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.searchCondList.forEach(cur => { this.searchCondList.forEach(cur => {
if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => { if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => {
return { return {
...@@ -939,15 +952,8 @@ ...@@ -939,15 +952,8 @@
} }
}) })
}) })
// this.modal.cmdDetailsFormItem.forEach(cur => { this.loading = false
// //新增|编辑 return res
// if (cur.id === 'competitionbatchid') cur.optList = res.response.map((cur, index) => {
// return {
// value: cur.id,
// label: cur.name,
// }
// })
// })
}) })
}, },
GetTypeBySelect() { GetTypeBySelect() {
...@@ -971,10 +977,11 @@ ...@@ -971,10 +977,11 @@
// }) // })
}) })
}, },
watchIsTea(is_tea) { async watchIsTea(is_tea) {
//监听是否选择身份 是刷新批次 //监听是否选择身份 是刷新批次
this.search.is_tea = is_tea this.search.is_tea = is_tea
this.GetBatchBySelect() await this.GetBatchBySelect()
this.getGetCertificateList()
}, },
cssearch(val) { cssearch(val) {
// 搜索 // 搜索
...@@ -982,7 +989,7 @@ ...@@ -982,7 +989,7 @@
this.searchFun() this.searchFun()
}, },
csreset() { async csreset() {
// 重置 // 重置
this.search = { this.search = {
way: '', way: '',
...@@ -1002,6 +1009,11 @@ ...@@ -1002,6 +1009,11 @@
} }
this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.$refs.search.searchCondObj.is_tea = 0
await this.GetBatchBySelect()
this.searchFun() this.searchFun()
}, },
closeModal() { closeModal() {
...@@ -1153,11 +1165,7 @@ ...@@ -1153,11 +1165,7 @@
this.getGetCertificateList() this.getGetCertificateList()
}, },
async searchFun() { async searchFun() {
// this.search.wayCurrentValuethis = this.search.name
// this.search.levelCurrentValue = this.search.level
// this.search.wayCurrentValue = this.search.way
// this.search.approval_stateCurrentValue = this.search.approval_state
// this.search.currentH_id = this.search.h_id
this.pageKey++ this.pageKey++
this.init.page_index = 1 this.init.page_index = 1
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<card> <card>
<!-- 搜索框--> <!-- 搜索框-->
<cs-search-cond-form <cs-search-cond-form
@watchIsTea="watchIsTea"
ref="search"
:labelWidth="120" :labelWidth="120"
:params="init.search" :params="init.search"
:searchCondList="init.searchCondList" :searchCondList="init.searchCondList"
...@@ -365,6 +367,7 @@ ...@@ -365,6 +367,7 @@
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
firstBatch: '',
isShowBonus: false, isShowBonus: false,
approvalState: '', approvalState: '',
flagObject: {}, flagObject: {},
...@@ -766,7 +769,9 @@ ...@@ -766,7 +769,9 @@
name: '参赛身份', name: '参赛身份',
type: 'select', type: 'select',
show: true, show: true,
optList: [{label: '学生', value: 0}, {label: '教师', value: 1}, {label: '全部', value: 2}] optList: [{label: '学生', value: 0}, {label: '教师', value: 1}]
// optList: [{label: '学生', value: 0}, {label: '教师', value: 1}, {label: '全部', value: 2}]
}, },
], ],
search: { search: {
...@@ -776,27 +781,27 @@ ...@@ -776,27 +781,27 @@
"type": "", "type": "",
"batch": "", "batch": "",
"way": "0", "way": "0",
"is_tea": 2, "is_tea": 0,
"approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过 "approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过
"h_id": "", "h_id": "",
}, },
tableColumns: [ tableColumns: [
{type: 'index', title: '序号', minWidth: 80, show: true}, {type: 'index', title: '序号', minWidth: 80, show: true},
// {key: 'competitionbatch_name', title: '批次', minWidth: 150, show: true}, // {key: 'competitionbatch_name', title: '批次', minWidth: 150, show: true},
{key: 'competitionname', title: '赛事名称', minWidth: 160, show: true}, {key: 'competitionname', title: '赛事名称', minWidth: 150, show: true},
{key: 'sponsor', title: '主办单位', minWidth: 120, show: true}, {key: 'sponsor', title: '主办单位', minWidth: 150, show: true},
{key: 'report_code', title: '赛事编码', minWidth: 120, show: true}, {key: 'report_code', title: '赛事编码', minWidth: 150, show: true},
{key: 'competitionsubitem_name', title: '赛项名称', minWidth: 160, show: true}, {key: 'competitionsubitem_name', title: '赛项名称', minWidth: 150, show: true},
{key: 'competition_level_name', title: '赛事级别', minWidth: 120, show: true}, {key: 'competition_level_name', title: '赛事级别', minWidth: 150, show: true},
{key: 'competition_type_name', title: '竞赛类别', minWidth: 120, show: true}, {key: 'competition_type_name', title: '竞赛类别', minWidth: 150, show: true},
{slot: 'way', title: '比赛形式', minWidth: 120, show: true}, {slot: 'way', title: '比赛形式', minWidth: 150, show: true},
/* {key: 'bonus_total', title: '教师奖金总金额', minWidth: 140, show: true}, /* {key: 'bonus_total', title: '教师奖金总金额', minWidth: 140, show: true},
{key: 'bonus_total1', title: '学生奖金总金额', minWidth: 140, show: true},*/ {key: 'bonus_total1', title: '学生奖金总金额', minWidth: 140, show: true},*/
{key: 'bonus_total', title: '奖金总金额', minWidth: 140, show: true}, {key: 'bonus_total', title: '奖金总金额', minWidth: 150, show: true},
{slot: 'approval_state', title: '审批状态', minWidth: 120, show: true}, {slot: 'approval_state', title: '审批状态', minWidth: 150, show: true},
{key: 'begin_time', title: '比赛开始时间', minWidth: 160, show: true}, {key: 'begin_time', title: '比赛开始时间', minWidth: 150, show: true},
{key: 'end_time', title: '比赛结束时间', minWidth: 160, show: true}, {key: 'end_time', title: '比赛结束时间', minWidth: 150, show: true},
{slot: 'certificate_file', title: '附件上传', minWidth: 120, show: true}, {slot: 'certificate_file', title: '附件上传', minWidth: 150, show: true},
{slot: 'actionAndDetails', title: '操作', minWidth: 180, fixed: 'right', show: true}, {slot: 'actionAndDetails', title: '操作', minWidth: 180, fixed: 'right', show: true},
], ],
tableData: [], tableData: [],
...@@ -919,7 +924,7 @@ ...@@ -919,7 +924,7 @@
this.onPageChange(1) this.onPageChange(1)
}, },
reset() { async reset() {
// 重置 // 重置
this.init.search = { this.init.search = {
role_Id: this.$roleId, role_Id: this.$roleId,
...@@ -928,12 +933,16 @@ ...@@ -928,12 +933,16 @@
"type": "", "type": "",
"batch": "", "batch": "",
"way": "0", "way": "0",
"is_tea": 2, "is_tea": 0,
"approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过 "approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过
"h_id": "", "h_id": "",
"page_index": 1, "page_index": 1,
"page_size": 10 "page_size": 10
} }
this.init.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.$refs.search.searchCondObj.is_tea = 0
await this.GetBatchBySelect()
this.onPageChange(1) this.onPageChange(1)
}, },
switchChange(val, row, index) { switchChange(val, row, index) {
...@@ -1128,11 +1137,22 @@ ...@@ -1128,11 +1137,22 @@
this.onPageChange(1) this.onPageChange(1)
} }
}, },
async watchIsTea(is_tea) {
//监听是否选择身份 是刷新批次
this.init.search.is_tea = is_tea
await this.GetBatchBySelect()
this.getData()
},
GetBatchBySelect() { GetBatchBySelect() {
//获取批次 //获取批次
this.asc.getApiCommonGetBatchBySelect({competition_method: 1}).then(res => { this.loading = true
return this.asc.getApiCommonGetBatchBySelect({competition_method: this.init.search.is_tea}).then(res => {
//搜索框 //搜索框
this.firstBatch = res.response[0].id //获取首个批次
this.init.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
this.init.searchCondList.forEach(cur => { this.init.searchCondList.forEach(cur => {
if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => { if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => {
return { return {
...@@ -1150,6 +1170,8 @@ ...@@ -1150,6 +1170,8 @@
} }
}) })
}) })
this.loading = false
return res
}) })
}, },
GetLevelBySelect() { GetLevelBySelect() {
...@@ -1232,12 +1254,12 @@ ...@@ -1232,12 +1254,12 @@
}, },
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() { async mounted() {
await this.GetBatchBySelect()
this.getData() this.getData()
this.GetLevelBySelect() this.GetLevelBySelect()
this.GetTypeBySelect() this.GetTypeBySelect()
this.GetHierarchySelect() this.GetHierarchySelect()
this.GetBatchBySelect()
}, },
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
@on-page-size-change="handleChangePageSize" @on-page-size-change="handleChangePageSize"
/> />
</div> </div>
</Card> </Card>
<Modal <Modal
:width="50" :width="50"
......
...@@ -4,28 +4,30 @@ ...@@ -4,28 +4,30 @@
<template v-slot:title> <template v-slot:title>
<!-- 搜索框--> <!-- 搜索框-->
<cs-search-cond-form <cs-search-cond-form
ref="search"
:searchCondList="searchCondList" :searchCondList="searchCondList"
:labelWidth="120" :labelWidth="120"
@onSubmit="search1" @onSubmit="search1"
@onReset="reset" @onReset="reset"
:params="search"
></cs-search-cond-form> ></cs-search-cond-form>
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add" @click="addEvent" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add" @click="addEvent"
v-if="getUserRole()"> v-if="isAdmin">
添加赛事 添加赛事
</Button> </Button>
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add" @click="addEventClass" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add" @click="addEventClass"
v-if="getUserRole()"> v-if="isAdmin">
添加赛事级别 添加赛事级别
</Button> </Button>
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-add"
@click="modal.addEventCategory = true" @click="modal.addEventCategory = true"
v-if="getUserRole()"> v-if="isAdmin">
添加赛事类别 添加赛事类别
</Button> </Button>
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-upload" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-upload"
@click="modal.ImportModal = true" @click="modal.ImportModal = true"
v-if="getUserRole()">导入数据 v-if="isAdmin">导入数据
</Button> </Button>
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-download" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-download"
@click="ReportExportToExcel"> @click="ReportExportToExcel">
...@@ -34,12 +36,12 @@ ...@@ -34,12 +36,12 @@
<Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-download" <Button style="margin-right: 10px;margin-bottom: 5px;" class="buttonFocus" icon="md-cloud-download"
@click="GetReportImportTemplate" @click="GetReportImportTemplate"
:loading="Bloading" :loading="Bloading"
v-if="getUserRole()">下载模板 v-if="isAdmin">下载模板
</Button> </Button>
</template> </template>
<Table :columns="hooks.getUserRole() ?columns:columns.filter(cur=>cur.title!=='操作')" :data="data" <Table :columns="isAdmin ?columns:columns.filter(cur=>cur.title!=='操作')" :data="data"
:loading="loading"> :loading="loading">
<template #dept="{row}"> <template #dept="{row}">
<Tooltip placement="right-end" :transfer="false" :max-width="500"> <Tooltip placement="right-end" :transfer="false" :max-width="500">
...@@ -55,10 +57,10 @@ ...@@ -55,10 +57,10 @@
</span></Tag> </span></Tag>
</template> </template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
<a @click="eventTitle='编辑赛事';importFile(row)" v-if="getUserRole()">编辑</a> <a @click="eventTitle='编辑赛事';importFile(row)" v-if="isAdmin">编辑</a>
<!-- <a @click="edit(row)" style="margin-left: 15px;">详细</a>--> <!-- <a @click="edit(row)" style="margin-left: 15px;">详细</a>-->
<Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel"> <Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel">
<a style="margin-left: 15px;color: red" v-if="getUserRole()">删除</a> <a style="margin-left: 15px;color: red" v-if="isAdmin">删除</a>
</Poptip> </Poptip>
</template> </template>
</Table> </Table>
...@@ -290,9 +292,10 @@ ...@@ -290,9 +292,10 @@
<script> <script>
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import * as api from '../../../api/requestUtils' import * as api from '../../../api/requestUtils'
import * as hooks from '../../../hook/index' import * as hooks from '@/hook/index'
import {getUserRole, myEncapsulationFunction} from "../../../hook/index"; import {getUserRole, myEncapsulationFunction} from "../../../hook/index";
import {defaultEmphasis} from "echarts/lib/util/model"; import {defaultEmphasis} from "echarts/lib/util/model";
import util from "@/libs/util";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等) //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
...@@ -364,6 +367,7 @@ ...@@ -364,6 +367,7 @@
], ],
Bloading: false, Bloading: false,
eventTitle: '', eventTitle: '',
firstBatch: '',
loading: false, loading: false,
f1EditState: false, f1EditState: false,
batchList: [], batchList: [],
...@@ -592,7 +596,12 @@ ...@@ -592,7 +596,12 @@
}, },
//监听属性 类似于data概念", //监听属性 类似于data概念",
computed: {}, computed: {
isAdmin() {
let info = JSON.parse(util.cookies.get('competition-roleId'))
return info.role_name === '管理员'
},
},
//监控data中的数据变化", //监控data中的数据变化",
watch: {}, watch: {},
//方法集合", //方法集合",
...@@ -647,8 +656,8 @@ ...@@ -647,8 +656,8 @@
}, },
cancel() { cancel() {
}, },
reset() { async reset() {
console.log("🚀🚀🚀,", 1)
//重置 //重置
this.search = { this.search = {
"name": "", "name": "",
...@@ -663,8 +672,12 @@ ...@@ -663,8 +672,12 @@
"page_size": 10 "page_size": 10
} }
this.pageKey++ this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch
await this.GetBatchBySelect()
this.pageKey++
this.getCompetitionList() this.getCompetitionList()
}, },
search1(row) { search1(row) {
...@@ -674,26 +687,16 @@ ...@@ -674,26 +687,16 @@
this.getCompetitionList() this.getCompetitionList()
}, },
async getCompetitionList() { async getCompetitionList() {
hooks.getInitListRequest(async () => { this.loading = true
this.loading = true
let data = { return api.GetReportList(this.search).then(res => {
// "name": this.search.wayCurrentValuethis,
// "level": this.search.levelCurrentValue,
// "way": this.search.wayCurrentValue,
// "approval_state": this.search.approval_stateCurrentValue,
"name": this.formValidate.name1,
"level": '',
"way": '',
"approval_state": '',
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
const res = await api.GetReportList(this.search)
this.data = res.response.data this.data = res.response.data
this.init.total = res.response.data_count this.init.total = res.response.data_count
this.loading = false this.loading = false
return res
}) })
}, },
GetHierarchySelect() { GetHierarchySelect() {
//获取赛项等级下拉框 //获取赛项等级下拉框
...@@ -739,23 +742,28 @@ ...@@ -739,23 +742,28 @@
}) })
}, },
GetBatchBySelect() { GetBatchBySelect() {
hooks.getInitListRequest(() => { this.loading = true
//获取批次 //获取批次
this.asc.getApiCommonGetBatchBySelect({competition_method: this.formValidate.competition_method}).then(res => { return this.asc.getApiCommonGetBatchBySelect({competition_method: this.formValidate.competition_method}).then(res => {
this.batchList = res.response this.batchList = res.response
//搜索框 //搜索框
this.searchCondList.forEach(cur => { this.firstBatch = res.response[0].id //获取首个批次
if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => { this.search.batch = this.firstBatch
return { this.$refs.search.searchCondObj.batch = this.firstBatch
value: cur.id,
label: cur.name,
}
})
})
})
this.searchCondList.forEach(cur => {
if (cur.id === 'batch') cur.optList = res.response.map((cur, index) => {
return {
value: cur.id,
label: cur.name,
}
})
})
this.loading = false
return res
}) })
}, },
GetDeptSeletct() { GetDeptSeletct() {
hooks.getInitListRequest(async () => { hooks.getInitListRequest(async () => {
...@@ -901,14 +909,16 @@ ...@@ -901,14 +909,16 @@
}, },
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() { async mounted() {
this.formValidate.competition_method = this.studentOrTeacher === 'student' ? 0 : 1 this.formValidate.competition_method = this.studentOrTeacher === 'student' ? 0 : 1
this.search.is_tea = this.studentOrTeacher === 'student' ? 0 : 1 this.search.is_tea = this.studentOrTeacher === 'student' ? 0 : 1
this.GetHierarchySelect() await this.GetBatchBySelect()
this.getCompetitionList() this.getCompetitionList()
this.GetHierarchySelect()
this.GetLevelBySelect() this.GetLevelBySelect()
this.GetTypeBySelect() this.GetTypeBySelect()
this.GetBatchBySelect()
this.GetDeptSeletct() this.GetDeptSeletct()
this.GetLevelList() this.GetLevelList()
this.GetTypeList() this.GetTypeList()
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
import {cloneDeep} from 'lodash' import {cloneDeep} from 'lodash'
import * as api from '@/api/controller/index' import * as api from '@/api/controller/index'
import * as hooks from '@/hook/index' import * as hooks from '@/hook/index'
import util from "@/libs/util";
export default { export default {
name: 'list', name: 'list',
...@@ -186,6 +187,10 @@ ...@@ -186,6 +187,10 @@
} }
}, },
computed: { computed: {
isAdmin() {
let info = JSON.parse(util.cookies.get('competition-roleId'))
return info.role_name === '管理员'
},
// 邀请参与人员已选人员标签计算 // 邀请参与人员已选人员标签计算
ptcAddPsCal() { ptcAddPsCal() {
return function (item) { return function (item) {
...@@ -417,12 +422,16 @@ ...@@ -417,12 +422,16 @@
:searchCondList="searchCondList" :searchCondList="searchCondList"
:labelWidth="120" :labelWidth="120"
@onSubmit="search" @onSubmit="search"
@onReset="reset"></SearchCondForm> @onReset="reset">
</SearchCondForm>
<Button class="buttonFocus" icon="md-add" style="margin-right: 10px" @click="add">新增专家</Button>
<Button icon="md-cloud-upload" style="margin-right: 10px" @click="modal.ImportModal = true">导入数据</Button> <Button v-if="isAdmin" class="buttonFocus" icon="md-add" style="margin-right: 10px" @click="add">新增专家</Button>
<Button icon="md-cloud-download" style="margin-right: 10px" @click="importRecordFile">导出数据</Button> <Button v-if="isAdmin" icon="md-cloud-upload" style="margin-right: 10px" @click="modal.ImportModal = true">
<Button icon="md-cloud-download" @click="GetReportImportTemplate">下载模板</Button> 导入数据
</Button>
<Button v-if="isAdmin" icon="md-cloud-download" style="margin-right: 10px" @click="importRecordFile">导出数据
</Button>
<Button v-if="isAdmin" icon="md-cloud-download" @click="GetReportImportTemplate">下载模板</Button>
<!-- 数据table --> <!-- 数据table -->
<CTable <CTable
:tableColumns="tableColumns.filter(a => a.show)" :tableColumns="tableColumns.filter(a => a.show)"
...@@ -456,9 +465,8 @@ ...@@ -456,9 +465,8 @@
:width="800" :width="800"
@signRecord="signRecord" @signRecord="signRecord"
@onSubmit="onSubmit" @onSubmit="onSubmit"
@onClose="editModalshow = false"></CEditModal> @onClose="editModalshow = false">
</CEditModal>
</Card> </Card>
</div> </div>
</template> </template>
......
...@@ -824,6 +824,7 @@ ...@@ -824,6 +824,7 @@
import * as api from '../../../api/requestUtils' import * as api from '../../../api/requestUtils'
import {publicState} from "@/configState"; import {publicState} from "@/configState";
import * as zeroAPi from "@api/controller/index.d.ts"; import * as zeroAPi from "@api/controller/index.d.ts";
import * as asc from "@api/controller/index.d.ts";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等) //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
export default { export default {
...@@ -1600,6 +1601,10 @@ ...@@ -1600,6 +1601,10 @@
case 'pass': case 'pass':
this.btLoad = true this.btLoad = true
const pass = await api.FlowApproval(data) const pass = await api.FlowApproval(data)
asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
//刷新流程数量
window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
})
this.btLoad = false this.btLoad = false
hook.publicMessage(pass) hook.publicMessage(pass)
this.publicModal = false this.publicModal = false
...@@ -1607,7 +1612,7 @@ ...@@ -1607,7 +1612,7 @@
setTimeout(() => { setTimeout(() => {
localStorage.setItem('updataEvent', 'getDataEvent'); localStorage.setItem('updataEvent', 'getDataEvent');
this.routerBack() this.routerBack()
}, 1500) }, 500)
} }
break; break;
case 'revocation': case 'revocation':
...@@ -1616,13 +1621,17 @@ ...@@ -1616,13 +1621,17 @@
this.btLoad = true this.btLoad = true
data.action = this.formValidate.publicAction data.action = this.formValidate.publicAction
const Revocation = await api.FlowRevocation(data) const Revocation = await api.FlowRevocation(data)
asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
//刷新流程数量
window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
})
if (Revocation.code === 1) { if (Revocation.code === 1) {
hook.publicMessage(Revocation) hook.publicMessage(Revocation)
this.publicModal = false this.publicModal = false
setTimeout(() => { setTimeout(() => {
localStorage.setItem('updataEvent', 'getDataEvent'); localStorage.setItem('updataEvent', 'getDataEvent');
this.routerBack() this.routerBack()
}, 1500) }, 500)
} else { } else {
this.btLoad = false this.btLoad = false
this.$Message.error(Revocation.msg_detail) this.$Message.error(Revocation.msg_detail)
......
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
:loading="loading" :loading="loading"
@on-selection-change="onSelectionChange" @on-selection-change="onSelectionChange"
> >
<template #title="{row}">
<Ellipsis :text="row.title || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #flow_name="{row}">
<Ellipsis :text="row.flow_name || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #todo="{row}"> <template #todo="{row}">
<Ellipsis :text="row.todo || ''" :length="20" tooltip :transfer="true"/> <Ellipsis :text="row.todo || ''" :length="20" tooltip :transfer="true"/>
</template> </template>
...@@ -68,6 +74,7 @@ ...@@ -68,6 +74,7 @@
import {publicState} from "@/configState"; import {publicState} from "@/configState";
import * as zeroApi from '@/api/controller/index' import * as zeroApi from '@/api/controller/index'
import * as hooks from "@/hook"; import * as hooks from "@/hook";
import * as asc from "@api/controller/index.d.ts";
export default { export default {
...@@ -295,13 +302,13 @@ ...@@ -295,13 +302,13 @@
}, },
{ {
title: '赛事名称', title: '赛事名称',
key: 'title', slot: 'title',
show: true, show: true,
minWidth: 300, minWidth: 150,
}, },
{ {
title: '流程名称', title: '流程名称',
key: 'flow_name', slot: 'flow_name',
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
...@@ -309,32 +316,32 @@ ...@@ -309,32 +316,32 @@
title: '流程状态', title: '流程状态',
slot: 'status', slot: 'status',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
{ {
title: '操作类型', title: '操作类型',
slot: 'action_type', slot: 'action_type',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '当前节点名称', title: '当前节点名称',
key: 'current_node_name', key: 'current_node_name',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '当前节点待办人员', title: '当前节点待办人员',
slot: 'todo', slot: 'todo',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '参与人员', title: '参与人员',
slot: 'partcipant', slot: 'partcipant',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '发起人工号', title: '发起人工号',
...@@ -348,7 +355,7 @@ ...@@ -348,7 +355,7 @@
key: 'starter_name', key: 'starter_name',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '发起时间', title: '发起时间',
...@@ -919,12 +926,20 @@ ...@@ -919,12 +926,20 @@
this.batApprovalArray = array this.batApprovalArray = array
}, },
batApproval() { batApproval() {
//批量审批流程 //批量审批流程
hook.publicConfirm(() => hook.myEncapsulationFunction(async () => { hook.publicConfirm(() => hook.myEncapsulationFunction(async () => {
this.$refs.batApproval.load = true this.$refs.batApproval.load = true
const res = await api.FlowApprovalBatch({runid_list: this.batApprovalArray}) const res = await api.FlowApprovalBatch({runid_list: this.batApprovalArray})
await asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
//刷新流程数量
window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
this.$bus.$emit('watchLocalStorage', 1)
return res
})
this.$refs.batApproval.load = false this.$refs.batApproval.load = false
this.GetFlowTaskList() this.GetFlowTaskList();
// if (res.code === 1) this.GetFlowTaskList() // if (res.code === 1) this.GetFlowTaskList()
return res return res
})) }))
......
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
:data="tableData" :data="tableData"
:loading="loading" :loading="loading"
> >
<template #title="{row}">
<Ellipsis :text="row.title || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #flow_name="{row}">
<Ellipsis :text="row.flow_name || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #todo="{row}"> <template #todo="{row}">
<!-- <span v-for="(item,index) in row.todo" :key="index">{{ <!-- <span v-for="(item,index) in row.todo" :key="index">{{
item.replace('[', '').replace(']', '').replace('"', '') item.replace('[', '').replace(']', '').replace('"', '')
...@@ -394,14 +400,13 @@ ...@@ -394,14 +400,13 @@
}, },
{ {
title: '赛事名称', title: '赛事名称',
key: 'title', slot: 'title',
show: true, show: true,
minWidth: 300, minWidth: 150,
}, },
{ {
title: '流程名称', title: '流程名称',
key: 'flow_name', slot: 'flow_name',
show: true, show: true,
minWidth: 150, minWidth: 150,
...@@ -411,34 +416,34 @@ ...@@ -411,34 +416,34 @@
slot: 'status', slot: 'status',
show: true, show: true,
minWidth: 100, minWidth: 150,
}, },
{ {
title: '操作类型', title: '操作类型',
slot: 'action_type', slot: 'action_type',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '当前节点名称', title: '当前节点名称',
key: 'current_node_name', key: 'current_node_name',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '当前节点待办人员', title: '当前节点待办人员',
slot: 'todo', slot: 'todo',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '参与人', title: '参与人',
slot: 'partcipant', slot: 'partcipant',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '发起人', title: '发起人',
...@@ -452,7 +457,7 @@ ...@@ -452,7 +457,7 @@
key: 'starter_name', key: 'starter_name',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '发起时间', title: '发起时间',
......
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
:data="tableData" :data="tableData"
:loading="loading" :loading="loading"
> >
<template #title="{row}">
<Ellipsis :text="row.title || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #flow_name="{row}">
<Ellipsis :text="row.flow_name || ''" :length="20" tooltip :transfer="true"/>
</template>
<template #todo="{row}"> <template #todo="{row}">
<Ellipsis :text="row.todo || ''" :length="20" tooltip :transfer="true"/> <Ellipsis :text="row.todo || ''" :length="20" tooltip :transfer="true"/>
</template> </template>
...@@ -596,13 +604,13 @@ ...@@ -596,13 +604,13 @@
}, },
{ {
title: '赛事名称', title: '赛事名称',
key: 'title', slot: 'title',
show: true, show: true,
minWidth: 300, minWidth: 150,
}, },
{ {
title: '流程名称', title: '流程名称',
key: 'flow_name', slot: 'flow_name',
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
...@@ -630,7 +638,7 @@ ...@@ -630,7 +638,7 @@
slot: 'todo', slot: 'todo',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
...@@ -638,7 +646,7 @@ ...@@ -638,7 +646,7 @@
slot: 'partcipant', slot: 'partcipant',
show: true, show: true,
minWidth: 200, minWidth: 150,
}, },
{ {
title: '发起人', title: '发起人',
...@@ -652,7 +660,7 @@ ...@@ -652,7 +660,7 @@
key: 'starter_name', key: 'starter_name',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '发起时间', title: '发起时间',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或