From 18e95a858848c21b1826efd3f54af131d07a4fb7 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 11 九月 2023 10:12:18 +0800
Subject: [PATCH] 下一步核查
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html | 7 +
src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/nextConfirm.html | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 4
3 files changed, 355 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
index 469aab6..c40ce4c 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
@@ -145,6 +145,7 @@
formatter: function (value, row, index) {
var actions = [];
if (row.examineStatus == 0) {
+ actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="nextConfirm(\'' + row.id + '\')"><i class="fa fa-search"></i>下一步核查</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editDangerExamine(\'' + row.id + '\')"><i class="fa fa-edit"></i>核查</a> ');
return actions.join('');
} else if (row.examineStatus == 1) {
@@ -163,6 +164,12 @@
$.modal.open("隐患核查", editDangerExamineUrl.replace("{id}", id));
}
+ /* 隐患核查--下一步核查 */
+ function nextConfirm(id) {
+ var nextConfirmUrl = prefix + "/nextConfirm/{id}";
+ $.modal.open("下一步核查", nextConfirmUrl.replace("{id}", id));
+ }
+
/* 隐患核查--查看 */
function detailDangerExamine(id) {
var detailDangerExamineUrl = prefix + "/detailDangerExamine/{id}";
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/nextConfirm.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/nextConfirm.html
new file mode 100644
index 0000000..8c2db96
--- /dev/null
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/nextConfirm.html
@@ -0,0 +1,346 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+ <th:block th:include="include :: header('隐患核查')"/>
+ <th:block th:include="include :: datetimepicker-css"/>
+ <th:block th:include="include :: jquery-steps-css"/>
+
+ <!--多图上传样式-->
+ <link rel="stylesheet" href="/ajax/libs/layui/css/layui.css" media="all">
+ <style type="text/css">
+ #tablist li a {
+ height: 5em;
+ }
+
+ #tablist li.notExecute a {
+ line-height: 5em;
+ text-align: center;
+ }
+
+ label.error{
+ position :absolute !important;
+ }
+
+ </style>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-hdcp-edit" th:object="${hdcp}">
+ <h4 class="form-header h4">处理进度</h4>
+ <div class="row" style="margin-bottom: 30px;">
+ <div class="col-sm-12">
+ <div role="application" class="wizard clearfix">
+ <div class="steps clearfix">
+ <ul role="tablist" id="tablist">
+ <li role="tab" class="disabled done" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'1.【'+hdcp.registerUserName+'】登记'}"></span><br/>
+ <span th:text="${#dates.format(hdcp.registerCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
+ </li>
+ <li role="tab" class="disabled current" aria-disabled="true" aria-selected="true">
+ <a><span th:text="${'2.【'+hdcp.examineUserName+'】核查'}"></span>
+ </a>
+ </li>
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="true">
+ <a><span th:text="3"></span>
+ </a>
+ </li>
+ <li role="tab" class="disabled notExecute" aria-disabled="true">
+ <a><span th:text="4"></span>
+ </a>
+ </li>
+ <!--<li role="tab" class="disabled" aria-disabled="true">
+ <a><span>1</span><br/><span>1</span></a>
+ </li>
+ <li role="tab" class="disabled" aria-disabled="true">
+ <a><span>1</span><br/><span>1</span></a>
+ </li>-->
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <input name="id" th:field="*{id}" type="hidden">
+ <input name="checkId" th:field="*{checkId}" type="hidden">
+ <h4 class="form-header h4">隐患登记信息</h4>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">排查方式：</label>
+ <div class="col-sm-8" th:switch="*{checkType}">
+ <input value="基础清单排查" class="form-control" type="text" readonly="readonly" th:case="1">
+ <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly" th:case="2">
+ <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly" th:case="*">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row" th:if="${hdcp.checkType=='1'}">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label ">基础清单：</label>
+ <div class="col-sm-10">
+ <input th:value="*{riskName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row"
+ th:if="${hdcp.checkType=='2'||hdcp.checkType==null||hdcp.checkType==''}">
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">风险单元类型：</label>
+ <div class="col-sm-8" th:switch="*{riskType}">
+ <input value="设备设施清单" class="form-control" type="text" readonly="readonly" th:case="1">
+ <input value="作业活动清单" class="form-control" type="text" readonly="readonly" th:case="2">
+ <input value="工艺节点清单" class="form-control" type="text" readonly="readonly" th:case="3">
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">风险单元：</label>
+ <div class="col-sm-8">
+ <input th:value="*{riskName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">检查项：</label>
+ <div class="col-sm-8">
+ <input value="功能是否正常" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患名称：</label>
+ <div class="col-sm-8">
+ <textarea th:field="*{dangerName}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患地点：</label>
+ <div class="col-sm-8">
+ <input th:value="*{dangerPlaceName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患描述：</label>
+ <div class="col-sm-8">
+ <textarea th:field="*{dangerDescription}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患类别：</label>
+ <div class="col-sm-8">
+ <input th:value="*{troubleTypeName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患责任部门：</label>
+ <div class="col-sm-8">
+ <input th:value="*{dangerDeptName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患视图：</label>
+ <div class="col-sm-8">
+<!-- <img style="width: 100px; height: 100px;cursor:pointer;"-->
+<!-- title="查看图片"-->
+<!-- th:src="*{preRectifyPhoto}"-->
+<!-- onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"-->
+<!-- th:data-id="${hdcp.id}">-->
+ <img style="width: 100px; height: 100px;cursor:pointer;display: none"
+ title="查看图片"
+ class="allPics"
+ th:src="*{preRectifyPhoto}"
+ onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
+ th:data-id="${hdcp.id}">
+ <div class="image-container" style="display: flex;align-items: flex-start"></div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患核查人：</label>
+ <div class="col-sm-8">
+ <input th:value="*{examineUserName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">登记人：</label>
+ <div class="col-sm-8">
+ <input th:value="*{registerUserName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">登记时间：</label>
+ <div class="col-sm-8">
+ <input th:value="${#dates.format(hdcp.registerCreateTime,'yyyy-MM-dd HH:mm:ss')}"
+ class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <h4 class="form-header h4">隐患核查信息</h4>
+ <div class="form-group showByDangerLevelChange">
+ <label class="col-sm-3 control-label is-required">选择核查人：</label>
+ <div class="col-sm-8">
+ <input id="examineUserName" name="examineUserName" placeholder="选择下一步隐患核查人" class="form-control" type="text" onclick="selectConfirmUser()" maxlength="30" readonly="true" required>
+ <input id="examineUserId" name="examineUserId" type="hidden" >
+ </div>
+ </div>
+
+ </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: jquery-steps-js"/>
+<script type="text/javascript">
+ $(document).ready(function () {
+ var imgsUrl = $('.allPics');
+ var imageUrls = imgsUrl.attr('src')
+ var ids = imgsUrl.attr('data-id')
+ var imageContainer = document.querySelector('.image-container');
+
+ if(imageUrls && imageUrls !== '') {
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray = imageUrls.split(',');
+
+ // 遍历URL数组并创建img元素
+ imageUrlArray.forEach(function (url, index) {
+ var img = document.createElement('img');
+ img.setAttribute('src', url);
+ img.setAttribute('style', 'width: 100px; height: 100px; cursor: pointer;margin-right: 10px');
+ img.setAttribute('title', '查看图片');
+ img.setAttribute('data-id', ids);
+ img.addEventListener('click', function () {
+ // showPicture(this.getAttribute('data-id'), 'preRectifyPhoto');
+ openPicture(url)
+ });
+ imageContainer.appendChild(img);
+ });
+ }
+ });
+
+ function openPicture(url) {
+ window.open(url)
+ }
+
+ /* 图片--查看 */
+ function showPicture(id,type) {
+ var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
+ var urlLast = showPictureUrl.replace("{type}", type).replace("{id}", id);
+ $.operate.openDetailInfo("查看图片", urlLast);
+ }
+
+
+
+
+ var prefix = ctx + "tr/hiddenDangerCheck/dangerExamine";
+ $("#form-hdcp-edit").validate({
+ focusCleanup: true
+ });
+
+
+ function submitHandler() {
+ if ($.validate.form()) {
+ var data = $('#form-hdcp-edit').serializeArray();
+ var dangerLevel = $("#dangerLevel").val();
+ if(dangerLevel=="0"||dangerLevel=="1") {//一般隐患或重大隐患
+ // var examineUserName = $("select[name='examineUserId']").find("option:selected").text();//整改人名称
+ // data.push({"name": "examineUserName", "value": examineUserName});
+ }
+
+ $.operate.save(prefix + "/nextConfirm", data);
+ }
+ }
+
+ /*隐患整改责任部门 选择 end*/
+
+ // 选择风险单元
+ function selectRiskPoint() {
+ var url = "/tr/riskList/selectRiskList/1"
+ $.modal.openNoConfirm("风险单元", url, '700', '500');
+ }
+
+ /*隐患责任整改人 选择 start*/
+ function selectConfirmUser() {
+ 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");
+ $("#examineUserId").val(userId);
+ $("#examineUserName").val(userName);
+ layer.close(index);
+ });
+ });
+ }
+ /*隐患责任整改人 选择 end*/
+
+ $("input[name='rectifyCompleteTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+ $("input[name='rectifyDeadlineTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
index fff794f..806f425 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 id="overdueRectifyNum"></span></label>
- <label class="col-sm-3 control-label">超期率：<span id="overdueRectifyRate"></span></label>
+ <label class="col-sm-3 control-label">超期改：<span>0</span></label>
+ <label class="col-sm-3 control-label">超期率：<span>0%</span></label>
</div>
<div class="form-group" style="font-size: 25px;color: #4CAF50;">
--
Gitblit v1.9.2