From a5ac9fb03886fda6ea06d43c7abef59ebd45882b Mon Sep 17 00:00:00 2001 From: Rue Ji Date: Thu, 26 Mar 2026 20:07:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B5=8C=E5=A5=97?= =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E8=BE=93=E5=85=A5=E6=A1=86=E7=84=A6?= =?UTF-8?q?=E7=82=B9=E9=97=AE=E9=A2=98=E5=B9=B6=E5=A2=9E=E5=BC=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=E4=BF=AE=E5=A4=8DBootstrap=E5=B5=8C=E5=A5=97?= =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E4=B8=AD=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=BE=97=E7=84=A6=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E9=80=9A=E8=BF=87=E7=A6=81=E7=94=A8?= =?UTF-8?q?enforceFocus=E5=AE=9E=E7=8E=B0=20=E4=B8=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=87=BD=E6=95=B0=E6=B7=BB=E5=8A=A0index?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BB=A5=E6=94=AF=E6=8C=81=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E5=9C=A8=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0SafetyJobInside=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=9F=A5=E7=9C=8B=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?=E4=B8=BA=E5=B7=A1=E6=A3=80=E5=86=85=E5=AE=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0contentsDetail=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E5=9C=A8=E8=AE=BE=E5=A4=87=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PatrolContentsServiceImpl.java | 1 + src/main/webapp/JS/comm.js | 8 +++++++- src/main/webapp/jsp/activiti/taskList.jsp | 8 ++++++++ .../jsp/equipment/equipmentBelongListForSelect.jsp | 11 +++++++++++ src/main/webapp/jsp/safety/EducationBuilderList.jsp | 3 ++- src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp | 2 +- 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java index c39f97e3..5f1aab04 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java @@ -132,6 +132,7 @@ public class PatrolContentsServiceImpl implements PatrolContentsService { jsonObject.put("id", list3.get(j).getId()); jsonObject.put("name", list3.get(j).getContents()); jsonObject.put("text", list3.get(j).getContents()); + jsonObject.put("contentsDetail", list3.get(j).getContentsDetail()); jsonObject.put("type", TimeEfficiencyCommStr.PatrolEquipment_Equipment); jsonObject.put("icon", TimeEfficiencyCommStr.PatrolContents); jsonArrayEqu.add(jsonObject); diff --git a/src/main/webapp/JS/comm.js b/src/main/webapp/JS/comm.js index af4c833f..6bc8574a 100644 --- a/src/main/webapp/JS/comm.js +++ b/src/main/webapp/JS/comm.js @@ -870,7 +870,7 @@ function openModal(modalId) { } } - }) + }); }; /** @@ -1060,6 +1060,12 @@ $(function () { }); //FastClick.attach(document.body); + // 解决嵌套模态框中输入框无法获得焦点的问题 + // 禁用Bootstrap模态框的enforceFocus，允许嵌套模态框中的输入框正常工作 + if ($.fn.modal && $.fn.modal.Constructor) { + $.fn.modal.Constructor.prototype.enforceFocus = function() {}; + } + //弹窗关闭触发方法 /*$(".modal").on("hidden.bs.modal", function() { $('.modal').css("overflow","auto"); diff --git a/src/main/webapp/jsp/activiti/taskList.jsp b/src/main/webapp/jsp/activiti/taskList.jsp index 9620753c..b50c9f40 100644 --- a/src/main/webapp/jsp/activiti/taskList.jsp +++ b/src/main/webapp/jsp/activiti/taskList.jsp @@ -533,6 +533,14 @@ $("#subDiv").html(data); openModal('subModal'); }); + } else if (type.indexOf('${SAFETY_JOB_INSIDE}') != -1) { + $.post(ext.contextPath + '/safety/SafetyJobInside/view.do', {id: id}, function (data) { + $("#subDiv").html(data); + openModal('subModal'); + }); + } + else { + showAlert('w', `未查询到任务模块！${type}`, 'mainAlertdiv'); } }; var deleteFun = function (id) { diff --git a/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp b/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp index c7169f44..cfe3a51b 100644 --- a/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp +++ b/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp @@ -19,6 +19,10 @@ } }; + var dosearchBelong = function() { + $("#equipmentBelongTable").bootstrapTable('refresh'); + }; + //显示已经勾选的数据 function stateFormatter(value, row, index) { @@ -53,6 +57,7 @@ page: params.offset/params.limit+1, // 每页显示数据的开始页码 sort: params.sort, // 要排序的字段 order: params.order, + search_name: $('#search_belongname').val() } }, queryParamsType: "limit", @@ -110,6 +115,12 @@
+
+ +
+ +
+
diff --git a/src/main/webapp/jsp/safety/EducationBuilderList.jsp b/src/main/webapp/jsp/safety/EducationBuilderList.jsp index 2c24c6be..01e67b61 100644 --- a/src/main/webapp/jsp/safety/EducationBuilderList.jsp +++ b/src/main/webapp/jsp/safety/EducationBuilderList.jsp @@ -263,7 +263,8 @@ field: 'name', // 返回json数据中的name title: '姓名', // 表格表头显示文字 align: 'center', // 左右居中 - valign: 'middle' // 上下居中 + valign: 'middle', // 上下居中 + width: 200, }, { /* field: 'gender', // 返回json数据中的name title: '性别', // 表格表头显示文字 diff --git a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp index 8c0c2364..0ca1f89a 100644 --- a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp +++ b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp @@ -72,7 +72,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD var fileinput = function () { $('#file').click(); }; - var filedel = function () { + var filedel = function (index) { fileList.splice(index, 1) $('#test').html(initFileInputView()) };