Merge remote-tracking branch 'origin/master'

This commit is contained in:
ly19960718 2021-05-12 16:56:42 +08:00
commit 13194c0fd8

View File

@ -10,6 +10,12 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"> <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" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-table-cell {
height: auto;
line-height: 50px;
}
</style>
</head> </head>
<body> <body>
<div class="layui-fluid layui-anim layui-anim-fadein"> <div class="layui-fluid layui-anim layui-anim-fadein">
@ -75,8 +81,8 @@
}, },
cols: [ cols: [
[ [
{type:'checkbox', fixed: 'left'}, {type:'checkbox',},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'}, {field:'rowNum', width:80, title: '序号', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'fieldName', width: 180, title: '考场', align:'center', {field: 'fieldName', width: 180, title: '考场', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
@ -133,7 +139,7 @@
loop:true loop:true
}); });
}, 50); }, 50);
return '<img style="height: 80px;width: 80px;" src="' + rowData + '" alt="' + row['distributionCardUserName'] + '">' return '<img style="height: 50px;width: 50px;" src="' + rowData + '" alt="' + row['distributionCardUserName'] + '">'
} }
}, },
] ]