diff --git a/hoj-vue/src/common/constants.js b/hoj-vue/src/common/constants.js index 9b72e315..f036aa74 100644 --- a/hoj-vue/src/common/constants.js +++ b/hoj-vue/src/common/constants.js @@ -130,15 +130,15 @@ export const JUDGE_STATUS_RESERVE={ export const PROBLEM_LEVEL={ '0':{ name:'Easy', - color:'green' + color:'#19be6b' }, '1':{ name:'Mid', - color:'blue' + color:'#2d8cf0' }, '2':{ name:'Hard', - color:'red' + color:'#ed3f14' } } diff --git a/hoj-vue/src/i18n/admin/en-US.js b/hoj-vue/src/i18n/admin/en-US.js index 3a91df1e..53d56791 100644 --- a/hoj-vue/src/i18n/admin/en-US.js +++ b/hoj-vue/src/i18n/admin/en-US.js @@ -123,6 +123,7 @@ export const m = { // /views/admin/problem/ProblemList.vue Contest_Problem_List: 'Contest Problem List', + Display_ID:'Display ID', Add_Rmote_OJ_Problem:'Add Remote OJ Problem', Add_From_Public_Problem:'Add From Public Problem', Auth:'Auth', diff --git a/hoj-vue/src/i18n/admin/zh-CN.js b/hoj-vue/src/i18n/admin/zh-CN.js index b2694c1f..87432d07 100644 --- a/hoj-vue/src/i18n/admin/zh-CN.js +++ b/hoj-vue/src/i18n/admin/zh-CN.js @@ -123,6 +123,7 @@ export const m = { // /views/admin/problem/ProblemList.vue Contest_Problem_List: '比赛题目列表', + Display_ID:'展示ID', Add_Rmote_OJ_Problem:'添加远程OJ题目', Add_From_Public_Problem:'从公共题库添加题目', Auth:'权限', diff --git a/hoj-vue/src/store/contest.js b/hoj-vue/src/store/contest.js index d94878a0..4ff4c950 100644 --- a/hoj-vue/src/store/contest.js +++ b/hoj-vue/src/store/contest.js @@ -1,6 +1,6 @@ import moment from 'moment' import api from '@/common/api' -import { CONTEST_STATUS, USER_TYPE, CONTEST_TYPE } from '@/common/constants' +import { CONTEST_STATUS, CONTEST_TYPE } from '@/common/constants' import time from '@/common/time' const state = { now: moment(), diff --git a/hoj-vue/src/store/index.js b/hoj-vue/src/store/index.js index a7421aa9..3148a6f6 100644 --- a/hoj-vue/src/store/index.js +++ b/hoj-vue/src/store/index.js @@ -13,9 +13,9 @@ const rootState = { visible: false }, websiteConfig:{ - recordName:'粤ICP备×××××××号-1', + recordName:'© 2020-2021', projectName:'HOJ', - shortName:'HOJ', + shortName:'OJ', recordUrl:'#', projectUrl:'#' }, diff --git a/hoj-vue/src/views/admin/Home.vue b/hoj-vue/src/views/admin/Home.vue index b025ed4d..5891a96c 100644 --- a/hoj-vue/src/views/admin/Home.vue +++ b/hoj-vue/src/views/admin/Home.vue @@ -516,7 +516,7 @@ img { font-weight: 400; height: 100%; -webkit-font-smoothing: antialiased; - background-color: #edecec; + background-color: #eff3f5; overflow-y: auto; } .breadcrumb-container { diff --git a/hoj-vue/src/views/admin/problem/ProblemList.vue b/hoj-vue/src/views/admin/problem/ProblemList.vue index 0902eb3a..f5d2dfa2 100644 --- a/hoj-vue/src/views/admin/problem/ProblemList.vue +++ b/hoj-vue/src/views/admin/problem/ProblemList.vue @@ -54,7 +54,13 @@ @row-dblclick="handleDblclick" align="center" > - + + + diff --git a/hoj-vue/src/views/oj/discussion/discussionList.vue b/hoj-vue/src/views/oj/discussion/discussionList.vue index 65a1e6f7..2578c301 100644 --- a/hoj-vue/src/views/oj/discussion/discussionList.vue +++ b/hoj-vue/src/views/oj/discussion/discussionList.vue @@ -468,6 +468,11 @@ export default { }); }, + changeRoute(page) { + this.query.currentPage = page; + this.getDiscussionList(); + }, + getInfoByUsername(uid, username) { this.$router.push({ path: '/user-home', diff --git a/hoj-vue/src/views/oj/problem/ProblemList.vue b/hoj-vue/src/views/oj/problem/ProblemList.vue index b77255a2..ad6c4597 100644 --- a/hoj-vue/src/views/oj/problem/ProblemList.vue +++ b/hoj-vue/src/views/oj/problem/ProblemList.vue @@ -164,9 +164,11 @@ min-width="100" > @@ -515,7 +517,11 @@ export default { }); }, getLevelColor(difficulty) { - return 'el-tag el-tag--small status-' + PROBLEM_LEVEL[difficulty].color; + return ( + 'color: #fff !important;background-color:' + + PROBLEM_LEVEL[difficulty].color + + ' !important;' + ); }, getIconColor(status) { return (