From 6c596cf92d8976cfe6a6101486c46697346a8724 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 19 六月 2024 15:52:32 +0800
Subject: [PATCH] 添加专项检查任务
---
/dev/null | 88 --------------------------------------------
src/main/resources/templates/tr/specialCheckTaskLog/add.html | 2
src/main/resources/templates/tr/specialCheckTaskLog/edit.html | 2
src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html | 2
src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html | 2
src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html | 18 ++++++---
6 files changed, 16 insertions(+), 98 deletions(-)
diff --git a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
index bc6c318..3ab56ac 100644
--- a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
+++ b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
@@ -65,7 +65,7 @@
var minute = now.getMinutes(); //获取当前分钟数(0-59)
var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd" + ' ' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':' + second.toString().padStart(2, '0'),
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
diff --git a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
index f3dcba7..8a4c897 100644
--- a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
+++ b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
@@ -73,7 +73,7 @@
var minute = now.getMinutes(); //获取当前分钟数(0-59)
var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd" + ' ' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':' + second.toString().padStart(2, '0'),
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
diff --git a/src/main/resources/templates/tr/specialCheckTaskLog/add.html b/src/main/resources/templates/tr/specialCheckTaskLog/add.html
index ac74bb6..d2a6d7f 100644
--- a/src/main/resources/templates/tr/specialCheckTaskLog/add.html
+++ b/src/main/resources/templates/tr/specialCheckTaskLog/add.html
@@ -65,7 +65,7 @@
var minute = now.getMinutes(); //获取当前分钟数(0-59)
var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd" + ' ' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':' + second.toString().padStart(2, '0'),
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
diff --git a/src/main/resources/templates/tr/specialCheckTaskLog/edit.html b/src/main/resources/templates/tr/specialCheckTaskLog/edit.html
index 0adf82f..419c568 100644
--- a/src/main/resources/templates/tr/specialCheckTaskLog/edit.html
+++ b/src/main/resources/templates/tr/specialCheckTaskLog/edit.html
@@ -72,7 +72,7 @@
var minute = now.getMinutes(); //获取当前分钟数(0-59)
var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd" + ' ' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':' + second.toString().padStart(2, '0'),
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
diff --git a/src/main/resources/templates/tr/tbBaseCheckItem/add.html b/src/main/resources/templates/tr/tbBaseCheckItem/add.html
deleted file mode 100644
index adc28c1..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckItem/add.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!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="checkType" class="form-control m-b" required id="checkType">
- <option value="">请选择</option>
- <option value="1">事故隐患</option>
- <option value="2">火灾隐患</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label is-required">罚款金额(元)：</label>
- <div class="col-sm-8">
- <input class="form-control" type="number" name="jobName" id="jobName" required>
- </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/tbBaseCheckItem/detail.html b/src/main/resources/templates/tr/tbBaseCheckItem/detail.html
deleted file mode 100644
index 2d27487..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckItem/detail.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!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/tbBaseCheckItem/edit.html b/src/main/resources/templates/tr/tbBaseCheckItem/edit.html
deleted file mode 100644
index 6fcf470..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckItem/edit.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!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="id" name="id" type="hidden" th:field="*{id}"/>
-
-
-<!-- <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="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
- <option value="">请选择</option>
- <option value="1">事故隐患</option>
- <option value="2">火灾隐患</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label is-required">罚款金额(元)：</label>
- <div class="col-sm-8">
- <input class="form-control" th:field="*{jobName}" type="number" name="jobName" id="jobName" required>
- </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/tbBaseCheckScore";
-
- $("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/tbBaseCheckItem/selectTbBaseCheckItemPage.html b/src/main/resources/templates/tr/tbBaseCheckItem/selectTbBaseCheckItemPage.html
deleted file mode 100644
index 03ca3c7..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckItem/selectTbBaseCheckItemPage.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!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: [
- {
- title: "序号",
- formatter: function (value, row, index) {
- return $.table.serialNumber(index);
- }
- },
- {
- field: 'isReject',
- title: '是否为否决项',
- align: 'center',
- formatter: function (value, row, index) {
- if (value == "1") {
- return "是";
- } else if (value == "0") {
- return "否";
- }
- }
- },
- {
- field: 'deductIllustrate',
- title: '扣分说明'
- },
- {
- field: 'deductPoint',
- title: '扣分分值'
- },
- {
- field: 'createDate',
- title: '创建时间'
- },
- {
- field: 'updateDate',
- title: '修改时间'
- },
- {
- title: '操作',
- align: 'center',
- formatter: function (value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-success 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/tbBaseCheckScore/add.html b/src/main/resources/templates/tr/tbBaseCheckScore/add.html
deleted file mode 100644
index adc28c1..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckScore/add.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!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="checkType" class="form-control m-b" required id="checkType">
- <option value="">请选择</option>
- <option value="1">事故隐患</option>
- <option value="2">火灾隐患</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label is-required">罚款金额(元)：</label>
- <div class="col-sm-8">
- <input class="form-control" type="number" name="jobName" id="jobName" required>
- </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
deleted file mode 100644
index 2d27487..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckScore/detail.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!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
deleted file mode 100644
index 6fcf470..0000000
--- a/src/main/resources/templates/tr/tbBaseCheckScore/edit.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!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="id" name="id" type="hidden" th:field="*{id}"/>
-
-
-<!-- <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="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
- <option value="">请选择</option>
- <option value="1">事故隐患</option>
- <option value="2">火灾隐患</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label is-required">罚款金额(元)：</label>
- <div class="col-sm-8">
- <input class="form-control" th:field="*{jobName}" type="number" name="jobName" id="jobName" required>
- </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/tbBaseCheckScore";
-
- $("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/tbBaseCheckTask/selectTbBaseCheckTaskPage.html b/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
index a3d7a46..82a2a0f 100644
--- a/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
+++ b/src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
@@ -44,14 +44,14 @@
url: prefix + "/list",
detailUrl: "/tr/specialCheckTaskLog/{id}",
createUrl: prefix + "/add",
- updateUrl: "/tr/specialCheckItemDangerLog/{id}",
+ updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
sortName: "createTime",
sortOrder: "desc",
modalName: "任务",
columns: [{
- checkbox: true
+ checkbox: false
},
{
field: 'id',
@@ -105,8 +105,8 @@
align: 'center',
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="openDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查项上报</a> ');
+ actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="openReport(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查任务上报</a> ');
+ actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="openDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查项上报</a> ');
return actions.join('');
}
}]
@@ -114,10 +114,16 @@
$.table.init(options);
});
+ /* 检查任务上报 */
+ function openReport(id) {
+ var checkTaskUrl = "/tr/specialCheckTaskLog/{id}";
+ $.modal.openFullNoConfirm("检查任务上报", checkTaskUrl.replace("{id}", id));
+ }
+
/* 检查项上报 */
function openDetail(id) {
- var detailDangerExamineUrl = "/tr/specialCheckItemDangerLog/{id}";
- $.operate.openDetailInfo("检查项上报", detailDangerExamineUrl.replace("{id}", id),1600);
+ var checkItemUrl = "/tr/specialCheckItemDangerLog/{id}";
+ $.modal.openFullNoConfirm("检查项上报", checkItemUrl.replace("{id}", id));
}
</script>
</body>
--
Gitblit v1.9.2