From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html | 277 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 204 insertions(+), 73 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
index 3b6da7f..0323501 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
@@ -45,7 +45,20 @@
<input name="dangerName" class="form-control" type="text" required>
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">排查方法：</label>
+ <div class="col-sm-8">
+ <select name="remark" class="form-control m-b" required>
+ <option style="display: none"></option>
+ <option value="查现场">查现场</option>
+ <option value="查行为">查行为</option>
+ <option value="查事故">查事故</option>
+ <option value="查图纸">查图纸</option>
+ <option value="查制度">查制度</option>
+ <option value="查标准">查标准</option>
+ </select>
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">隐患描述：</label>
<div class="col-sm-8">
@@ -93,63 +106,39 @@
<label class="col-sm-3 control-label">隐患整改前照片：</label>
<div class="col-sm-8">
<input name="preRectifyPhoto" id="preRectifyPhoto" type="hidden">
- <button type="button" class="layui-btn" id="preRectifyPhotoUpload">上传</button>
- <div class="layui-upload-list">
- <img class="layui-upload-img" style="width: 92px; height: 92px;" id="ThumbImg">
- <p id="msgText"></p>
- </div>
+<!-- <button type="button" class="layui-btn" id="preRectifyPhotoUpload">上传</button>-->
+<!-- <div class="layui-upload-list">-->
+<!-- <img class="layui-upload-img" style="width: 92px; height: 92px;" id="ThumbImg">-->
+<!-- <p id="msgText"></p>-->
+<!-- </div>-->
+ <button type="button" class="layui-btn layui-btn-normal" id="preChooseList">选择文件(不超过3张)</button>
+ <button type="button" class="layui-btn" id="preUpAction">确认上传(上传后不可修改)</button>
+ <div id="preFileList"></div>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label is-required">判定人：</label>
+ <label class="col-sm-3 control-label is-required">隐患责任人（判定人）：</label>
<div class="col-sm-8">
- <input id="judgeUserName" name="judgeUserName" placeholder="选择判定人" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
+ <input id="judgeUserName" name="judgeUserName" placeholder="选择隐患责任人（判定人）" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
<input id="judgeUserId" name="judgeUserId" type="hidden">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label is-required">风险对象分析编码：</label>
+ <label class="col-sm-3 control-label is-required">隐患发现时间：</label>
<div class="col-sm-8">
- <textarea name="hazardCode" maxlength="500" class="form-control" rows="3" required></textarea>
+ <input name="findTime" placeholder="请选择隐患发现时间" class="form-control" type="text"
+ readonly="readonly" required>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label is-required">隐患来源：</label>
+ <label class="col-sm-3 control-label is-required">检查人：</label>
<div class="col-sm-8">
- <select name="dangerSrc" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" required>
- <option value="">--请选择隐患来源--</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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="hazardDangerType" class="form-control m-b" th:with="type=${@dict.getType('danger_type')}" required>
- <option value="">--请选择隐患类型--</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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="dangerResult" class="form-control m-b" th:with="type=${@dict.getType('danger_result')}" required>
- <option value="">--请选择隐患造成后果--</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </div>
- </div>
-
- <div class="form-group">
- <label class="col-sm-3 control-label is-required">隐患原因：</label>
- <div class="col-sm-8">
- <textarea name="dangerReason" maxlength="500" class="form-control" rows="3" required></textarea>
+ <input id="checkPerson" name="checkPerson" placeholder="选择检查人" class="form-control" type="text" onclick="selectCheckPerson()" maxlength="30" readonly="true" required>
+<!-- <input id="checkPersonId" name="checkPersonId" type="hidden">-->
</div>
</div>
</form>
@@ -230,7 +219,7 @@
}
- /*判定人 选择 start*/
+ /*隐患责任人 选择 start*/
function selectJudgeUser() {
var url = ctx + "system/user/selectUserListByParentSonCompany";
var options = {
@@ -249,7 +238,26 @@
});
});
}
- /*判定人 选择 end*/
+ /*隐患责任人 选择 end*/
+
+ function selectCheckPerson() {
+ 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");
+ // $("#checkPersonId").val(userId);
+ $("#checkPerson").val(userName);
+ layer.close(index);
+ });
+ });
+ }
var prefix = ctx + "tr/hiddenDangerCheck/dangerReport";
@@ -266,40 +274,163 @@
<!--layui图片文件上传-->
- layui.use('upload', function () {
- var $ = layui.jquery
- , upload = layui.upload;
+ // layui.use('upload', function () {
+ // var $ = layui.jquery
+ // , upload = layui.upload;
+ //
+ // //普通图片上传
+ // var uploadInst = upload.render({
+ // elem: '#preRectifyPhotoUpload'
+ // , url: ctx + 'tr/upload'
+ // , before: function (obj) {
+ // //预读本地文件示例，不支持ie8
+ // obj.preview(function (index, file, result) {
+ // $('#ThumbImg').attr('src', result); //图片链接（base64）
+ // });
+ // }
+ // , done: function (res) {
+ // //如果上传失败
+ // if (res.code > 0) {
+ // return layer.msg('上传失败');
+ // }
+ // //上传成功
+ // $('#preRectifyPhoto').val(res.imageUrl);
+ // }
+ // , error: function () {
+ // //演示失败状态，并实现重传
+ // var msgText = $('#msgText');
+ // msgText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+ // msgText.find('.demo-reload').on('click', function () {
+ // uploadInst.upload();
+ // });
+ // }
+ // });
+ // });
- //普通图片上传
- var uploadInst = upload.render({
- elem: '#preRectifyPhotoUpload'
- , url: ctx + 'tr/upload'
- , before: function (obj) {
- //预读本地文件示例，不支持ie8
- obj.preview(function (index, file, result) {
- $('#ThumbImg').attr('src', result); //图片链接（base64）
- });
- }
- , done: function (res) {
- //如果上传失败
- if (res.code > 0) {
- return layer.msg('上传失败');
- }
- //上传成功
- $('#preRectifyPhoto').val(res.imageUrl);
- }
- , error: function () {
- //演示失败状态，并实现重传
- var msgText = $('#msgText');
- msgText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
- msgText.find('.demo-reload').on('click', function () {
- uploadInst.upload();
- });
- }
- });
+ $("input[name='findTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
});
+ layui.use('upload', function() {
+ var $ = layui.jquery;
+ upload = layui.upload;
+ var uploadList = {};
+ var urls = []
+ //多文件列表示例
+ var preFileListDom = $('#preFileList')
+ var uploadListIns = upload.render({
+ elem: '#preChooseList',
+ url: ctx + 'tr/upload' ,
+ accept: 'file',
+ multiple: true,
+ number: 3,
+ auto: false,
+ bindAction: '#preUpAction',
+ choose: function(obj) {
+ // 展示上传按钮
+ $('#preUpAction').show();
+ // 将每次选择的文件追加到文件队列
+ uploadList = obj.pushFile();
+ const len = preFileListDom.find('.file-list-item1').length;
+ // 还可以上传的文件数量
+ const limit = 3 - len;
+ var number = 0;
+ // 预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
+ obj.preview(function(index, file, result){
+ if (number < limit){
+ number++;
+ appendFile(index, file.name, result);
+ }else{
+ deleteTempFile(index)
+ }
+ })
+ },
+ // before: function(obj){
+ // layer.load(1);
+ // },
+ //上传完毕回调
+ //当文件全部被提交后，才触发
+ allDone: function (obj) {
+ layer.msg("已上传 "+obj.successful+" 个文件");
+ layer.closeAll('loading');
+ deleteTempFile(0)
+ },
+ done: function(res, index, upload){
+ preFileListDom.find('.file-temp1').each(function () {
+ if (!res || res.code > 0){
+ // 若上传失败，则直接移除
+ return layer.msg('上传失败');
+ $(this).remove();
+ }else{
+ //上传成功
+ // 添加上传返回的数据到对应的文件中
+ // var hidden = '<input type="hidden" name="path[]" value="'+res.imageUrl+'"/>';
+ // $(this).append(hidden);
+ // 修改预览文件样式
+ $(this).removeClass('file-temp1');
+ // $(this).find('.file-cancel').removeClass('layui-btn-primary');
+ // $(this).find('.file-cancel').addClass('layui-btn-danger');
+ // $(this).find('.file-cancel').val('删除');
+ $(this).find('.file-cancel1').remove();
+ $(this).find('.layui-badge1').remove();
+ urls.push(res.imageUrl)
+ }
+ $('#preRectifyPhoto').val(urls.join(','));
+ })
+ },
+ error: function(index, upload) {
+ var tr = preFileListDom.find('tr#upload-' + index),
+ tds = tr.children();
+ tds.eq(1).html('<span style="color: #FF5722;">上传失败</span>');
+ tds.eq(2).find('.demo-reload').removeClass('layui-hide'); //显示重传
+ }
+ });
+ // 预览选择的文件
+ function appendFile(index, name, result) {
+ const dom = '<div class="file-list-item1 file-temp1" data-index="'+index+'"><div><img src="'+result+'" alt="'+name+'"><span class="layui-badge1 layui-bg-blue">待上传</span></div>' +
+ '<div><input type="button" class="file-cancel1" value="删除"></div></div>';
+ preFileListDom.append(dom);
+ fileCancelEvent();
+ }
+ // 为待上传文件【取消】按钮添加点击事件
+ function fileCancelEvent() {
+ preFileListDom.find('.file-cancel1').each(function () {
+ const event = $._data($(this)[0],"events");
+ // 仅对未绑定事件的按钮进行绑定
+ if (!event || !event["click"]){
+ $(this).click(function () {
+ var fileDom = $(this).parent().parent();
+ var index = fileDom.data('index');
+ if (index){
+ deleteTempFile(index);
+ }
+ fileDom.remove();
+ })
+ }
+ })
+ }
+ // 删除待上传的文件（从文件队列中删除文件）
+ function deleteTempFile(index){
+ if (index === 0){
+ // 清空文件队列中所有数据
+ for (const key in uploadList) {
+ delete uploadList[key];
+ }
+ // 隐藏上传按钮
+ $('#preUpAction').hide();
+ }else{
+ delete uploadList[index];
+ var number = Object.keys(uploadList).length;
+ // 若上传文件队列中无数据则隐藏上传按钮
+ if (number <= 0){
+ $('#preUpAction').hide();
+ }
+ }
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.2