Browse Source

调整公示样式 && 上传限制100MB

XW 1 year ago
parent
commit
4b00157ba9

+ 43 - 2
Contest/contest.client/src/view/activitylist/ActivityInfo.less

@@ -14,6 +14,7 @@
         &>div:first-of-type {
             cursor: pointer;
             display: flex;
+
             .el-icon {
                 margin-right: 5px;
             }
@@ -33,6 +34,7 @@
             border-radius: 5px;
             margin-right: 5px;
         }
+
         .join-btn {
             background: #67C23A;
             color: #fff;
@@ -55,7 +57,7 @@
         padding: 20px 0;
         font-size: 16px;
 
-        
+
 
         .img-box {
             // height: 500px;
@@ -108,7 +110,7 @@
                     &>p {
                         margin-bottom: 15px;
                     }
-                    
+
                     .attach-name {
                         cursor: pointer;
                         margin-bottom: 10px;
@@ -157,6 +159,45 @@
                             }
                         }
                     }
+
+                    .score-table {
+
+                        // padding-top: 20px;
+                        // margin: 20px 0;
+                        // border-top: 1px dashed #ccc;
+                        display: flex;
+                        justify-content: center;
+
+                        &>div {
+                            text-align: center;
+                            padding: 0 20px;
+                            margin-top: 10px;
+
+                            &:last-of-type {
+                                border: none;
+                            }
+                        }
+
+                        .score-lable {
+                            margin-bottom: 10px;
+
+                            &>p {
+                                margin-bottom: 10px;
+                            }
+                        }
+
+                        .score-info {
+                            display: flex;
+                            flex-wrap: wrap;
+                            justify-content: center;
+
+                            &>div {
+                                text-align: center;
+                                margin: 5px 10px;
+                                min-width: 85px;
+                            }
+                        }
+                    }
                 }
             }
         }

+ 25 - 1
Contest/contest.client/src/view/activitylist/ActivityInfo.vue

@@ -70,7 +70,7 @@
                                             </template>
                                         </el-step>
                                     </el-steps>
-                                    <div v-if="contestScores.length && contest.score.scoreStatus" class="score-box">
+                                    <!-- <div v-if="contestScores.length && contest.score.scoreStatus" class="score-box">
                                         <div v-for="(item, index) in contestScores" :key="index">
                                             <div class="score-lable" v-show="contest.score.showType">
                                                 <p>{{ item.lable }}</p>
@@ -85,6 +85,30 @@
                                                 </div>
                                             </div>
                                         </div>
+                                    </div> -->
+                                    <div v-if="contestScores.length && contest.score.scoreStatus" style="margin-top: 20px;">
+                                        <el-table :data="contestScores" style="width: 100%">
+                                            <el-table-column prop="lable" label="奖项名称" align="center" width="200">
+                                                <template #default="scope">
+                                                    <p>{{ scope.row.lable }}</p>
+                                                    <p>
+                                                        <el-icon color="#ffd111" size="18" v-for="scores in scope.row.scores" :key="scores.tmdid"><Trophy /></el-icon>
+                                                    </p>
+                                                </template>
+                                            </el-table-column>
+                                            <el-table-column label="获奖人员" align="center">
+                                                <template #default="scope">
+                                                    <div class="score-table">
+                                                        <div v-for="scores in scope.row.scores" :key="scores.tmdid">
+                                                            <el-avatar :size="35" :src="scores.picture" />
+                                                            <p style="font-size: 14px; margin-top: 5px;">
+                                                                {{ scores.type ? scores.teamName : scores.name }}({{ scores.score }}分)
+                                                            </p>
+                                                        </div>
+                                                    </div>
+                                                </template>
+                                            </el-table-column>
+                                        </el-table>
                                     </div>
                                 </div>
                             </div>

+ 2 - 2
Contest/contest.client/src/view/myactivity/MyActivity.vue

@@ -646,10 +646,10 @@ function handleChange(file, files) {
         files.splice(fileList.value.length, 1)
         return
     }
-    if(file.size > 20 * 1024 * 1024) {
+    if(file.size > 100 * 1024 * 1024) {
         ElMessage({
             type: 'warning',
-            message: '文件大小不能超过20MB!'
+            message: '文件大小不能超过100MB!'
         })
         files.splice(fileList.value.length, 1)
         return