From 3bfda69b65e66d29748355d1843ef886144055e1 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 17 六月 2024 14:23:45 +0800
Subject: [PATCH] 添加
---
src/main/resources/templates/tr/tbBaseCheckScore/edit.html | 83 +++++++++++
src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html | 120 +++++++++++++++++
src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html | 8
src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html | 9
src/main/resources/templates/tr/tbBaseCheckScore/detail.html | 83 +++++++++++
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java | 4
src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html | 31 ++--
src/main/resources/templates/tr/tbBaseCheckScore/add.html | 72 ++++++++++
8 files changed, 386 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java
index 95a314e..a765a94 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java
@@ -23,7 +23,7 @@
@RequestMapping("/tr/tbBaseCheckScore")
public class TBBaseCheckScoreController extends BaseController
{
- private String prefix = "tr/selectTbBaseCheckScorePage";
+ private String prefix = "tr/tbBaseCheckScore";
@Autowired
private TbBaseCheckService tbBaseCheckService;
@@ -39,7 +39,7 @@
- @PostMapping("/selectTbBaseCheckScorePage")
+ @PostMapping("/list")
@ResponseBody
public TableDataInfo selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO)
{
diff --git a/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html b/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
index bf13770..8076bac 100644
--- a/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
+++ b/src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('执行情况列表')"/>
+ <th:block th:include="include :: header('评分细则')"/>
</head>
<body class="gray-bg">
<div class="container-div">
@@ -28,14 +28,14 @@
<!-- </div>-->
<!-- </form>-->
<!-- </div>-->
- <div class="col-sm-12 search-collapse">
+ <div class="col-sm-12 search-collapse" style="display: none">
<form id="formId">
<div class="select-list">
<ul>
<input type="hidden" id="riskId" name="id" th:value="${id}"/>
- <li style="display: none">
+ <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
</li>
@@ -43,11 +43,11 @@
</div>
</form>
</div>
- <div class="btn-group-sm" id="toolbar" role="group">
- <a class="btn btn-success" onclick="$.operate.add()">
- <i class="fa fa-plus"></i> 新增
- </a>
- </div>
+<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
+<!-- <a class="btn btn-success" onclick="$.operate.add()">-->
+<!-- <i class="fa fa-plus"></i> 新增-->
+<!-- </a>-->
+<!-- </div>-->
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
@@ -60,10 +60,11 @@
$(function () {
var options = {
url: prefix + "/list",
+ title: '检查项上报',
queryParams: queryParams,
cleanUrl: prefix + "/clean",
createUrl: prefix + "/add",
- detailUrl: prefix + "/detail/{id}",
+ detailUrl: "/tr/tbBaseCheckScore/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
@@ -73,19 +74,18 @@
columns: [
{
field: 'indexId',
- title: '检查序号',
- visible: false
+ title: '检查序号'
},
{
- field: 'hazardSource',
+ field: 'checkContent',
title: '检查内容'
},
{
- field: 'hazardSource',
+ field: 'checkBasis',
title: '检查依据'
},
{
- field: 'hazardSource',
+ field: 'applicablePlace',
title: '适用场所'
},
{
@@ -101,8 +101,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.indexId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.indexId + ")'><i class='fa fa-search'></i>查看</a> ");
+ actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>评分细则</a> ');
return actions.join('');
}
}
diff --git a/src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html b/src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html
index f0376bd..e0dbec7 100644
--- a/src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html
+++ b/src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('执行情况列表')"/>
+ <th:block th:include="include :: header('检查任务上报')"/>
</head>
<body class="gray-bg">
<div class="container-div">
@@ -28,14 +28,14 @@
<!-- </div>-->
<!-- </form>-->
<!-- </div>-->
- <div class="col-sm-12 search-collapse">
+ <div class="col-sm-12 search-collapse" style="display: none">
<form id="formId">
<div class="select-list">
<ul>
<input type="hidden" id="riskId" name="id" th:value="${id}"/>
- <li style="display: none">
+ <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
</li>
@@ -60,6 +60,7 @@
$(function () {
var options = {
url: prefix + "/list",
+ title: '检查任务上报',
queryParams: queryParams,
cleanUrl: prefix + "/clean",
createUrl: prefix + "/add",
@@ -69,7 +70,7 @@
exportUrl: prefix + "/export",
sortName: "createTime",
sortOrder: "desc",
- modalName: "任务上报",
+ modalName: "检查任务上报",
columns: [
{
field: 'indexId',
diff --git a/src/main/resources/templates/tr/tbBaseCheckScore/add.html b/src/main/resources/templates/tr/tbBaseCheckScore/add.html
new file mode 100644
index 0000000..71df032
--- /dev/null
+++ b/src/main/resources/templates/tr/tbBaseCheckScore/add.html
@@ -0,0 +1,72 @@
+<!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"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-job-add">
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">风险分析对象：</label>
+ <div class="col-sm-8">
+ <select id="hazardCode" name="hazardCode" class="form-control" required>
+ <option th:each="hazard : ${hazardList}" th:text="${hazard.riskListName}" th:value="${hazard.riskListNum}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查类型：</label>
+ <div class="col-sm-8">
+ <select name="checkType" class="form-control m-b" required id="checkType">
+ <option value="">请选择</option>
+ <option value="1">企业自查</option>
+ <option value="2">市级及以下检查</option>
+ <option value="3">省级检查</option>
+ <option value="4">部级检查</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查日期：</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="checkDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">是否停产整顿：</label>
+ <div class="col-sm-8">
+ <select name="resultStatus" class="form-control m-b" required id="resultStatus">
+ <option value="">请选择</option>
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script type="text/javascript">
+ $("input[name='checkDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+ $("#form-job-add").validate({
+ onkeyup: false,
+ focusCleanup: true
+ });
+
+ function submitHandler() {
+ if ($.validate.form()){
+ $.operate.save(prefix + "/add", $('#form-job-add').serialize());
+ }
+ }
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/tr/tbBaseCheckScore/detail.html b/src/main/resources/templates/tr/tbBaseCheckScore/detail.html
new file mode 100644
index 0000000..2d27487
--- /dev/null
+++ b/src/main/resources/templates/tr/tbBaseCheckScore/detail.html
@@ -0,0 +1,83 @@
+<!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"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-job-edit" th:object="${specialCheckTaskLog}">
+ <input id="indexId" name="indexId" type="hidden" th:field="*{indexId}"/>
+
+
+ <!-- <input id="createUserId" name="createUserId" type="hidden" th:field="*{createUserId}"/>-->
+ <!-- <input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">风险分析对象：</label>
+ <div class="col-sm-8">
+ <select id="hazardCode" name="hazardCode" th:field="*{hazardCode}" class="form-control" required readonly="readonly">
+ <option th:each="hazard : ${hazardList}" th:text="${hazard.riskListName}" th:value="${hazard.riskListNum}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查类型：</label>
+ <div class="col-sm-8">
+ <select name="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType" readonly="readonly">
+ <option value="">请选择</option>
+ <option value="1">企业自查</option>
+ <option value="2">市级及以下检查</option>
+ <option value="3">省级检查</option>
+ <option value="4">部级检查</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查日期：</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="checkDate" th:value="${#dates.format(specialCheckTaskLog.checkDate, 'yyyy-MM-dd')}" class="form-control" type="text" required readonly="readonly">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">是否停产整顿：</label>
+ <div class="col-sm-8">
+ <select name="resultStatus" th:field="*{resultStatus}" class="form-control m-b" required id="resultStatus" readonly="readonly">
+ <option value="">请选择</option>
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+
+ <!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>-->
+
+ </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
+ var prefix = ctx + "tr/specialCheckTaskLog";
+
+ $("input[name='checkDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+
+ $("#form-job-edit").validate({
+ onkeyup: false,
+ focusCleanup: true
+ });
+
+ function submitHandler() {
+ if ($.validate.form()){
+ $.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
+ }
+ }
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/tr/tbBaseCheckScore/edit.html b/src/main/resources/templates/tr/tbBaseCheckScore/edit.html
new file mode 100644
index 0000000..fbbfe9a
--- /dev/null
+++ b/src/main/resources/templates/tr/tbBaseCheckScore/edit.html
@@ -0,0 +1,83 @@
+<!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"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-job-edit" th:object="${specialCheckTaskLog}">
+ <input id="indexId" name="indexId" type="hidden" th:field="*{indexId}"/>
+
+
+<!-- <input id="createUserId" name="createUserId" type="hidden" th:field="*{createUserId}"/>-->
+<!-- <input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">风险分析对象：</label>
+ <div class="col-sm-8">
+ <select id="hazardCode" name="hazardCode" th:field="*{hazardCode}" class="form-control" required>
+ <option th:each="hazard : ${hazardList}" th:text="${hazard.riskListName}" th:value="${hazard.riskListNum}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查类型：</label>
+ <div class="col-sm-8">
+ <select name="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
+ <option value="">请选择</option>
+ <option value="1">企业自查</option>
+ <option value="2">市级及以下检查</option>
+ <option value="3">省级检查</option>
+ <option value="4">部级检查</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查日期：</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="checkDate" th:value="${#dates.format(specialCheckTaskLog.checkDate, 'yyyy-MM-dd')}" class="form-control" type="text" required>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">是否停产整顿：</label>
+ <div class="col-sm-8">
+ <select name="resultStatus" th:field="*{resultStatus}" class="form-control m-b" required id="resultStatus">
+ <option value="">请选择</option>
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+
+<!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>-->
+
+ </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
+ var prefix = ctx + "tr/specialCheckTaskLog";
+
+ $("input[name='checkDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+
+ $("#form-job-edit").validate({
+ onkeyup: false,
+ focusCleanup: true
+ });
+
+ function submitHandler() {
+ if ($.validate.form()){
+ $.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
+ }
+ }
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html b/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html
new file mode 100644
index 0000000..9fb9a07
--- /dev/null
+++ b/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <th:block th:include="include :: header('执行情况列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+ <div class="row">
+<!-- <div class="col-sm-12 search-collapse">-->
+<!-- <form id="jobLog-form">-->
+<!-- <div class="select-list">-->
+<!-- <ul>-->
+<!-- <input id="jobId" name="jobId" type="hidden" th:value="${job!=null?job.jobId:''}"/>-->
+<!-- <li>-->
+<!-- 状态：<select name="scheduleCheckStatus">-->
+<!-- <option value="">所有</option>-->
+<!-- <option value="0">未排查</option>-->
+<!-- <option value="1">已排查</option>-->
+<!-- </select>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
+<!-- class="fa fa-search"></i> 搜索</a>-->
+<!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
+<!-- class="fa fa-refresh"></i> 重置</a>-->
+<!-- </li>-->
+<!-- </ul>-->
+<!-- </div>-->
+<!-- </form>-->
+<!-- </div>-->
+ <div class="col-sm-12 search-collapse" style="display: none">
+ <form id="formId">
+ <div class="select-list">
+ <ul>
+
+ <input type="hidden" id="riskId" name="id" th:value="${id}"/>
+
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
+<!-- <a class="btn btn-success" onclick="$.operate.add()">-->
+<!-- <i class="fa fa-plus"></i> 新增-->
+<!-- </a>-->
+<!-- </div>-->
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+ var prefix = ctx + "tr/tbBaseCheckScore";
+
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ queryParams: queryParams,
+ cleanUrl: prefix + "/clean",
+ createUrl: prefix + "/add",
+ detailUrl: prefix + "/detail/{id}",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ exportUrl: prefix + "/export",
+ sortName: "createTime",
+ sortOrder: "desc",
+ modalName: "任务上报",
+ columns: [
+ {
+ field: 'indexId',
+ title: '检查序号'
+ },
+ {
+ field: 'checkContent',
+ title: '检查内容'
+ },
+ {
+ field: 'checkBasis',
+ title: '检查依据'
+ },
+ {
+ field: 'applicablePlace',
+ title: '适用场所'
+ },
+ {
+ field: 'createDate',
+ title: '创建时间'
+ },
+ {
+ field: 'updateDate',
+ title: '修改时间'
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.edit(" + row.id + ")'><i class='fa fa-edit'></i>评分</a> ");
+ actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.id + ")'><i class='fa fa-search'></i>评分记录</a> ");
+ return actions.join('');
+ }
+ }
+ ]
+ };
+ $.table.init(options);
+ });
+ function queryParams(params) {
+ var search = $.table.queryParams(params);
+ // 所属风险单元
+ search.id = $("#riskId").val();
+ return search;
+ }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html b/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
index 3f9c37e..a3d7a46 100644
--- a/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
+++ b/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
@@ -106,7 +106,7 @@
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>检查任务上报</a> ');
- actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>检查项上报</a> ');
+ actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="openDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查项上报</a> ');
return actions.join('');
}
}]
@@ -114,7 +114,11 @@
$.table.init(options);
});
-
+ /* 检查项上报 */
+ function openDetail(id) {
+ var detailDangerExamineUrl = "/tr/specialCheckItemDangerLog/{id}";
+ $.operate.openDetailInfo("检查项上报", detailDangerExamineUrl.replace("{id}", id),1600);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.2