Authored by 鲁尚清

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing
... ... @@ -69,7 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
, even: true
, cols: [[
{title: '序号', align: "center", type: 'numbers', width: '3%'}
, {field: 'typeName', title: '通知类型', align: 'center', sort: true, width:130}
, {field: 'typeName', title: '通知类型', align: 'center', sort: true, width: 130}
, {
field: 'way', title: '通知方式', align: 'center', sort: true, width: 120,
templet: function (d) {
... ... @@ -135,7 +135,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
url: `${common.domainName}/api-web/notice/getNoticeUsers?access_token=${accessToken}`,
method: 'GET',
success: function (response) {
if (response && response.success) {
if (response && response.success && response.data.length > 0) {
userSelect = xmSelect.render({
el: '#notice_user_list',
name: 'users',
... ... @@ -171,8 +171,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
reloadData();
}
});
} else {
layer.msg('获取资源类型失败', {icon: 2});
}else {
$('#notice_user_list_div').hide();
}
if (userSelect) {
//追加样式
... ...
... ... @@ -36,7 +36,7 @@
</div>
</div>
<!--用户列表-->
<div class="layui-inline">
<div class="layui-inline" id="notice_user_list_div">
<div class="layui-input-inline layui-input-inline--long">
<div class="xm-select-demo" id="notice_user_list"></div>
</div>
... ...