From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:24:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
index e39d63c..344944a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -247,24 +247,24 @@
//1.警情总数
mapa.put("value",alarmCount);
mapa.put("backgroundColor","#F56C6C");
- mapa.put("prefixText","警情总数");
+ mapa.put("prefixText","今日警情总数");
mapa.put("suffixText","条");
//2.包裹总数
mape.put("value",parcelCount.get(0));
mape.put("backgroundColor","#67C23A");
- mape.put("prefixText","包裹总数");
+ mape.put("prefixText","今日违禁包裹总数");
mape.put("suffixText","个");
//3.违禁品总数
maps.put("value",parcelCount.get(1));
- maps.put("backgroundColor","#409EFF");
- maps.put("prefixText","违禁品总数");
+ maps.put("backgroundColor","#E6A23C");
+ maps.put("prefixText","今日违禁物品总数");
maps.put("suffixText","个");
//4.在线设备总数
mapse.put("value",equipmentCount);
- mapse.put("backgroundColor","#E6A23C");
+ mapse.put("backgroundColor","#409EFF");
mapse.put("prefixText","在线设备总数");
mapse.put("suffixText","个");
//数据存入集合
--
Gitblit v1.9.3