From 4ca5d82ac031c64d331aab0177b540118dce4f7e Mon Sep 17 00:00:00 2001 From: Timer <@> Date: Wed, 11 Mar 2026 00:13:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/timeefficiency/patrolPointEdit.jsp | 65 ++++++++++--------- .../jsp/timeefficiency/patrolPointView.jsp | 55 ++++++++-------- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/src/main/webapp/jsp/timeefficiency/patrolPointEdit.jsp b/src/main/webapp/jsp/timeefficiency/patrolPointEdit.jsp index f0ba94ad..c53ac200 100644 --- a/src/main/webapp/jsp/timeefficiency/patrolPointEdit.jsp +++ b/src/main/webapp/jsp/timeefficiency/patrolPointEdit.jsp @@ -290,10 +290,10 @@ }; //初始化楼层 - var refreshSelect4Floor = function (companyId) { - $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {companyId: companyId}, function (data) { - $("#processSectionId").empty(); - var selelct_ = $("#processSectionId").select2({ + var refreshSelect4Floor = function (unitId) { + $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {unitId: unitId}, function (data) { + $("#floorName").empty(); + var selelct_ = $("#floorName").select2({ data: data, placeholder: '请选择',//默认文字提示 allowClear: true,//允许清空 @@ -310,7 +310,7 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val('${patrolPoint.processSectionId}').trigger("change"); + selelct_.val('${patrolPoint.floorId}').trigger("change"); }, 'json'); }; @@ -683,7 +683,7 @@ } else { $("#hidden_bizid").attr("disabled", "disabled"); $("#input_bizid").css("display", "none"); - refreshSelect('${patrolPoint.bizId}'); + refreshSelect('${patrolPoint.unitId}'); var selelct = $("#bizId").select2({ data: data, placeholder: '请选择',//默认文字提示 @@ -701,7 +701,7 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct.val('${patrolPoint.bizId}').trigger("change"); + selelct.val('${patrolPoint.unitId}').trigger("change"); selelct.on("change", function (e) { var companyId = $(this).val(); $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId: companyId}, function (data) { @@ -754,30 +754,33 @@ //巡检楼层下拉数据 var selectType = $("#floorName").select2({minimumResultsForSearch: 10}) - $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {unitId: '${patrolPoint.unitId}'}, function (data) { - $("#floorName").empty(); - var selelct_ = $("#floorName").select2({ - data: data, - placeholder: '请选择',//默认文字提示 - allowClear: false,//允许清空 - escapeMarkup: function (markup) { - return markup; - }, // 自定义格式化防止xss注入 - language: "zh-CN", - minimumInputLength: 0, - minimumResultsForSearch: 10,//数据超过10个启用搜索框 - formatResult: function formatRepo(repo) { - return repo.text; - }, // 函数用来渲染结果 - formatSelection: function formatRepoSelection(repo) { - return repo.text; - } // 函数用于呈现当前的选择 - }); - selelct_.val('${patrolPoint.floorId}').trigger("change"); - selelct_.on('change', function (e) { - $('#floorId').val(e.target.value); - }) - }, 'json'); + var floorUnitId = '${patrolPoint.unitId}' || '${patrolPoint.bizId}'; + if(floorUnitId && floorUnitId !== '') { + $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {unitId: floorUnitId}, function (data) { + $("#floorName").empty(); + var selelct_ = $("#floorName").select2({ + data: data, + placeholder: '请选择',//默认文字提示 + allowClear: false,//允许清空 + escapeMarkup: function (markup) { + return markup; + }, // 自定义格式化防止xss注入 + language: "zh-CN", + minimumInputLength: 0, + minimumResultsForSearch: 10,//数据超过10个启用搜索框 + formatResult: function formatRepo(repo) { + return repo.text; + }, // 函数用来渲染结果 + formatSelection: function formatRepoSelection(repo) { + return repo.text; + } // 函数用于呈现当前的选择 + }); + selelct_.val('${patrolPoint.floorId}').trigger("change"); + selelct_.on('change', function (e) { + $('#floorId').val(e.target.value); + }) + }, 'json'); + } }) diff --git a/src/main/webapp/jsp/timeefficiency/patrolPointView.jsp b/src/main/webapp/jsp/timeefficiency/patrolPointView.jsp index f02d3e98..fe1088b3 100644 --- a/src/main/webapp/jsp/timeefficiency/patrolPointView.jsp +++ b/src/main/webapp/jsp/timeefficiency/patrolPointView.jsp @@ -233,7 +233,7 @@ } else { $("#hidden_bizid").attr("disabled", "disabled"); $("#input_bizid").css("display", "none"); - refreshSelect('${patrolPoint.bizId}'); + refreshSelect('${patrolPoint.unitId}'); var selelct = $("#bizId").select2({ data: data, placeholder: '请选择',//默认文字提示 @@ -251,7 +251,7 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct.val('${patrolPoint.bizId}').trigger("change"); + selelct.val('${patrolPoint.unitId}').trigger("change"); selelct.on("change", function (e) { var companyId = $(this).val(); $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId: companyId}, function (data) { @@ -304,30 +304,33 @@ //巡检楼层下拉数据 var selectType = $("#floorName").select2({minimumResultsForSearch: 10}) - $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {unitId: '${patrolPoint.unitId}'}, function (data) { - $("#floorName").empty(); - var selelct_ = $("#floorName").select2({ - data: data, - placeholder: '请选择',//默认文字提示 - allowClear: false,//允许清空 - escapeMarkup: function (markup) { - return markup; - }, // 自定义格式化防止xss注入 - language: "zh-CN", - minimumInputLength: 0, - minimumResultsForSearch: 10,//数据超过10个启用搜索框 - formatResult: function formatRepo(repo) { - return repo.text; - }, // 函数用来渲染结果 - formatSelection: function formatRepoSelection(repo) { - return repo.text; - } // 函数用于呈现当前的选择 - }); - selelct_.val('${patrolPoint.floorId}').trigger("change"); - selelct_.on('change', function (e) { - $('#floorId').val(e.target.value); - }) - }, 'json'); + var floorUnitId = '${patrolPoint.unitId}' || '${patrolPoint.bizId}'; + if(floorUnitId && floorUnitId !== '') { + $.post(ext.contextPath + "/timeEfficiency/patrolArea/getPatrolAreaFloor4Select.do", {unitId: floorUnitId}, function (data) { + $("#floorName").empty(); + var selelct_ = $("#floorName").select2({ + data: data, + placeholder: '请选择',//默认文字提示 + allowClear: false,//允许清空 + escapeMarkup: function (markup) { + return markup; + }, // 自定义格式化防止xss注入 + language: "zh-CN", + minimumInputLength: 0, + minimumResultsForSearch: 10,//数据超过10个启用搜索框 + formatResult: function formatRepo(repo) { + return repo.text; + }, // 函数用来渲染结果 + formatSelection: function formatRepoSelection(repo) { + return repo.text; + } // 函数用于呈现当前的选择 + }); + selelct_.val('${patrolPoint.floorId}').trigger("change"); + selelct_.on('change', function (e) { + $('#floorId').val(e.target.value); + }) + }, 'json'); + } })