monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ffbf99e6dc015d3a3c2758f49a90b9eeba95ee71 2 parents c81d29b6 588c760a

Merge branch 'master-mj-yjpnew' into 'master-mj' 

fix:工作日志样式优化调整3



See merge request !1197
Inline Side-by-side
Showing 3 changed files with 18 additions and 17 deletions
... ... @@ -63,7 +63,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$dom.removeClass("active")
}
})
//reloadAllChange()
reloadAllChange()
}
}
});
... ... @@ -125,21 +125,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$("#btns-workreport-time button").removeClass("active");
$(this).addClass("active");
createTime = ($(this).data("period"))
//reloadAllChange();
reloadAllChange();
});
// 回车搜索
/* $('[lay-filter="form-workreport-condition"] input').keydown(function (e) {
$('[lay-filter="form-workreport-condition"] input').keydown(function (e) {
if (e.keyCode === 13) {
reloadAllChange();
}
});*/
});
// 单选框改变搜索
//form.on('radio(workReport-currIsRead)', reloadAllChange);
//form.on('radio(workReport-repType)', reloadAllChange);
form.on('radio(workReport-currIsRead)', reloadAllChange);
form.on('radio(workReport-repType)', reloadAllChange);
// 下拉框改变搜索
//form.on('select(slt-workreport-group)', reloadAllChange);
//form.on('select(slt-workreport-user)', reloadAllChange);
form.on('select(slt-workreport-group)', reloadAllChange);
form.on('select(slt-workreport-user)', reloadAllChange);
// 勾选标记为已读事件
$('#btn-workreport-set-read').click(function () {
... ... @@ -162,9 +162,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}
});
});
$("#orgSearchBtn").on("click",function () {
reloadAllChange();
});
// 加载工作汇报表格
function loadWorkReportTable() {
var conditions = form.val('form-workreport-condition');
... ...
... ... @@ -19,7 +19,7 @@
<div class="layui-status search_panel">
<form class="layui-form layui-card-header layuiadmin-card-header-auto"
lay-filter="workReport-form" onsubmit="return false;">
<div class="layui-form-item">
<div class="layui-form-item" style="width: 100%">
<div class="layui-inline">
<div class="layui-input-inline">
<input autocomplete="off" class="layui-input" id="workReport_title"
... ... @@ -27,7 +27,7 @@
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline auto-width">
<div class="layui-input-inline auto-width" style="border-style: none!important;">
<input checked lay-filter="workReport_isRead" name="isRead" title="全部" type="radio"
value="">
<input lay-filter="workReport_isRead" name="isRead" title="无人阅读" type="radio"
... ... @@ -37,7 +37,7 @@
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline auto-width">
<div class="layui-input-inline auto-width" style="border-style: none!important;">
<input checked lay-filter="workReport_type" name="repType" title="全部" type="radio"
value="">
<input lay-filter="workReport_type" name="repType" title="日报" type="radio"
... ... @@ -71,9 +71,11 @@
type="button">全部
</button>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
</div>
<div class="layui-card-body">
... ...
... ... @@ -43,7 +43,7 @@
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline auto-width" >
<div class="layui-input-inline auto-width" style="border-style: none!important;" >
<input checked="checked" lay-filter="workReport-repType" name="repType" title="日报" type="radio"
value="day">
<input lay-filter="workReport-repType" name="repType" title="周报" type="radio"
... ... @@ -81,9 +81,10 @@
type="button">全部
</button>
</div>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
</div>
... ...