From 166796169cf5e4e6a9aafe05886fdc691905bb2a Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Thu, 27 Nov 2025 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/applet/controller/WxAppletController.java | 2 +- .../org/jeecg/common/constant/enums/PollutionEnum.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java index 44423ab..dc44ef2 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java @@ -1195,7 +1195,7 @@ public class WxAppletController { Page page = new Page(pageNo, pageSize); IPage pages = vocsService.getPageResentData(page, stinkList); return R.ok(pages); - }else if (PollutionConstants.SOIL_SURV.equals(pollutionEnum.getType()) && !waterList.isEmpty()) {//水质 + }else if (PollutionConstants.WATER_QULITY.equals(pollutionEnum.getType()) && !waterList.isEmpty()) {//水质 Page page = new Page(pageNo, pageSize); IPage pages = hisdataSoilService.getPageResentData(page, waterList); return R.ok(pages); diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java index e7bc1e0..14a0fee 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java @@ -83,11 +83,11 @@ public enum PollutionEnum { dataSoilCdion("dataSoilCdion", "土壤镉离子", "ppm", "sys/icon/zhandian_icon_cd-.png", "soil", "#92D1F5", "sys/mobile/icon/zhandian_icon_cd-.png", "sys/bs/icon/zhandian_icon_cd-.png", "zhandian_icon_cd-.png"), //20251122 新增五常 - dataWaterNtu("dataWaterNtu", "浊度", "ntu", "sys/icon/shebei_icon_ntu.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_ntu.png", "sys/bs/icon/shebei_icon_nto.png", "shebei_icon_nto.png"), - dataWaterDo("dataWaterDo", "溶解氧", "mg/L", "sys/icon/shebei_icon_do.png", "waterq", "#92D0F5", "sys/mobile/icon/shebei_icon_do.png", "sys/bs/icon/shebei_icon_do.png", "shebei_icon_do.png"), - dataWaterPh("dataWaterPh", "pH", "℃", "sys/icon/shebei_icon_waterph.png", "waterq", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"), - dataWaterTemp("dataWaterTemp", "水温", "℃", "sys/icon/shebei_icon_watertemp.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_watertemp.png", "sys/bs/icon/shebei_icon_watertemp.png", "shebei_icon_watertemp.png"), - dataWaterDdl("dataWaterDdl", "电导率", "℃", "sys/icon/shebei_icon_waterddl.png", "waterq", "#92D0F3", "sys/mobile/icon/shebei_icon_waterddl.png", "sys/bs/icon/shebei_icon_waterddl.png", "shebei_icon_waterddl.png"), + dataWaterNtu("dataWaterNtu", "浊度", "ntu", "sys/icon/shebei_icon_ntu.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_ntu.png", "sys/bs/icon/shebei_icon_nto.png", "shebei_icon_nto.png"), + dataWaterDo("dataWaterDo", "溶解氧", "mg/L", "sys/icon/shebei_icon_do.png", "6_water", "#92D0F5", "sys/mobile/icon/shebei_icon_do.png", "sys/bs/icon/shebei_icon_do.png", "shebei_icon_do.png"), + dataWaterPh("dataWaterPh", "pH", "℃", "sys/icon/shebei_icon_waterph.png", "6_water", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"), + dataWaterTemp("dataWaterTemp", "水温", "℃", "sys/icon/shebei_icon_watertemp.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_watertemp.png", "sys/bs/icon/shebei_icon_watertemp.png", "shebei_icon_watertemp.png"), + dataWaterDdl("dataWaterDdl", "电导率", "℃", "sys/icon/shebei_icon_waterddl.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_waterddl.png", "sys/bs/icon/shebei_icon_waterddl.png", "shebei_icon_waterddl.png"), dataWaterTp("dataWaterTp", "总磷", "mg/L", "sys/icon/shebei_icon_tp.png", "water", "#C8CC00", "sys/mobile/icon/shebei_icon_tp.png", "sys/bs/icon/shebei_icon_tp.png", "shebei_icon_tp.png"),