From 4169a7e4ab2c48b7f48bff38ef1b292159191f3b Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Mon, 4 Mar 2024 17:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cyx/web/base/controller/BigScreenController.java | 2 +- cyx-admin/src/main/resources/templates/main.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java index fd86935..3483afc 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java @@ -170,7 +170,7 @@ public class BigScreenController extends BaseController { array.forEach(a -> { Map m = (Map) a; tradeMap.put(m.get("label").toString(), m.get("label").toString()); - if (month1.contains(month)){ + if (month1.contains(year)){ yearCount.addAndGet(Integer.parseInt(m.get("count").toString())); yearMoney.updateAndGet(v -> v + Double.parseDouble(m.get("trade").toString())); } diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html index aa499a6..c81cc94 100644 --- a/cyx-admin/src/main/resources/templates/main.html +++ b/cyx-admin/src/main/resources/templates/main.html @@ -797,11 +797,11 @@ } var json1 = data.yearTrade; for (let key in json1) { - source.push([key, json1[key], Number(json1[key]).toFixed(4), 'all']) + source.push([key,Number(json1[key]).toFixed(4), Number(json1[key]).toFixed(4), 'year']) } var json2 = data.monTrade; for (let key in json2) { - source.push([key, json2[key], Number(json2[key]).toFixed(4), 'all']) + source.push([key, Number(json2[key]).toFixed(4), Number(json2[key]).toFixed(4), 'mon']) } let option = { title:[