修改单位

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -318,7 +318,7 @@ public class MonitorFanIdxController extends BaseController {
             map.put("title", columnMap.get(key) == null ? 0.00 : columnMap.get(key));
             map.put("title2", map.get("title"));
             if (map.containsKey("action")) {
-                if (key.equals("日利用小时")) {
+                if (key.equals("日利用小时(h)")) {
                     String format = String.format("%.2f", ((Double.parseDouble(columnMap.get("日发电量").toString()) * 10) / (Double.parseDouble(columnMap.get("装机容量").toString()))));
                     map.put("title", format);
                     map.put("title2", map.get("title"));
@@ -742,9 +742,9 @@ public class MonitorFanIdxController extends BaseController {
         for (Map map : list) {
             String key = map.get("title").toString();
             if (map.containsKey("action")) {
-                if (key.equals("日利用小时")) {
+                if (key.equals("日利用小时(h)")) {
                     map.put("title", String.format("%.2f", ((Double.parseDouble(columnMap.get("日发电量").toString()) * CommonConstans.wkwhToMv) / (Double.parseDouble(columnMap.get("装机容量").toString())))));
-                    columnMap.put("日利用小时", map.get("title"));
+                    columnMap.put("日利用小时(h)", map.get("title"));
                     map.put("title2", map.get("title"));
                 } else {
                     map.put("title", map.get("action").toString().replace("*", columnMap.get(key).toString()));

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overview.json

@@ -35,8 +35,8 @@
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
   },
   {
-    "title": "日利用小时",
-    "title1": "日利用小时",
+    "title": "日利用小时(h)",
+    "title1": "日利用小时(h)",
     "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
   },

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overviewGF.json

@@ -51,8 +51,8 @@
     "url": "upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png"
   },
   {
-    "title": "日利用小时",
-    "title1": "日利用小时",
+    "title": "日利用小时(h)",
+    "title1": "日利用小时(h)",
     "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
   }