diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockDailyTrade.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockDailyTrade.java index 3fc6581..833cbdb 100644 --- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockDailyTrade.java +++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockDailyTrade.java @@ -68,15 +68,15 @@ public class TStockDailyTrade extends BaseEntity private Integer isLimitDown; /** 10日动量(涨跌幅) */ - @Excel(name = "10日动量") + @Excel(name = "10日区间涨跌幅") private BigDecimal momentum10d; /** 20日动量(涨跌幅) */ - @Excel(name = "20日动量") + @Excel(name = "20日区间涨跌幅") private BigDecimal momentum20d; /** 60日动量(涨跌幅) */ - @Excel(name = "60日动量") + @Excel(name = "60日区间涨跌幅") private BigDecimal momentum60d; /** 证券名称(查询时关联获取) */ @@ -97,7 +97,7 @@ public class TStockDailyTrade extends BaseEntity private Date listingDate; /** 上市天数(冗余存储,提升查询效率) */ - @Excel(name = "上市天数") + @Excel(name = "可交易日数") private Integer listingDays; /** 是否为ST股票(1=是,0=否) */ diff --git a/ruoyi-ui/src/views/newstocksystem/stockdata.vue b/ruoyi-ui/src/views/newstocksystem/stockdata.vue index 7b0da85..11ae1f0 100644 --- a/ruoyi-ui/src/views/newstocksystem/stockdata.vue +++ b/ruoyi-ui/src/views/newstocksystem/stockdata.vue @@ -323,7 +323,14 @@ export default { /** 格式化百分比 */ formatPercent(value) { if (value === null || value === undefined) return '-' - return (value * 100).toFixed(2) + '%' + // 如果值大于1或小于-1,认为是百分比形式(如1.23表示1.23%) + // 否则是小数形式(如0.0123表示1.23%) + if (Math.abs(value) > 1) { + return parseFloat(value.toFixed(2)) + '%' + } else { + // return parseFloat((value * 100).toFixed(2)) + '%' + return parseFloat(value.toFixed(4)) + '%' + } }, /** 获取涨跌样式类 */