代码优化
This commit is contained in:
parent
5c1a62b69e
commit
cb52ee8c97
|
|
@ -305,9 +305,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
childMap.put("title", deptName);
|
||||
childMap.put("mergeType", "colspan");
|
||||
childMap.put("num", num);
|
||||
if (isEdit) {
|
||||
/* if (isEdit) {
|
||||
childMap.put("edit", "text");
|
||||
}
|
||||
}*/
|
||||
childMap.put("field", setTemplateBean.getParentId() + "-" + setTemplateBean.getId() + "-" + deptId);
|
||||
list.add(childMap);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Demo</title>
|
||||
<link rel="stylesheet" href="../../../layui/css/layui.css" />
|
||||
<link rel="stylesheet" href="../../../layui/css/layui.css"/>
|
||||
<style>
|
||||
.dialog-title {
|
||||
padding: 12px 6px;
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<form class="layui-form layui-form-pane fromData" action="">
|
||||
<form class="layui-form layui-form-pane fromData" action="">
|
||||
<div style="width: 100%;overflow:auto">
|
||||
<table class="layui-table" id="baseTable" lay-filter="baseTable" style="overflow-x: auto;">
|
||||
</table>
|
||||
|
|
@ -36,15 +36,15 @@
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<script src="../../../js/publicJs.js"></script>
|
||||
<script src="../../../js/common_methon.js"></script>
|
||||
<script src="../../../js/common.js"></script>
|
||||
<script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script>
|
||||
<script type="text/javascript" src="../../../js/jq.js"></script>
|
||||
<script type="text/javascript" src="../../../js/my/permission.js"></script>
|
||||
<script src="../../../layui/layui.js"></script>
|
||||
<script>
|
||||
</form>
|
||||
<script src="../../../js/publicJs.js"></script>
|
||||
<script src="../../../js/common_methon.js"></script>
|
||||
<script src="../../../js/common.js"></script>
|
||||
<script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script>
|
||||
<script type="text/javascript" src="../../../js/jq.js"></script>
|
||||
<script type="text/javascript" src="../../../js/my/permission.js"></script>
|
||||
<script src="../../../layui/layui.js"></script>
|
||||
<script>
|
||||
let headerRows;
|
||||
let layer, laydate, table, form;
|
||||
let tableLoading, tableIns;
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
table = layui.table;
|
||||
form = layui.form;
|
||||
//自定义loading
|
||||
tableLoading = layer.load(2, { shade: [0.1, '#fff'] });
|
||||
tableLoading = layer.load(2, {shade: [0.1, '#fff']});
|
||||
initTable();
|
||||
form.on('submit(formDemo)', function (data) {
|
||||
getTableData();
|
||||
|
|
@ -206,16 +206,8 @@
|
|||
cols.each(function (index, item) {
|
||||
//对field为subName,proName 的列不进行设置
|
||||
if (index > 2 && index != cols.length - 1) {
|
||||
$(this).data('edit', 'false');
|
||||
$(this).removeAttr('data-edit');
|
||||
// $(this).addClass('layui-disabled');
|
||||
//将td元素的contentEditable属性设置为false,禁止编辑
|
||||
$(this).attr('contentEditable', 'false');
|
||||
//将td元素的style属性设置为pointer-events: none,禁止点击
|
||||
$(this).css('pointer-events', 'none');
|
||||
delete item.dataset.edit
|
||||
let fileDom = '';
|
||||
|
||||
console.log(item, 'item')
|
||||
let dataId = $(this).data('field')
|
||||
if (item1[`${dataId}-file`] && item1[`${dataId}-file`]['fileName'] != '') {
|
||||
$(this).find('.layui-table-cell').append(`<i class="layui-icon layui-icon-file-b file-icon" data-index="${i}" data-id="${dataId}" style="margin-left:6px;cursor:pointer"></i> `)
|
||||
|
|
@ -403,8 +395,6 @@
|
|||
merge(res, columsName, columsIndex);
|
||||
|
||||
|
||||
|
||||
|
||||
$(document).on('click', '.upload-success i', function () {
|
||||
var dataIndex = $(this).data('index');
|
||||
var Index = $(this).data('idx');
|
||||
|
|
@ -440,85 +430,21 @@
|
|||
});
|
||||
}
|
||||
});
|
||||
|
||||
// $(document).on('click', '#baseTable .file-icon', function () {
|
||||
// var dataId = $(this).data('id');
|
||||
// var dataIndex = $(this).data('index');
|
||||
// console.log('dataIndex图标', dataIndex)
|
||||
// console.log('dataId图标', dataId)
|
||||
// console.log('tableRowList图标', tableRowList[dataIndex])
|
||||
// })
|
||||
// 单元格普通编辑事件
|
||||
// table.on('edit(baseTable)', function (obj) {
|
||||
// var value = obj.value // 得到修改后的值
|
||||
// var data = obj.data // 得到所在行所有键值
|
||||
// var field = obj.field; // 得到字段
|
||||
// //判断修改的是当前行的第几个单元格
|
||||
// let index = headerRows[2].findIndex(item => item.field === field);
|
||||
// //获取其对应的二级标题 用于计算
|
||||
// let currentItem = headerRows[1][index];
|
||||
// let standardScore = Number(currentItem.standardScore);
|
||||
// //是否包含前缀0
|
||||
// if (value.indexOf('0') === 0 && value.length > 1) {
|
||||
// layer.msg('输入值不能以0开头');
|
||||
// //清空当前单元格
|
||||
// obj.update({
|
||||
// [field]: ''
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// //判断是否数字
|
||||
// if (value < 0) {
|
||||
// layer.msg('输入值不能小于0');
|
||||
// //清空当前单元格
|
||||
// obj.update({
|
||||
// [field]: ''
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!isPositiveInteger(value)) {
|
||||
// layer.msg('请输入正整数');
|
||||
// //清空当前单元格
|
||||
// obj.update({
|
||||
// [field]: ''
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (value > standardScore) {
|
||||
// layer.msg('输入值不能大于标准值');
|
||||
// //清空当前单元格
|
||||
// obj.update({
|
||||
// [field]: ''
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// // // 更新数据中对应的字段
|
||||
// let update = {};
|
||||
// update[field] = value;
|
||||
// obj.update(update);
|
||||
// });
|
||||
}
|
||||
|
||||
$(document).on('click', '.layui-table-cell', function (e) {
|
||||
console.log('点击了单元格')
|
||||
var dataId = $(this).data('id');
|
||||
var dataIndex = $(this).data('index');
|
||||
|
||||
// 判断是否有文件图标
|
||||
if ($(this).find('.file-icon').length > 0) {
|
||||
var dataId = $(this).find('.file-icon').data('id');
|
||||
var dataIndex = $(this).find('.file-icon').data('index');
|
||||
console.log('File icon clicked', {
|
||||
dataIndex: dataIndex,
|
||||
dataId: dataId,
|
||||
rowData: tableRowList[dataIndex]
|
||||
});
|
||||
|
||||
// 获取文件信息
|
||||
const fileInfo = tableRowList[dataIndex][`${dataId}-file`];
|
||||
if (fileInfo && fileInfo.fileName) {
|
||||
// 这里添加你的文件查看/下载逻辑
|
||||
layer.msg(`文件名: ${fileInfo.fileName}`);
|
||||
|
||||
// 示例:在新窗口打开文件
|
||||
window.open(ctxPath + '/file/download?path=' + encodeURIComponent(fileInfo.filePath));
|
||||
} else {
|
||||
layer.msg('未找到文件');
|
||||
window.open(ctxPath +"/statics/"+ tableRowList[dataIndex][`${dataId}-file`].filePath.split('/upload/')[1])
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -615,4 +541,4 @@
|
|||
parent.search(1)
|
||||
parent.layer.close(index); // 再执行关闭
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
Loading…
Reference in New Issue