monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6afb972a4b383ccbe9c761e67068519c26c5ea5d 2 parents 84347706 db7af6c5

Merge branch 'master-mj-joke' into 'master-mj' 

fix:工作日志及工作日志查看页面优化

fix:工作日志及工作日志查看页面优化

See merge request !1113
Inline Side-by-side
Showing 4 changed files with 33 additions and 22 deletions
... ... @@ -141,9 +141,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
if (userName.length === 0) {
userName = ['无']
}
str = userName.toString()
if (str.length == 0) str = '无'
return `<div><span>${str}</span></div>`
return userName.toString();
}
},
{
... ...
... ... @@ -28,12 +28,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$dom.removeClass("active")
}
})*/
$.each($("button.isRead"), function (i, e) {
var $dom = $(e);
if ($dom.data("type") == '0') {
$dom.addClass("active")
}
})
// $.each($("button.isRead"), function (i, e) {
// var $dom = $(e);
// if ($dom.data("type") == '0') {
// $dom.addClass("active")
// }
// })
$.each($('input[name="repType"]'), function (i, e) {
var $dom = $(e);
if ($dom.val() == urlRepType) {
... ...
... ... @@ -8668,3 +8668,22 @@ form.layui-card-header.layuiadmin-card-header-auto {
#base-info-tips>.info-table>li span:nth-child(2n){
flex:2;
}
/*工作日志查看 已读，未读按钮样式*/
.layui-btn-group.read-group .layui-btn {
width: 60px;
height: 35px;
line-height: 35px;
}
.layui-btn-group.read-group .layui-btn:hover {
border: 1px solid #3B91FF;
background: #3B91FF;
color: #ffffff;
}
.layui-btn-group.read-group .layui-btn.active {
border: 1px solid #3B91FF;
background: #3B91FF;
color: #ffffff;
}
\ No newline at end of file
... ...
... ... @@ -138,22 +138,16 @@
<!-- <div class="pie-chart" id="chart-noRead-report"></div>-->
</div>
</div>
<div class="layui-card-body" style="margin-top: 30px;">
<div class="warn-btns">
<!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-read">
<i class="layui-icon">&#xe605;</i>勾选标记为已读
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-all-read">
<i class="layui-icon">&#xe605;</i>全部标记为已读
</button>-->
<button class="layui-btn layui-btn-sm layui-btn-normal isRead active" data-type="">
全部
<div class="layui-card-body " style="margin-top: 30px;">
<div class="warn-btns layui-btn-group read-group">
<button class="layui-btn layui-btn-sm layui-btn-primary isRead active" data-type="0">
未读
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal isRead" data-type="1">
<button class="layui-btn layui-btn-sm layui-btn-primary isRead" data-type="1">
已读
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal isRead" data-type="0">
未读
<button class="layui-btn layui-btn-sm layui-btn-primary isRead" data-type="">
全部
</button>
</div>
<table id="table-workreport-view" lay-filter="table-workreport-view"></table>
... ...