Skip to content

Commit 22ec00d

Browse files
authored
Merge pull request #29 from HdxL0V3/style-fix
调整数据源与部分样式
2 parents 17cd6ff + 5fff4cc commit 22ec00d

File tree

9 files changed

+90
-66
lines changed

9 files changed

+90
-66
lines changed

backend/src/main/java/com/example/backend/entity/Member.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public class Member {
1818
private String atomgitAccount;
1919
private String contactEmail;
2020
private String contactAddress;
21-
private Integer openrankValue;
21+
private Float openrankValue;
22+
private Float lastOpenrank;
2223
private String community;
2324
private Integer activeMonths;
2425
}

backend/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
driver-class-name: com.mysql.cj.jdbc.Driver
88
url: jdbc:mysql://localhost:3306/opentalent?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull
99
username: root
10-
password: rootPassword
10+
password: HDX_sql123
1111

1212
server:
1313
port: 8081

backend/src/main/resources/db/init.sql

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ CREATE TABLE `members` (
4040
atomgit_account VARCHAR(100),
4141
contact_email VARCHAR(255),
4242
contact_address VARCHAR(255),
43-
openrank_value INT,
43+
openrank_value FLOAT,
44+
last_openrank FLOAT,
4445
community VARCHAR(255),
4546
active_months INT,
4647
FOREIGN KEY (organization_id) REFERENCES organizations (organization_id)

frontend/public/favicon.ico

0 Bytes
Binary file not shown.

frontend/src/views/MemberList.vue

+11-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="member-list">
33
<NavMenu></NavMenu>
44
<el-main>
5-
<h2 class="title">成员列表</h2>
5+
<h2 class="title" style="text-align: center;">成员列表</h2>
66
<div class="filters">
77
<el-select
88
v-model="searchQuery"
@@ -259,29 +259,32 @@ export default {
259259
.member-list .filters {
260260
display: flex;
261261
justify-content: center;
262-
width: 30%;
262+
width: 100%;
263263
margin-bottom: 20px;
264264
}
265265
/* 新增样式 */
266-
.el-button--primary {
266+
.member-list .el-button--primary {
267267
color: #fff;
268268
background-color: #131313;
269269
border-color: #131313;
270270
}
271271
272-
.el-button--primary:focus,
273-
.el-button--primary:hover {
272+
.member-list .el-button--primary:focus,
273+
.member-list .el-button--primary:hover {
274274
background: #131313;
275275
border-color: #131313;
276276
color: #fff;
277277
}
278-
.el-table .el-table__row {
278+
.member-list .el-table .el-table__row {
279279
height: 50px; /* 设置固定行高为100px */
280280
line-height: 50px; /* 设置行高为100px */
281281
}
282-
.el-table .even-row,
283-
.el-table .odd-row {
282+
.member-list .el-table .even-row,
283+
.member-list .el-table .odd-row {
284284
height: 50px; /* 确保行高一致为100px */
285285
line-height: 50px; /* 确保行高一致为100px */
286286
}
287+
.member-list .el-table th {
288+
color: #000; /* 设置表头字体颜色为黑色 */
289+
}
287290
</style>

frontend/src/views/MemberRegister.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
<el-row justify="center">
8383
<el-col :span="24" class="button-group">
84-
<el-button type="primary" plain v-on:click="goToOrgRegister">返回</el-button>
84+
<!-- <el-button type="primary" plain v-on:click="goToOrgRegister">返回</el-button> -->
8585
<el-button type="primary" v-on:click="submitForm">完成注册</el-button>
8686
</el-col>
8787
</el-row>

frontend/src/views/OrgRankList.vue

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
2-
<div class="rank-list">
2+
<div class="org-rank-list">
33
<!-- Header -->
44
<NavMenu></NavMenu>
55

66
<!-- Main Content -->
77
<div>
88
<el-main>
9-
<h2 class="title">组织贡献度排行榜</h2>
9+
<h2 class="title" style="font-size: 24px; margin-bottom: 30px;">高校贡献度排行榜</h2>
1010
<div style="margin: 0 30px">
1111
<el-table
1212
:row-class-name="tableRowClassName"
@@ -209,18 +209,18 @@ export default {
209209

210210

211211
<style>
212-
.rank-list {
212+
.org-rank-list {
213213
justify-content: center; /* 水平居中 */
214214
text-align: center;
215215
216216
}
217217
218-
.rank-list .title{
218+
.org-rank-list .title{
219219
color: #ACC5DB;
220220
margin: 0 auto;
221221
}
222222
223-
.rank-list .el-main{
223+
.org-rank-list .el-main{
224224
display: inline-block;
225225
background-color: #111E33; /* 深蓝色背景 */
226226
border-radius: 15px; /* 圆角半径 */
@@ -256,7 +256,7 @@ export default {
256256
width: 100%; /* 确保主内容占满宽度 */
257257
}
258258
259-
.filters {
259+
.org-rank-list .filters {
260260
display: flex;
261261
justify-content: center; /* 使过滤按钮居中 */
262262
text-align: center;
@@ -341,27 +341,27 @@ export default {
341341
background-color: #111E33 !important;
342342
}
343343
344-
.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
344+
.org-rank-list .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
345345
border-bottom: 1px solid #FFF;
346346
}
347347
348-
.el-table .even-row {
348+
.org-rank-list .el-table .even-row {
349349
background-color:#213046 !important;
350350
color: #FFF;
351351
font-size: 16px;
352352
height: 50px; /* 添加固定行高 */
353353
line-height: 50px; /* 添加行高 */
354354
}
355355
356-
.el-table .odd-row {
356+
.org-rank-list .el-table .odd-row {
357357
background-color:#111E33 !important;
358358
color: #FFF;
359359
font-size: 16px;
360360
height: 50px; /* 添加固定行高 */
361361
line-height: 50px; /* 添加行高 */
362362
}
363363
364-
.el-table tbody tr:hover>td {
364+
.org-rank-list .el-table tbody tr:hover>td {
365365
background-color: transparent !important;
366366
}
367367
</style>

frontend/src/views/OrgRegister.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<el-col :span="24">
4545
<el-form-item label="平台权重">
4646
<el-radio-group v-model="form.category2">
47-
<el-radio label="全球化模式:1:1:1">全球化模式(GitHub,GItee,Atomgit):1:1:1</el-radio>
48-
<el-radio label="中国优先模式:2:2:1">中国优先模式(Gitee,Atomgit,GItHub):2:2:1</el-radio>
47+
<el-radio label="全球化模式:1:1:1" style="margin-bottom: 10px;">全球化模式(GitHub,GItee,Atomgit):1:1:1</el-radio>
48+
<el-radio label="中国优先模式:2:2:1" style="margin-bottom: 10px;">中国优先模式(Gitee,Atomgit,GItHub):2:2:1</el-radio>
4949
<el-radio label="基金会优先模式:5:3:2">基金会优先模式(Atomgit, Gitee, GitHub):5:3:2</el-radio>
5050
</el-radio-group>
5151
</el-form-item>
@@ -85,7 +85,7 @@
8585

8686
<el-row justify="center">
8787
<el-col :span="24" class="button-group">
88-
<el-button type="primary" plain>返回</el-button>
88+
<!-- <el-button type="primary" plain>返回</el-button> -->
8989
<!-- <el-button type="primary" native-type="submit">完成注册</el-button> -->
9090
<el-button type="primary" v-on:click="submitForm">完成注册</el-button>
9191
</el-col>

0 commit comments

Comments
 (0)