osredm_test
/
osredm-comp-custom
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

!18 1 

Merge pull request !18 from Sky_ID/zql
This commit is contained in:
Sky_ID 2022-06-20 01:57:36 +00:00 committed by Gitee
parent c828a5c160 4a492ce78f
commit 5c95f44e05
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 63 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/css/common.css
View File

@ -42,7 +42,7 @@
/* 卡片内容 */
.card {
width: 66vw;
width: 72vw;
background-color: white;
box-shadow: 0px 4px 10px 0 rgba(0,0,0,0.15);
margin-bottom: 3vw;

BIN
src/assets/logo/rank_one.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
src/assets/logo/rank_three.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
src/assets/logo/rank_two.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

14
src/pages/Apply/Apply.vue
View File

@ -338,7 +338,7 @@ export default {
<style scoped>
.steps {
position: relative;
width: 64vw;
width: 70vw;
margin: 3vw 0vw;
}
.steps-tip {
@ -349,13 +349,13 @@ export default {
border-left: 4px solid blue;
}
.steps-steps {
width: 40vw;
width: 50vw;
margin: auto;
background: white;
}
.apply-tip {
width: 64vw;
width: 70vw;
background-color: #fff5eb;
border: 1px solid #ffa13a;
color: #ffa13a;
@ -370,7 +370,7 @@ export default {
text-align: left;
}
.apply-form {
padding: 8px 0 30px 30px;
padding: 10px 0 30px 30px;
text-align: left;
}
.apply-form >>> .el-form-item__label {
@ -379,7 +379,7 @@ export default {
.apply-form-item {
position: relative;
float: left;
width: 38%;
width: 40%;
margin-right: 7vw;
}
.apply-form-select {
@ -390,11 +390,11 @@ export default {
.apply-form-radio {
position: absolute;
left: 11vw;
top: -2.5vw;
top: -1.75vw;
}
.apply-table {
width: 92%;
width: 95%;
height: auto;
}
.apply-table-item {

82
src/pages/Data/Rank.vue
View File

@ -16,22 +16,22 @@
class="applyList-table"
>
<el-table-column type="index" label="排名" align="center" :width="width1">
<el-table-column type="index" label="排名" align="center" :min-width="width1">
<template slot-scope="scope">
<span v-if="scope.$index + 1 == 1" class="rankLogo1"><img src="@/assets/logo/rank_one.png" /></span>
<span v-else-if="scope.$index + 1 == 2" class="rankLogo2"><img src="@/assets/logo/rank_two.png" /></span>
<span v-else-if="scope.$index + 1 == 3" class="rankLogo3"><img src="@/assets/logo/rank_three.png" /></span>
<span v-if="scope.$index + 1 == 1" class="rankLogo"><img src="@/assets/logo/rank_one.png" /></span>
<span v-else-if="scope.$index + 1 == 2" class="rankLogo"><img src="@/assets/logo/rank_two.png" /></span>
<span v-else-if="scope.$index + 1 == 3" class="rankLogo"><img src="@/assets/logo/rank_three.png" /></span>
<span v-else>{{ scope.$index+1 }} </span>
</template>
</el-table-column>
<el-table-column prop="team_name" label="团队名称" align="center" :width="width2"></el-table-column>
<el-table-column prop="team_caption" label="队长" align="center" :width="width3"></el-table-column>
<el-table-column prop="company" label="所属单位" align="center" :width="width4"></el-table-column>
<el-table-column prop="kind" label="参赛领域" align="center" :width="width5"></el-table-column>
<el-table-column prop="division" label="参赛赛区" align="center" :width="width6"></el-table-column>
<el-table-column prop="score_one" label="得分一" align="center" :width="width7"></el-table-column>
<el-table-column prop="score_two" label="得分二" align="center" :width="width8" v-if="width8If"></el-table-column>
<el-table-column prop="score_three" label="得分三" align="center" :width="width9" v-if="width9If"></el-table-column>
<el-table-column prop="team_name" label="团队名称" align="center" :min-width="width2"></el-table-column>
<el-table-column prop="team_caption" label="队长" align="center" :min-width="width3"></el-table-column>
<el-table-column prop="company" label="所属单位" align="center" :min-width="width4"></el-table-column>
<el-table-column prop="kind" label="参赛领域" align="center" :min-width="width5"></el-table-column>
<el-table-column prop="division" label="参赛赛区" align="center" :min-width="width6"></el-table-column>
<el-table-column prop="score_one" label="得分一" align="center" :min-width="width7"></el-table-column>
<el-table-column prop="score_two" label="得分二" align="center" :min-width="width8" v-if="width8If"></el-table-column>
<el-table-column prop="score_three" label="得分三" align="center" :min-width="width9" v-if="width9If"></el-table-column>
</el-table>
@ -92,36 +92,36 @@ export default {
console.log("222"+var2);
console.log("333"+var3);
if ( var1 != null && var2 != null && var3 != null ){
this.width1 = "80";
this.width2 = "150";
this.width3 = "150";
this.width4 = "200";
this.width5 = "100";
this.width6 = "120";
this.width7 = "100";
this.width8 = "100";
this.width9 = "100";
this.width1 = "10%";
this.width2 = "12%";
this.width3 = "12%";
this.width4 = "12%";
this.width5 = "10%";
this.width6 = "10%";
this.width7 = "8%";
this.width8 = "8%";
this.width9 = "8%";
this.width8If = true;
this.width9If = true;
}else if ( var1 != null && var2 != null && var3 == null ){
this.width1 = "100";
this.width2 = "160";
this.width3 = "160";
this.width4 = "220";
this.width5 = "110";
this.width6 = "130";
this.width7 = "110";
this.width8 = "110";
this.width1 = "10%";
this.width2 = "12%";
this.width3 = "12%";
this.width4 = "12%";
this.width5 = "10%";
this.width6 = "10%";
this.width7 = "8%";
this.width8 = "8%";
this.width8If = true;
this.width9If = false;
}else if ( var1 != null && var2 == null && var3 == null ){
this.width1 = "100";
this.width2 = "180";
this.width3 = "180";
this.width4 = "230";
this.width5 = "130";
this.width6 = "150";
this.width7 = "130";
this.width1 = "10%";
this.width2 = "12%";
this.width3 = "12%";
this.width4 = "12%";
this.width5 = "10%";
this.width6 = "10%";
this.width7 = "8%";
this.width8If = false;
this.width9If = false;
}else {
@ -269,15 +269,7 @@ export default {
width: 100%;
height: 700px;
}
.rankLogo1 img {
width: 3vw;
height: 3vw;
}
.rankLogo2 img {
width: 2.5vw;
height: 2.5vw;
}
.rankLogo3 img {
.rankLogo img {
width: 2vw;
height: 2vw;
}

2
src/pages/Guide/Guide.vue
View File

@ -18,7 +18,7 @@
<script>
import pageUtils from "@/utils/pageUtils";
import {Message} from "element-ui";
import { Message } from "element-ui";
export default {
name: "Guide",

18
src/pages/Manage/ApplyList.vue
View File

@ -58,14 +58,14 @@
class="applyList-table"
>
<el-table-column type="index" label="序号" align="center" width="50"> </el-table-column> <!-- 显示序号 -->
<el-table-column prop="company" label="参赛单位" align="center" width="120"></el-table-column>
<el-table-column prop="charge" label="参赛负责人" align="center" width="120"></el-table-column>
<el-table-column prop="telephone" label="电话" align="center" width="120"></el-table-column>
<el-table-column prop="division" label="赛区" align="center" width="100"></el-table-column>
<el-table-column prop="kind" label="赛项" align="center" width="100"></el-table-column>
<el-table-column type="index" label="序号" align="center" min-width="5%"> </el-table-column>
<el-table-column prop="company" label="参赛单位" align="center" min-width="8%"></el-table-column>
<el-table-column prop="charge" label="参赛负责人" align="center" min-width="8%"></el-table-column>
<el-table-column prop="telephone" label="电话" align="center" min-width="8%"></el-table-column>
<el-table-column prop="division" label="赛区" align="center" min-width="7%"></el-table-column>
<el-table-column prop="kind" label="赛项" align="center" min-width="6%"></el-table-column>
<el-table-column prop="member" label="成员" align="center" width="100">
<el-table-column prop="member" label="成员" align="center" min-width="8%">
<template slot-scope="scope">
<div>
<el-button type="text" @click="toogleExpand(scope.row)">
@ -94,14 +94,14 @@
</template>
</el-table-column>
<el-table-column prop="file" label="报名文件" align="center" width="150">
<el-table-column prop="file" label="报名文件" align="center" min-width="12%">
<template slot-scope="scope">
<el-tooltip effect="dark" :content="scope.row.file" placement="top-start">
<a :href="applyFilterUrl" class="apply-file-url">{{ scope.row.file }}</a>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" >
<el-table-column label="操作" min-width="10%" align="center" >
<template slot-scope="scope"> <!-- 作用域插槽 -->
<el-button @click="rejectRow(scope.$index)" size="small">驳回</el-button>
<el-button @click.native.prevent="deleteRow(scope.$index, scope.row);" type="danger" size="small">删除</el-button>

16
src/pages/Manage/SubmitList.vue
View File

@ -56,20 +56,20 @@
class="applyList-table"
>
<el-table-column type="index" label="序号" align="center" width="50"> </el-table-column> <!-- 显示序号 -->
<el-table-column prop="company" label="参赛单位" align="center" width="120"></el-table-column>
<el-table-column prop="charge" label="参赛负责人" align="center" width="120"></el-table-column>
<el-table-column prop="telephone" label="电话" align="center" width="120"></el-table-column>
<el-table-column prop="division" label="赛区" align="center" width="100"></el-table-column>
<el-table-column prop="kind" label="赛项" align="center" width="100"></el-table-column>
<el-table-column prop="file" label="作品文件" align="center" width="250">
<el-table-column type="index" label="序号" align="center" min-width="5%"> </el-table-column>
<el-table-column prop="company" label="参赛单位" align="center" min-width="10%"></el-table-column>
<el-table-column prop="charge" label="参赛负责人" align="center" min-width="10%"></el-table-column>
<el-table-column prop="telephone" label="电话" align="center" min-width="10%"></el-table-column>
<el-table-column prop="division" label="赛区" align="center" min-width="9%"></el-table-column>
<el-table-column prop="kind" label="赛项" align="center" min-width="8%"></el-table-column>
<el-table-column prop="file" label="作品文件" align="center" min-width="14%">
<template slot-scope="scope">
<el-tooltip effect="dark" :content="scope.row.file" placement="top-start">
<a :href="submitFilterUrl" class="apply-file-url">{{ scope.row.file }}</a>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" >
<el-table-column label="操作" align="center" min-width="10%">
<template slot-scope="scope"> <!-- 作用域插槽 -->
<el-button @click="rejectRow(scope.$index)" size="small">驳回</el-button>
<el-button @click.native.prevent="deleteRow(scope.$index, scope.row);" type="danger" size="small">删除</el-button>