Tenlion/twoduty
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

指标库新增web页面树形接口

Browse Source
This commit is contained in:
ly19960718 2021-04-15 14:43:16 +08:00
parent 6a009f67a0
commit 88193bd0a8
5 changed files with 491 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java
View File

@ -30,6 +30,11 @@ public class IndexGeneralDTO {
private String indexGeneralImage;
@ApiModelProperty(name = "auditStatus", value = "审核状态")
private Integer auditStatus;
@ApiModelProperty(name = "gmtCreate", value = "创建时间")
private String gmtCreate;
@ApiModelProperty(name = "creatorName", value = "创建人")
private String creatorName;
public String getIndexGeneralId() {
return indexGeneralId == null ? "" : indexGeneralId.trim();
@ -95,4 +100,20 @@ public class IndexGeneralDTO {
public void setAuditStatus(Integer auditStatus) {
this.auditStatus = auditStatus;
}
public String getGmtCreate() {
return gmtCreate;
}
public void setGmtCreate(String gmtCreate) {
this.gmtCreate = gmtCreate;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
}

21
src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml
View File

@ -5,11 +5,14 @@
<resultMap id="indexGeneralDTO" type="com.tenlion.twoduty.pojo.dtos.indexgeneral.IndexGeneralDTO">
<result column="index_general_id" property="indexGeneralId"/>
<result column="index_lib_id" property="indexLibId"/>
<result column="index_lib_name" property="indexLibName"/>
<result column="index_general_title" property="indexGeneralTitle"/>
<result column="index_general_content" property="indexGeneralContent"/>
<result column="index_general_file" property="indexGeneralFile"/>
<result column="index_general_image" property="indexGeneralImage"/>
<result column="audit_status" property="auditStatus"/>
<result column="creator_name" property="creatorName"/>
<result column="gmt_create" property="gmtCreate"/>
</resultMap>
<resultMap id="indexGeneralBO" type="com.tenlion.twoduty.pojo.bos.indexgeneral.IndexGeneralBO">
@ -139,9 +142,14 @@
t1.index_general_file,
t1.index_general_image,
t1.audit_status,
t1.index_general_id
t1.index_general_id,
t1.gmt_create,
t1.creator,
t2.index_lib_name
FROM
duty_index_general t1
LEFT JOIN duty_index_lib t2
ON t1.index_lib_id = t2.index_lib_id
WHERE
t1.is_delete = 0
<if test="indexGeneralId != null and indexGeneralId != ''">
@ -209,15 +217,19 @@
t1.index_general_content,
t1.index_general_file,
t1.index_general_image,
t1.audit_status
t1.audit_status,
t1.gmt_create,
t1.creator,
t2.index_lib_name
FROM
duty_index_general t1
LEFT JOIN duty_index_lib t2
ON t1.index_lib_id = t2.index_lib_id
WHERE
t1.is_delete = 0
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.index_general_title LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
@ -241,6 +253,7 @@
<if test="auditStatus != null and auditStatus != ''">
AND t1.audit_status = #{auditStatus}
</if>
ORDER BY t1.gmt_create DESC
</select>
<!-- 列表 -->

118
src/main/resources/static/route/indexGeneral/list.html
View File

@ -26,6 +26,15 @@
<div class="layui-inline">
<input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
</div>
<div class="layui-inline search-item layui-form">
<select name="auditStatus" id="auditStatus">
<option value="">全部</option>
<option value="0">待审核</option>
<option value="1">审核通过</option>
<option value="2">归档</option>
<option value="-1" >审核不通过</option>
</select>
</div>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -72,8 +81,17 @@
},
cols: [
[
{type:'checkbox', fixed: 'left'},
/*{type:'checkbox', fixed: 'left'},*/
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'indexLibName', width: 250, title: '指标名称', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'indexGeneralTitle', width: 250, title: '上报标题', align:'center',
templet: function(row) {
var rowData = row[this.field];
@ -126,6 +144,24 @@
return downloadFile;
}
},
{field: 'creatorName', width: 100, title: '上报人', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'gmtCreate', width: 200, title: '上报时间', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'auditStatus', width: 100, title: '状态', align:'center',fixed: 'right',
templet: function(row) {
var rowData = row[this.field];
@ -146,11 +182,14 @@
},
{field: 'cz', width: 200, title: '操作', align:'center',fixed: 'right',
templet: function(row) {
var rowData = '<div class="layui-btn-group">' +
'<button type="button" class="layui-btn layui-btn-xs" lay-event="show">查看</button>' +
'<button type="button" class="layui-btn layui-btn-xs" lay-event="update">编辑</button>' +
'<button type="button" class="layui-btn layui-btn-xs" lay-event="auditList">审核记录</button>' +
'</div>';
var auditStatus = row['auditStatus'];
var rowData = '<div class="layui-btn-group">';
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="show">查看</button>';
if (auditStatus === -1) {
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="update">编辑</button>';
}
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>'
rowData +='</div>';
return rowData;
}
}
@ -170,11 +209,12 @@
// 重载表格
function reloadTable(currentPage) {
table.reload('dataTable', {
url: top.restAjax.path(tableUrl, []),
url: top.restAjax.path(tableUrl, [indexLibId]),
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
auditStatus: $('#auditStatus').val()
},
page: {
curr: currentPage
@ -281,6 +321,68 @@
}
}
});
table.on('tool(dataTable)', function(obj) {
var layEvent = obj.event;
var data = obj.data;
if(layEvent === 'show') {
layer.open({
type: 2,
title: false,
closeBtn: 0,
area: ['100%', '100%'],
shadeClose: true,
anim: 2,
content: top.restAjax.path('route/indexGeneral/show.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]),
end: function() {
reloadTable();
}
});
} else if(layEvent === 'update') {
layer.open({
type: 2,
title: false,
closeBtn: 0,
area: ['100%', '100%'],
shadeClose: true,
anim: 2,
content: top.restAjax.path('route/indexgeneral/update.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]),
end: function() {
reloadTable();
}
});
} else if (layEvent === 'audithistory') {
layer.open({
type: 2,
title: false,
closeBtn: 0,
area: ['100%', '100%'],
shadeClose: true,
anim: 2,
content: top.restAjax.path('', [data.indexGeneralId]),
end: function() {
reloadTable();
}
});
}
// else if(layEvent === 'removeEvent') {
// if(checkDatas.length === 0) {
// top.dialog.msg(top.dataMessage.table.selectDelete);
// } else {
// var ids = '';
// for(var i = 0, item; item = checkDatas[i++];) {
// if(i > 1) {
// ids += '_';
// }
// ids += item['indexGeneralId'];
// }
// removeData(ids);
// }
// }
});
});
</script>
</body>

341
src/main/resources/static/route/indexGeneral/show.html Normal file
View File

@ -0,0 +1,341 @@
<!doctype html>
<html lang="en">
<head>
<base href="/twoduty/">
<meta charset="utf-8">
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
<a href="javascript:void(0);"><cite>查看内容</cite></a>
</span>
</div>
<div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-form-item">
<label class="layui-form-label">所属指标</label>
<div class="layui-input-block">
<input type="hidden" id="indexLibId" name="indexLibId">
<input type="text" id="indexLibName" name="indexLibName" class="layui-input" readonly="readonly">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">上报标题</label>
<div class="layui-input-block">
<input type="text" id="indexGeneralTitle" name="indexGeneralTitle" class="layui-input" value="" placeholder="请输入上报标题" maxlength="255" readonly="readonly">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">上报正文</label>
<div class="layui-input-block">
<textarea id="indexGeneralContent" name="indexGeneralContent" class="layui-textarea" placeholder="请输入上报正文" readonly="readonly"></textarea>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">上报文件</label>
<div class="layui-input-block">
<input type="hidden" id="indexGeneralFile" name="indexGeneralFile">
<div class="layui-btn-container" id="indexGeneralFileFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="indexGeneralFileFileDownload" type="text/html">
{{# var fileName = 'indexGeneralFile'; }}
{{# if(d[fileName] != '') { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<span class="layui-btn-group">
<div class="upload-file-box">
<a class="upload-file-a" href="route/file/download/false/{{item.fileId}}" title="{{item.fileName}} - 点击下载">
{{# if(item.fileType == 'doc' || item.fileType == 'docx') { }}
<img src="assets/images/filetype/word.png"/>
{{# } else if(item.fileType == 'xls' || item.fileType == 'xlsx') { }}
<img src="assets/images/filetype/excel.png"/>
{{# } else if(item.fileType == 'ppt' || item.fileType == 'pptx') { }}
<img src="assets/images/filetype/ppt.png"/>
{{# } else if(item.fileType == 'apk') { }}
<img src="assets/images/filetype/apk.png"/>
{{# } else if(item.fileType == 'pdf') { }}
<img src="assets/images/filetype/pdf.png"/>
{{# } else if(item.fileType == 'rar') { }}
<img src="assets/images/filetype/rar.png"/>
{{# } else if(item.fileType == 'zip') { }}
<img src="assets/images/filetype/zip.png"/>
{{# } else if(item.fileType == 'txt') { }}
<img src="assets/images/filetype/txt.png"/>
{{# } else { }}
<img src="assets/images/filetype/file.png"/>
{{# } }}
</a>
<span class="upload-file-title">{{item.fileName}}</span>
<!--<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-file" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="indexGeneralFileRemoveFile">-->
<!--<i class="fa fa-trash-o"></i>-->
<!--</a>-->
</div>
</span>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 9) { }}
<!--<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">-->
<!--<a href="javascript:void(0);" lay-form-button data-explain="上报文件" data-name="indexGeneralFile" lay-filter="indexGeneralFileUploadFile">-->
<!--<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>-->
<!--</a>-->
<!--</div>-->
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">上报图片</label>
<div class="layui-input-block">
<input type="hidden" id="indexGeneralImage" name="indexGeneralImage">
<div class="layui-btn-container" id="indexGeneralImageFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="indexGeneralImageFileDownload" type="text/html">
{{# var fileName = 'indexGeneralImage'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="upload-image-box">
<span class="upload-image-span">
<img src="route/file/download/false/{{item.fileId}}" align="加载失败">
</span>
<!--<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="indexGeneralImageRemoveFile">-->
<!--<i class="fa fa-trash-o"></i>-->
<!--</a>-->
</div>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 9) { }}
<!--<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">-->
<!--<a href="javascript:void(0);" lay-form-button data-explain="上报图片" data-name="indexGeneralImage" lay-filter="indexGeneralImageUploadFile">-->
<!--<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>-->
<!--</a>-->
<!--</div>-->
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">
<button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script src="assets/layuiadmin/layui/layui.js"></script>
<script>
layui.config({
base: 'assets/layuiadmin/' //静态资源所在路径
}).extend({
index: 'lib/index' //主入口模块
}).use(['index', 'form', 'laydate', 'laytpl'], function(){
var $ = layui.$;
var form = layui.form;
var laytpl = layui.laytpl;
var laydate = layui.laydate;
var indexGeneralId = top.restAjax.params(window.location.href).indexGeneralId;
var wangEditor = window.wangEditor;
var wangEditorObj = {};
var viewerObj = {};
function closeBox() {
parent.layer.close(parent.layer.getFrameIndex(window.name));
}
function refreshDownloadTemplet(fileName, file) {
var dataRander = {};
dataRander[fileName] = file;
laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
document.getElementById(fileName +'FileBox').innerHTML = html;
});
}
// 初始化文件列表
function initFileList(fileName, ids, callback) {
var dataForm = {};
dataForm[fileName] = ids;
form.val('dataForm', dataForm);
if(!ids) {
refreshDownloadTemplet(fileName, []);
if(callback) {
callback(fileName, []);
}
return;
}
top.restAjax.get(top.restAjax.path('api/file/list', []), {
ids: ids
}, null, function(code, data) {
refreshDownloadTemplet(fileName, data);
if(callback) {
callback(fileName, data);
}
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化视频
function initVideo(fileName, data) {
for(var i = 0, item; item = data[i++];) {
var player = new ckplayer({
container: '#'+ fileName + i,
variable: 'player',
flashplayer: false,
video: {
file: 'route/file/download/true/'+ item.fileId,
type: 'video/mp4'
}
});
}
}
// 初始化上报文件文件上传
function initIndexGeneralFileUploadFile() {
var files = $('#indexGeneralFile').val();
initFileList('indexGeneralFile', files);
form.on('button(indexGeneralFileUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'file',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function() {});
}
}
});
});
form.on('button(indexGeneralFileRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files);
});
}
// 初始化上报图片图片上传
function initIndexGeneralImageUploadFile() {
var files = $('#indexGeneralImage').val();
initFileList('indexGeneralImage', files, function(fileName) {
var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
viewerObj[fileName] = viewer;
});
form.on('button(indexGeneralImageUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'image',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
});
}
}
});
});
form.on('button(indexGeneralImageRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
});
});
}
// 初始化内容
function initData() {
var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/indexgeneral/get/{indexGeneralId}', [indexGeneralId]), {}, null, function(code, data) {
var dataFormData = {};
for(var i in data) {
dataFormData[i] = data[i] +'';
}
form.val('dataForm', dataFormData);
form.render(null, 'dataForm');
initIndexGeneralFileUploadFile();
initIndexGeneralImageUploadFile();
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {
loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
}, function() {
top.dialog.close(loadLayerIndex);
});
}
initData();
$('.close').on('click', function() {
closeBox();
});
// 校验
form.verify({
});
});
</script>
</body>
</html>

10
src/main/resources/static/route/indexGeneral/update.html
View File

@ -25,8 +25,8 @@
<div class="layui-form-item">
<label class="layui-form-label">所属指标</label>
<div class="layui-input-block">
<input type="hidden" id="dutyIndexLibId" name="dutyIndexLibId">
<input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
<input type="hidden" id="indexLibId" name="indexLibId">
<input type="text" id="indexLibName" name="indexLibName" class="layui-input" readonly="readonly">
</div>
</div>
<div class="layui-form-item">
@ -122,12 +122,6 @@
</script>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<input type="text" id="gmtCreate" name="gmtCreate" class="layui-input" value="" placeholder="请选择" lay-verify="required" readonly style="cursor: pointer;">
</div>
</div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">