src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -106,7 +106,8 @@ { TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId); mmap.put("specialCheckTaskLog",specialCheckTaskLogByIndexId); List<RiskList> riskList = riskListService.listHazardSource(); mmap.put("hazardList", riskList); List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask(); mmap.put("tbBaseCheckTask", listResult); return prefix + "/edit"; src/main/resources/templates/tr/specialCheckTaskLog/add.html
@@ -8,10 +8,10 @@ <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">风险分析对象：</label> <label class="col-sm-3 control-label is-required">风险分析对象：</label> <div class="col-sm-8"> <select id="hazardSource" name="hazardSource" class="form-control"> <option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}"></option> <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> @@ -28,11 +28,11 @@ </div> </div> <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"> <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"> <input name="checkDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required> </div> </div> </div> src/main/resources/templates/tr/specialCheckTaskLog/detail.html
@@ -100,28 +100,11 @@ </div> <th:block th:include="include :: footer"/> <script th:inline="javascript"> $(function () { var hiddenDangerCheckJob = [[${hiddenDangerCheckJob}]]; var typeCycleNum = hiddenDangerCheckJob.troubleshootTypeCycleNum; var typeCycleType = hiddenDangerCheckJob.troubleshootTypeCycleType; var typeCycleTypeLabel = ""; if (typeCycleType == "1") { typeCycleTypeLabel = "小时"; } else if (typeCycleType == "2") { typeCycleTypeLabel = "日"; } else if (typeCycleType == "3") { typeCycleTypeLabel = "周"; } else if (typeCycleType == "4") { typeCycleTypeLabel = "月"; } else if (typeCycleType == "5") { typeCycleTypeLabel = "年"; } var troubleshootCycleInfo = typeCycleNum + typeCycleTypeLabel + "1次"; $("#troubleshootCycleInfo").text(troubleshootCycleInfo); var prefix = ctx + "tr/specialCheckTaskLog"; $("input[name='checkDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); </script> src/main/resources/templates/tr/specialCheckTaskLog/edit.html
@@ -6,18 +6,17 @@ </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="${specialCheckTask}"> <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}"/> <!-- <input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>--> <div class="form-group"> <label class="col-sm-3 control-label">风险分析对象：</label> <div class="col-sm-8"> <select id="hazardSource" name="hazardSource" class="form-control"> <option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}" th:field="*{hazardSource}"></option> <select id="hazardCode" name="hazardCode" th:field="*{hazardCode}" class="form-control"> <option th:each="hazard : ${hazardList}" th:text="${hazard.riskListName}" th:value="${hazard.riskListNum}"></option> </select> </div> </div> @@ -34,11 +33,11 @@ </div> </div> <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"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <input name="checkDate" th:value="${#dates.format(specialCheckTask.checkDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="checkDate" th:value="${#dates.format(specialCheckTaskLog.checkDate, 'yyyy-MM-dd')}" class="form-control" type="text" required> </div> </div> </div> @@ -61,12 +60,14 @@ <th:block th:include="include :: datetimepicker-js"/> <script th:inline="javascript"> var prefix = ctx + "tr/specialCheckTaskLog"; $("input[name='checkDate']").datetimepicker({ format: "yyyy-mm-dd", format: "yyyy-MM-dd", minView: "month", autoclose: true }); $("#form-job-edit").validate({ onkeyup: false, focusCleanup: true src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html
@@ -78,7 +78,7 @@ }, { field: 'hazardSource', title: '风险分析对象编码' title: '风险分析对象' }, { field: 'checkType', @@ -143,7 +143,6 @@ align: 'center', formatter: function (value, row, index) { var actions = []; actions.push("<a class='btn btn-default btn-xs' href='#' onclick='jobLog(" + row.indexId + ")'><i class='fa fa-list'></i>获取indexId</a>"); 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(''); @@ -158,9 +157,6 @@ // 所属风险单元 search.id = $("#riskId").val(); return search; } function jobLog(indexId) { console.log(indexId,'indexId') } </script> </body>
