From 1bf104b7d4f527d6c78ab54605f9600a3747b649 Mon Sep 17 00:00:00 2001 From: tianea Date: Tue, 27 Sep 2022 20:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/competition/components/ranking.vue | 10 +- .../competition/components/tradeRecord.vue | 22 +- front/src/views/competition/ranking.vue | 240 +++++++++++++----- .../competitiion/api/dto/CompetitionDTO.java | 1 + .../api/dto/MemberRankingDTO.java | 2 + .../pc/MarketNotePcController.java | 2 + .../platform/system/api/SystemController.java | 12 + .../tz/platform/system/pc/biz/GradeBiz.java | 7 + 8 files changed, 226 insertions(+), 70 deletions(-) diff --git a/backend/src/views/competition/components/ranking.vue b/backend/src/views/competition/components/ranking.vue index 974ff1a..475de1f 100644 --- a/backend/src/views/competition/components/ranking.vue +++ b/backend/src/views/competition/components/ranking.vue @@ -16,6 +16,7 @@ border fit highlight-current-row + style="font-size:12px;" > - + @@ -233,7 +234,7 @@ export default { this.downloadLoading = true import('@/vendor/Export2Excel').then(excel => { const tHeader = ['用户名', '班级', '所属团队', '收益率折算分', '排名',"期初资金","总资产",'可用资金','市值','累计盈亏','浮动盈亏','累计手续费','累计收益率','基准收益率(沪深300)','年化收益率','最大回测','卡玛比率','夏普比率','开他次数','平仓次数'] - const filterVal = ['name', 'className', 'teamName', 'financeScore', 'personalRank',"initFounds","nav",'available','marketValue','profitLoss','fpnl','baseRatio','pnlRatioAnnual','maxDrawdown','calmarRatio','sharpRatio','openCount','closeCount'] + const filterVal = ['name', 'className', 'teamName', 'financeScore', 'personalRank',"initFounds","nav",'available','marketValue','profitLoss','fpnl','cumCommission','pnlRatio','baseRatio','pnlRatioAnnual','maxDrawdown','calmarRatio','sharpRatio','openCount','closeCount'] const list = this.list const data = this.formatJson(filterVal, list) console.log(data) @@ -308,7 +309,8 @@ export default { .tz-line button{ margin-left: 10px; } - .el-dialog { + div .el-dialog { width: 80% !important; + font-size: 12px !important; } diff --git a/backend/src/views/competition/components/tradeRecord.vue b/backend/src/views/competition/components/tradeRecord.vue index 80ffc94..62857d8 100644 --- a/backend/src/views/competition/components/tradeRecord.vue +++ b/backend/src/views/competition/components/tradeRecord.vue @@ -1,5 +1,5 @@