From 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 27 六月 2025 12:28:46 +0800
Subject: [PATCH] 修复问题
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
index 806f425..c276ac1 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -19,8 +19,8 @@
<div class="form-group" style="font-size: 25px;color: #4CAF50;">
<label class="col-sm-3 control-label">按期改：<span id="onTimeRectifyNum"></span></label>
<label class="col-sm-3 control-label">按期率：<span id="onTimeRectifyRate"></span></label>
- <label class="col-sm-3 control-label">超期改：<span>0</span></label>
- <label class="col-sm-3 control-label">超期率：<span>0%</span></label>
+ <label class="col-sm-3 control-label">超期改：<span id="overdueRectifyNum"></span></label>
+ <label class="col-sm-3 control-label">超期率：<span id="overdueRectifyRate"></span></label>
</div>
<div class="form-group" style="font-size: 25px;color: #4CAF50;">
@@ -60,6 +60,13 @@
</select>
</li>
<li>
+ <label>排查类型：</label>
+ <select name="dangerSrc" th:with="type=${@dict.getType('danger_source')}">
+ <option value="">--请选择排查类型--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
<label>日期区间：</label>
<select name="dateRangeLedger">
<option value="">所有</option>
@@ -78,21 +85,26 @@
<option value="超期改">超期改</option>
</select>
</li>
+
<li style="display: flex;align-items: center">
<label>整改部门：</label>
-<!-- <select name="rectifyDeptIdLedger">-->
-<!-- <option value="">所有</option>-->
-<!-- <option th:each="dept : ${deptList}" th:text="${dept.deptName}"-->
-<!-- th:value="${dept.deptId}"></option>-->
-<!-- </select>-->
- <div class="input-group" style="width: 200px">
- <input name="rectifyDeptIdLedger" type="hidden" id="rectifyDeptIdLedger">
+ <div class="input-group" style="width: 200px;position: relative">
+ <input name="rectifyDeptIdLedger" id="rectifyDeptIdLedger" style="position: absolute;z-index: -1;top: 0;left: 0">
<input onclick="selectDangerDeptTree()" id="dangerDeptName" type="text"
placeholder="请选择部门" class="form-control" required
readonly="readonly">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</li>
+ <li style="display: flex;align-items: center">
+ <label>隐患登记人：</label>
+ <div class="input-group" style="width: 200px;position: relative">
+ <input id="registerUserId" name="registerUserId" style="position: absolute;z-index: -1;top: 0;left: 0">
+ <input id="registerUserName" placeholder="请选择登记人" class="form-control" type="text" onclick="selectAcceptUser()" maxlength="30" readonly="true" required>
+ <span class="input-group-addon"><i class="fa fa-search"></i></span>
+ </div>
+ </li>
+
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i> 搜索</a>
@@ -133,6 +145,26 @@
$("#yearOnYearRate").text([[${yearOnYearRate}]]);
});
+ /*验收人 选择 start*/
+ function selectAcceptUser() {
+ var url = ctx + "system/user/selectUserListByParentSonCompany";
+ var options = {
+ title: '用户选择',
+ width: "800",
+ url: url,
+ };
+ $.modal.openOptionsByCallback(options, function (layero, index) {
+ var body = layer.getChildFrame('body', index);
+ body.on("click", ".selectUser", function () {
+ var userId = $(this).data("userid");
+ var userName = $(this).data("username");
+ $("#registerUserId").val(userId);
+ $("#registerUserName").val(userName);
+ layer.close(index);
+ });
+ });
+ }
+
$(function () {
var options = {
url: prefix + "/list",
@@ -149,6 +181,10 @@
field: 'id',
title: '隐患检查点ID',
visible: false
+ },
+ {
+ field: 'registerCreateTime',
+ title: '登记时间'
},
{
field: 'checkType',
@@ -222,6 +258,37 @@
}
},
{
+ field: 'dangerSrc',
+ title: '排查类型',
+ formatter: function (value, item, index) {
+ var label = "";
+ if (value == "1") {
+ label = "日常排查";
+ } else if (value == "2") {
+ label = "综合性排查";
+ } else if (value == "3") {
+ label = "专业性排查";
+ }else if (value == "4") {
+ label = "季节性排查";
+ } else if (value == "5") {
+ label = "重点时段及节假日前排查";
+ }else if (value == "6") {
+ label = "事故类比排查";
+ }else if (value == "7") {
+ label = "复产复工前排查";
+ } else if (value == "8") {
+ label = "外聘专家诊断式排查";
+ }else if (value == "9") {
+ label = "管控措施实效";
+ }else if (value == "10") {
+ label = "其他";
+ } else if (value == "11") {
+ label = "政府执法检查";
+ }
+ return label;
+ }
+ },
+ {
field: 'dangerSources',
title: '隐患来源',
formatter: function (value, item, index) {
@@ -268,11 +335,7 @@
label = "验收未通过";
}
}
- if (compareDate(item.rectifyDeadlineTime, item.rectifyCompleteTime)) {
- label += "（按期改）";
- } else {
- label += "（超期改）";
- }
+
}
}
return label;
@@ -286,6 +349,7 @@
if (row.stage) {
if (row.stage == 3) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerExamine(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
@@ -293,6 +357,7 @@
return actions.join('');
} else if (row.stage == 4) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerRectify(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
@@ -300,11 +365,10 @@
return actions.join('');
} else if (row.stage == 5) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerAccept(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
-
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
-
return actions.join('');
}
}
@@ -314,7 +378,6 @@
};
$.table.init(options);
});
-
var compareDate = function (date1, date2) {
var oDate1 = new Date(date1);
@@ -333,6 +396,13 @@
$.modal.open("隐患核查", editDangerExamineUrl.replace("{id}", id));
}
+ /* 隐患核查--修改 */
+ function editType(id) {
+ var editTypeUrl = prefix + "/editDangerLevel/{id}";
+ console.log(id,'id')
+ $.modal.open("修改", editTypeUrl.replace("{id}", id));
+ }
+
/* 隐患核查--查看 */
function detailDangerExamine(id) {
var detailDangerExamineUrl = ctx + "tr/hiddenDangerCheck/dangerExamine/detailDangerExamine/{id}";
--
Gitblit v1.9.2