From c11112b06678a00ee21858f5964aabd651780d08 Mon Sep 17 00:00:00 2001 From: Rue Ji Date: Tue, 31 Mar 2026 15:49:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B9=B6=E6=9B=B4=E6=96=B0GIS=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/MaintenancePlanController.java | 4 +- .../jsp/equipment/equipmentCardList.jsp | 6 +-- .../jsp/equipment/maintenancePlanHandle.jsp | 41 ++++++++++++++++++- src/main/webapp/jsp/sparepart/sewageList.jsp | 4 +- .../webapp/jsp/visual/newSourceGISPage.jsp | 8 ++-- 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java b/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java index eef91244..075a646b 100644 --- a/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java +++ b/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java @@ -356,7 +356,9 @@ public class MaintenancePlanController { model.addAttribute("nowDate", CommUtil.nowDate()); String maintenancePlanId = pInstance.getBusinessKey(); List list = this.businessUnitAuditService.selectListByWhere("where businessId = '" + maintenancePlanId + "' order by insdt desc "); - model.addAttribute("businessUnitAudit", list.get(0)); + if (list != null && list.size() > 0) { + model.addAttribute("businessUnitAudit", list.get(0)); + } MaintenancePlan maintenancePlan = this.maintenancePlanService.selectById(maintenancePlanId); model.addAttribute("maintenancePlan", maintenancePlan); EquipmentPlan equipmentPlan = this.equipmentPlanService.selectById(maintenancePlanId); diff --git a/src/main/webapp/jsp/equipment/equipmentCardList.jsp b/src/main/webapp/jsp/equipment/equipmentCardList.jsp index 9d528ead..2d0acf2c 100644 --- a/src/main/webapp/jsp/equipment/equipmentCardList.jsp +++ b/src/main/webapp/jsp/equipment/equipmentCardList.jsp @@ -141,9 +141,9 @@ formatter: function (value, row, index) { var buts = ""; - buts += ''; - buts += ''; - buts += ''; + // buts += ''; + // buts += ''; + // buts += ''; buts += ''; buts += ''; diff --git a/src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp b/src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp index 55b33328..eaa71ae4 100644 --- a/src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp +++ b/src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp @@ -47,7 +47,7 @@ $("#subForm").bootstrapValidator('validate');//提交验证 //setTimeout(function(){ if ($("#subForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码 - $.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) { + $.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) { if (data.res == 1){ $("#table").bootstrapTable('refresh'); closeModal("subModal"); @@ -70,7 +70,7 @@ $("#subUnitForm").bootstrapValidator('validate');//提交验证 //setTimeout(function(){ if ($("#subForm").data('bootstrapValidator').isValid() && $("#subUnitForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码 - $.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) { + $.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) { var routeNum = $("#routeNum").val(); if (data.res == 1){ $.post(ext.contextPath + "/equipment/maintenancePlan/submitAuditAgain.do", $("#subUnitForm").serialize()+"&routeNum="+routeNum, function(unitdata) { @@ -426,6 +426,43 @@
--%> + +
+ + + + + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+ +
+ +
+
+

关联设备

diff --git a/src/main/webapp/jsp/sparepart/sewageList.jsp b/src/main/webapp/jsp/sparepart/sewageList.jsp index 81552407..f4764e26 100644 --- a/src/main/webapp/jsp/sparepart/sewageList.jsp +++ b/src/main/webapp/jsp/sparepart/sewageList.jsp @@ -354,7 +354,9 @@ var buts= ''; buts+= ''; buts+= ''; - buts+= ''; + + // buts+= ''; + buts+= ''; buts+= ''; buts+= ''; diff --git a/src/main/webapp/jsp/visual/newSourceGISPage.jsp b/src/main/webapp/jsp/visual/newSourceGISPage.jsp index c575f295..5e65a711 100644 --- a/src/main/webapp/jsp/visual/newSourceGISPage.jsp +++ b/src/main/webapp/jsp/visual/newSourceGISPage.jsp @@ -1116,12 +1116,12 @@ pageEncoding="UTF-8"%> // 泵站名称到经纬度的映射 lngLatMap: { '卫八路泵站': { lng: 121.277502, lat: 30.720661 }, - '春华泵站': { lng: 121.287567, lat: 30.727986 }, - '九号泵站': { lng: 121.286513, lat: 30.716669 } + '春华路泵站': { lng: 121.287567, lat: 30.727986 }, + '九号泵站': { lng: 121.286513, lat: 30.716669 }, }, transform: function(item, idx) { var name = item.text || item.name || ''; - var lngLat = this.lngLatMap[name] || { lng: 121.32 + idx * 0.01, lat: 30.76 - idx * 0.005 }; + var lngLat = this.lngLatMap[name] ? this.lngLatMap[name] : { lng: 121.32 + idx * 0.01, lat: 30.76 - idx * 0.005 }; return { id: item.id || 'pump_' + idx, name: name, @@ -1605,7 +1605,7 @@ pageEncoding="UTF-8"%> var item = dataConfig.company.data[index]; if (!item || !item.lng || !item.lat) return; map.panTo(new T.LngLat(item.lng, item.lat)); - map.setZoom(15); + map.setZoom(16); selectMarker(item.name, 'company'); }