src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckItemDangerLog/add.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckItemDangerLog/detail.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckItemDangerLog/edit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckTaskLog/detail.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/specialCheckTaskLog/edit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -49,12 +49,17 @@ @GetMapping() public String selectTbBaseCheckTaskPage(ModelMap mmap) // @GetMapping() // public String selectTbBaseCheckTaskPage(ModelMap mmap) // { // return prefix + "/specialCheckItemDangerLog"; // } @GetMapping("{id}") public String specialCheckItemDangerLog(@PathVariable("id")String id,ModelMap modelMap) { modelMap.put("id",id); return prefix + "/specialCheckItemDangerLog"; } @PostMapping("/list") src/main/resources/templates/tr/specialCheckItemDangerLog/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> src/main/resources/templates/tr/specialCheckItemDangerLog/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> src/main/resources/templates/tr/specialCheckItemDangerLog/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> src/main/resources/templates/tr/specialCheckItemDangerLog/specialCheckItemDangerLog.html
对比新文件 @@ -0,0 +1,121 @@ <!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"> <form id="formId"> <div class="select-list"> <ul> <input type="hidden" id="riskId" name="id" th:value="${id}"/> <li style="display: none"> <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/specialCheckItemDangerLog"; $(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: '检查序号', visible: false }, { field: 'hazardSource', title: '检查内容' }, { field: 'hazardSource', title: '检查依据' }, { field: 'hazardSource', 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.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> "); return actions.join(''); } } ] }; $.table.init(options); }); function queryParams(params) { var search = $.table.queryParams(params); // 所属风险单元 search.id = $("#riskId").val(); return search; } </script> </body> </html> src/main/resources/templates/tr/specialCheckTaskLog/detail.html
@@ -1,114 +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 :: 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}"/> <form class="form-horizontal m-t" id="jobLogForm" th:if="${name == 'hiddenDangerCheckJobLog'}"> <!-- <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">日志序号:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJobLog.jobLogId}"> <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">任务名称:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJobLog.jobName}"> <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">任务分组:</label> <div class="form-control-static" th:text="${@dict.getLabel('sys_job_group', hiddenDangerCheckJobLog.jobGroup)}"> <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">调用目标字符串:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJobLog.invokeTarget}"> <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> <div class="form-group"> <label class="col-sm-3 control-label">日志信息:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJobLog.jobMessage}"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">执行状态:</label> <div class="form-control-static" th:class="${hiddenDangerCheckJobLog.status == '0' ? 'label label-primary' : 'label label-danger'}" th:text="${hiddenDangerCheckJobLog.status == '0' ? '正常' : '失败'}"> </div> </div> <div class="form-group" th:style="'display:' + ${hiddenDangerCheckJobLog.status == '0' ? 'none' : 'block'}"> <label class="col-sm-3 control-label">异常信息:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJobLog.exceptionInfo}"> </div> </div> <!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>--> </form> <form class="form-horizontal m-t" id="jobForm" th:if="${name == 'hiddenDangerCheckJob'}"> <div class="form-group"> <label class="col-sm-3 control-label">任务名称:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJob.jobName}"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">排查类型:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJob.troubleshootTypeName}"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">排查周期:</label> <div class="form-control-static" id="troubleshootCycleInfo"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">排查方式:</label> <div class="form-control-static" th:switch="${hiddenDangerCheckJob.checkType}"> <span th:case="'1'">基础清单排查</span> <span th:case="'2'">选择风险单元清单排查</span> </div> </div> <div class="form-group" th:if="${hiddenDangerCheckJob.checkType=='2'}"> <label class="col-sm-3 control-label">风险单元:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJob.riskName}"> </div> </div> <div class="form-group" th:if="${hiddenDangerCheckJob.checkType=='1'}"> <label class="col-sm-3 control-label">基础清单名称:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJob.riskName}"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">执行人:</label> <div class="form-control-static" th:text="${hiddenDangerCheckJob.executeUserName}"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">执行时间:</label> <div class="form-control-static" th:text="${#dates.format(hiddenDangerCheckJob.startTime, 'yyyy-MM-dd HH:mm:ss')}"> </div> </div> </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> src/main/resources/templates/tr/specialCheckTaskLog/edit.html
@@ -13,9 +13,9 @@ <!-- <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">风险分析对象:</label> <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"> <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> @@ -62,7 +62,7 @@ var prefix = ctx + "tr/specialCheckTaskLog"; $("input[name='checkDate']").datetimepicker({ format: "yyyy-MM-dd", format: "yyyy-mm-dd", minView: "month", autoclose: true }); src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html
@@ -44,7 +44,7 @@ url: prefix + "/list", detailUrl: "/tr/specialCheckTaskLog/{id}", createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", updateUrl: "/tr/specialCheckItemDangerLog/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", sortName: "createTime", @@ -106,6 +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> '); return actions.join(''); } }]