提交 239550d5 编写于 作者: 刘英杰's avatar 刘英杰

- 20241101 优化项保存

上级 f2b8a758
流水线 #30454 已通过 ,包含阶段
in 50 second
[data-v-1ca3521a] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.selectCompetitionNumber[data-v-1ca3521a] .ivu-select-dropdown{width:500px!important;max-height:unset;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}.filelist[data-v-1ca3521a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-1ca3521a]: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:550px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}@media screen and (max-width:1500px){.containerTemplate{width:80%;height:90vh;overflow-y:auto}}@media screen and (min-width:1500px){.containerTemplate{width:50%;height:90vh;overflow-y:auto}}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file
[data-v-ea2c540a] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.selectCompetitionNumber[data-v-ea2c540a] .ivu-select-dropdown{width:500px!important;max-height:unset;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}.filelist[data-v-ea2c540a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-ea2c540a]: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:550px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}@media screen and (max-width:1500px){.containerTemplate{width:80%;height:90vh;overflow-y:auto}}@media screen and (min-width:1500px){.containerTemplate{width:50%;height:90vh;overflow-y:auto}}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file
[data-v-24dca222] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-24dca222] .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-24dca222]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-24dca222]:hover{color:red;transform:scale(1.5)}[data-v-501c0ada] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-501c0ada] .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-501c0ada]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-501c0ada]: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-ec9a51a6]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-ec9a51a6]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-ec9a51a6]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-ec9a51a6]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-ec9a51a6]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-ec9a51a6]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-ec9a51a6]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-ec9a51a6]:hover{transform:scale(1.2)}.carClass[data-v-ec9a51a6]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-ec9a51a6] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
[data-v-24dca222] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-24dca222] .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-24dca222]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-24dca222]:hover{color:red;transform:scale(1.5)}[data-v-51f50c9d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-51f50c9d] .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-51f50c9d]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-51f50c9d]: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-ec9a51a6]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-ec9a51a6]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-ec9a51a6]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-ec9a51a6]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-ec9a51a6]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-ec9a51a6]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-ec9a51a6]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-ec9a51a6]:hover{transform:scale(1.2)}.carClass[data-v-ec9a51a6]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-ec9a51a6] .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
.carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-95a954c2]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-95a954c2]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-95a954c2]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-95a954c2]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-95a954c2]{width:500px;height:50px;text-align:center}.Atext[data-v-95a954c2]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-95a954c2]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-95a954c2]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-95a954c2] .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
.carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-ed47e796]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-ed47e796]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-ed47e796]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-ed47e796]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-ed47e796]{width:500px;height:50px;text-align:center}.Atext[data-v-ed47e796]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-ed47e796]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-ed47e796]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-ed47e796] .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
<!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.db0ab0a4.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.ce961fc4.js></script><script src=js/app~748942c6.a9d6377f.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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.db0ab0a4.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.a622202c.js></script><script src=js/app~748942c6.a02db14f.js></script></body></html>
\ No newline at end of file
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
......@@ -123,6 +123,11 @@ export function isAdmin() {
return role.role_name === '管理员'
}
export function isAdminOrDeptPrincipal() {
let role = Cookies.get('admin-competition-roleId') ? JSON.parse(decodeURIComponent(Cookies.get('admin-competition-roleId'))) : ''
return role.role_name === '管理员' || role.role_name === '学院负责人'
}
export function isWayEq2InSetNull(way) {
return way == 2 ? '' : way
}
......
......@@ -75,15 +75,14 @@
},
async setRoleInfo(key) {
//设置权限信息
this.userRole = key.role_name
var info = {
let info = {
name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: [key.role_name === '管理员' ? 'admin' : "xxx"]
access: [key.role_name === '管理员' ? 'admin' : "xxx", (key.role_name === '管理员' || key.role_name === '学院负责人') ? 'adminOrDeptPrincipal' : "xxx"]
}
// await
this.$store.dispatch('admin/user/set', info, {root: true});
await this.$store.dispatch('admin/user/set', info, {root: true});
this.hooks.setRoleInfo(key)
window.location.reload()
......
......@@ -25,12 +25,12 @@ export default {
path: `${pre}-expertsInformation`,
title: '专家信息'
},
{
// path: `${pre}-eventApplication`,
title: '赛事申请',
path: '/77-1',
header: 'home',
auth: ['adminOrDeptPrincipal'],
children: [
{
path: `${pre}-teacherAdd`,
......@@ -56,12 +56,12 @@ export default {
{
path: `/flow-awaitDoneList-eventCatalogue`,
title: '待办流程',
auth: ['admin'],
},
{
path: `/flow-processedList-eventCatalogue`,
title: '已办流程',
auth: ['admin'],
},
{
path: `/flow-myFlowList-eventCatalogue`,
......
......@@ -752,7 +752,6 @@
:footer-hide="true"
v-model="specialist.show"
:transfer="true"
title="添加专家"
width="50%"
>
......@@ -811,11 +810,11 @@
<Select
v-model="specialist.formData.dept_id"
placeholder="请选择院系"
filterable
clearable
>
<Option v-for="item in specialist.deptList" :key="item.value" :value="item.id">{{
item.label
}}
</Option>
<Option v-for="item in specialist.deptList" :key="item.value" :value="item.id"
:label="item.label "/>
</Select>
</FormItem>
</Col>
......
......@@ -588,6 +588,12 @@
show: true,
width: 80
},
{
title: '所属院系',
key: 'dept_name',
show: true,
minWidth: 150,
},
{
title: '赛事名称',
key: 'competitionname',
......
......@@ -231,7 +231,7 @@
位)</h3>
</template>
<template #extra>
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click=" addATeamPeople(item)">增加队员</a>
<a style="color: red;margin-left: 1vw" @click="deleteTeam(item)">删除本团队</a>
</template>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
......@@ -526,7 +526,7 @@
位)</h3>
</template>
<template #extra>
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click="addATeamPeople(item)">增加队员</a>
<a style="color: red;margin-left: 1vw" @click="deleteTeam(item)">删除本团队</a>
</template>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
......@@ -1452,7 +1452,7 @@
</div>
</template>
<template #right>
<div :key="kkk" style="padding: 1vw">
<div :key="addATeamPeopleKey" style="padding: 1vw">
<Tabs v-model="selectMember">
<TabPane :disabled="tabsName == 1" label="添加学生" name="0">
<div style="display: flex;"></div>
......@@ -1552,7 +1552,8 @@
>
<Tabs v-model="specialist.tabsName">
<!-- 选择专家-->
<TabPane class="container" label="选择专家" name="0" style="width: 100%;height: 100%">
<TabPane class="container" label="选择专家" name="0"
style="width: 100%;height: 100%;align-content: unset !important;">
<Card style="width: 100%">
<template #title>
<div style="display: flex;justify-content: space-between;align-items: center;">
......@@ -1605,11 +1606,10 @@
<Select
v-model="specialist.formData.dept_id"
placeholder="请选择院系"
filterable
clearable
>
<Option v-for="item in specialist.deptList" :key="item.value" :value="item.id">{{
item.label
}}
</Option>
<Option v-for="item in specialist.deptList" :key="item.value" :value="item.id" :label="item.label"/>
</Select>
</FormItem>
</Col>
......@@ -1698,6 +1698,7 @@
data() {
//这里存放数据",
return {
addATeamPeopleKey: 2626,
specialist: {
signList: {
columns: [
......@@ -2277,7 +2278,7 @@
{required: true, type: 'string', message: '该项不能为空', trigger: 'blur'}
],
dept_id: [
{required: true, type: 'string', message: '该项不能为空', trigger: 'change'}
// {required: true, type: 'string', message: '该项不能为空', trigger: 'change'}
],
competitionsubitem_name: [
{required: true, type: 'string', message: '该项不能为空', trigger: 'blur'}
......@@ -2459,6 +2460,18 @@
},
//方法集合",
methods: {
addATeamPeople(item) {
//触发增加团队队员
this.aTeamValue = item;
this.addTeamMembers3.Drawer = true;
this.formValidate3.studentid_list = []
this.formValidate3.teacherid_list = []
this.addATeamPeopleKey++
this.GetStudentListToMembers();
this.GetTeacherListToMembers();
},
removeExpert(row) {
//删除专家
this.hooks.publicConfirm(() => this.hooks.myEncapsulationFunction(() => {
......
......@@ -76,7 +76,7 @@ export default {
var info = {
name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: [hooks.isAdmin() ? 'admin' : "xxx"]
access: [hooks.isAdmin() ? 'admin' : "xxx", hooks.isAdminOrDeptPrincipal() ? 'adminOrDeptPrincipal' : "xxx",],
}
// await
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或