提交 41329cc6 编写于 作者: 刘英杰's avatar 刘英杰

多项优化

上级 796da740
流水线 #23077 已通过 ,包含阶段
in 1 minute 和 16 second
[data-v-21149df1] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-21149df1] .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-21149df1]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-21149df1]: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-5772ae76]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-5772ae76]{border-collapse:collapse}.tableList .container1 .row[data-v-5772ae76]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-5772ae76]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-5772ae76]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-5772ae76]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-5772ae76]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-5772ae76]:hover{transform:scale(1.2)} [data-v-300484fa] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-300484fa] .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-300484fa]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-300484fa]: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-5772ae76]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-5772ae76]{border-collapse:collapse}.tableList .container1 .row[data-v-5772ae76]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-5772ae76]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-5772ae76]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-5772ae76]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-5772ae76]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-5772ae76]:hover{transform:scale(1.2)}
\ No newline at end of file \ No newline at end of file
[data-v-d3276896] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-d3276896] .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-d3276896]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-d3276896]: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)} [data-v-1b6ba47a] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-1b6ba47a] .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-1b6ba47a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-1b6ba47a]: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)}
\ No newline at end of file \ 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.1af866c1.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.9c396eed.js></script><script src=js/app.d64a6fe4.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors.064c214c.css rel=stylesheet><link href=css/app.1af866c1.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.ac0681ac.js></script><script src=js/app.0ddea744.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
<Button type="primary" style="width: 15%; margin-left: 3vw" <Button type="primary" style="width: 15%; margin-left: 3vw"
@click="addTeam = true">添加团队 @click="addTeam = true">添加团队
</Button> </Button>
<Button type="primary" style="width: 15%; margin-left: 3vw" <!-- <Button type="primary" style="width: 15%; margin-left: 3vw"-->
@click="addTeamPeopleModal">添加成员 <!-- @click="addTeamPeopleModal">添加成员-->
</Button> <!-- </Button>-->
</div> </div>
<!-- 参赛队伍卡片--> <!-- 参赛队伍卡片-->
<Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index"> <Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index">
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</template> </template>
<template #extra> <template #extra>
<!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>--> <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a> <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list">
...@@ -575,20 +575,20 @@ ...@@ -575,20 +575,20 @@
<div style="width: 100%;height: 100%;"> <div style="width: 100%;height: 100%;">
<Split v-model="split"> <Split v-model="split">
<template #left> <template #left>
<div style="margin: 1vw"> <!-- <div style="margin: 1vw">-->
<Form ref="addTeamPeopleData" :model="addTeamPeople.data" :rules="ruleValidate1" :label-width="100"> <!-- <Form ref="addTeamPeopleData" :model="addTeamPeople.data" :rules="ruleValidate1" :label-width="100">-->
<FormItem label="团队名称:" prop="teamid"> <!-- <FormItem label="团队名称:" prop="teamid">-->
<Select v-model="addTeamPeople.data.teamid" <!-- <Select v-model="addTeamPeople.data.teamid"-->
placeholder=""> <!-- placeholder="">-->
<Option v-for="(item,index) in addTeamPeople.selectArray" :key="index" <!-- <Option v-for="(item,index) in addTeamPeople.selectArray" :key="index"-->
:value="item.id"> <!-- :value="item.id">-->
{{ item.name }} <!-- {{ item.name }}-->
</Option> <!-- </Option>-->
</Select> <!-- </Select>-->
</FormItem> <!-- </FormItem>-->
</Form> <!-- </Form>-->
</div> <!-- </div>-->
<div style="width: 100%;height: 100%;overflow-y: auto"> <div style="width: 100%;height: 100%;overflow-y: auto">
<div style="width: 100%;height: 43%;overflow-y: auto;"> <div style="width: 100%;height: 43%;overflow-y: auto;">
<h3>参赛学生:</h3> <h3>参赛学生:</h3>
...@@ -1487,11 +1487,12 @@ export default { ...@@ -1487,11 +1487,12 @@ export default {
let data = { let data = {
studentid_list: studentid_list, studentid_list: studentid_list,
teacherid_list: teacherid_list, teacherid_list: teacherid_list,
teamid: this.addTeamPeople.data.teamid, // teamid: this.addTeamPeople.data.teamid,
teamid: this.aTeamValue.teamid,
is_lead: this.formValidate3.is_lead, is_lead: this.formValidate3.is_lead,
} }
this.$refs['addTeamPeopleData'].validate((value) => { // this.$refs['addTeamPeopleData'].validate((value) => {
if (value) { // if (value) {
this.miLoad = true this.miLoad = true
hook.myEncapsulationFunction(async () => { hook.myEncapsulationFunction(async () => {
const res = await api.MembersIns(data) const res = await api.MembersIns(data)
...@@ -1505,8 +1506,8 @@ export default { ...@@ -1505,8 +1506,8 @@ export default {
this.miLoad = false this.miLoad = false
return res return res
}) })
} // }
}) // })
}, },
delClass2(e) { delClass2(e) {
......
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
<Button type="primary" style="width: 15%; margin-left: 3vw" <Button type="primary" style="width: 15%; margin-left: 3vw"
@click="addTeam = true">添加团队 @click="addTeam = true">添加团队
</Button> </Button>
<Button type="primary" style="width: 15%; margin-left: 3vw" <!-- <Button type="primary" style="width: 15%; margin-left: 3vw"-->
@click="addTeamPeopleModal">添加成员 <!-- @click="addTeamPeopleModal">添加成员-->
</Button> <!-- </Button>-->
</div> </div>
<!-- 参赛队伍卡片--> <!-- 参赛队伍卡片-->
<Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index"> <Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index">
...@@ -152,8 +152,7 @@ ...@@ -152,8 +152,7 @@
位)</h3> 位)</h3>
</template> </template>
<template #extra> <template #extra>
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>-->
<a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a> <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list">
...@@ -589,20 +588,20 @@ ...@@ -589,20 +588,20 @@
<div style="width: 100%;height: 100%;"> <div style="width: 100%;height: 100%;">
<Split v-model="split"> <Split v-model="split">
<template #left> <template #left>
<div style="margin: 1vw"> <!-- 团队下拉框-->
<Form ref="addTeamPeopleData" :model="addTeamPeople.data" :rules="ruleValidate1" :label-width="100"> <!-- <div style="margin: 1vw">-->
<FormItem label="团队名称:" prop="teamid"> <!-- <Form ref="addTeamPeopleData" :model="addTeamPeople.data" :rules="ruleValidate1" :label-width="100">-->
<Select v-model="addTeamPeople.data.teamid" <!-- <FormItem label="团队名称:" prop="teamid">-->
placeholder=""> <!-- <Select v-model="addTeamPeople.data.teamid"-->
<Option v-for="(item,index) in addTeamPeople.selectArray" :key="index" <!-- placeholder="">-->
:value="item.id"> <!-- <Option v-for="(item,index) in addTeamPeople.selectArray" :key="index"-->
{{ item.name }} <!-- :value="item.id">-->
</Option> <!-- {{ item.name }}-->
</Select> <!-- </Option>-->
</FormItem> <!-- </Select>-->
<!-- </FormItem>-->
</Form> <!-- </Form>-->
</div> <!-- </div>-->
<div style="width: 100%;height: 100%;overflow-y: auto"> <div style="width: 100%;height: 100%;overflow-y: auto">
<div style="width: 100%;height: 43%;overflow-y: auto;"> <div style="width: 100%;height: 43%;overflow-y: auto;">
<h3>参赛学生:</h3> <h3>参赛学生:</h3>
...@@ -1498,11 +1497,12 @@ export default { ...@@ -1498,11 +1497,12 @@ export default {
let data = { let data = {
studentid_list: studentid_list, studentid_list: studentid_list,
teacherid_list: teacherid_list, teacherid_list: teacherid_list,
teamid: this.addTeamPeople.data.teamid, // teamid: this.addTeamPeople.data.teamid,
teamid: this.aTeamValue.teamid,
is_lead: this.formValidate3.is_lead, is_lead: this.formValidate3.is_lead,
} }
this.$refs['addTeamPeopleData'].validate((value) => { // this.$refs['addTeamPeopleData'].validate((value) => {
if (value) { // if (value) {
this.miLoad = true this.miLoad = true
hook.myEncapsulationFunction(async () => { hook.myEncapsulationFunction(async () => {
const res = await api.MembersIns(data) const res = await api.MembersIns(data)
...@@ -1516,8 +1516,8 @@ export default { ...@@ -1516,8 +1516,8 @@ export default {
this.miLoad = false this.miLoad = false
return res return res
}) })
} // }
}) // })
}, },
delClass2(e) { delClass2(e) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或