monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 7e0f33774ea3ebcd1feda1704f941c5b2a57bc93 2 parents 2dc9176e 0067d2c5

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

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
@@ -69,7 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -69,7 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
69 , even: true 69 , even: true
70 , cols: [[ 70 , cols: [[
71 {title: '序号', align: "center", type: 'numbers', width: '3%'} 71 {title: '序号', align: "center", type: 'numbers', width: '3%'}
72 - , {field: 'typeName', title: '通知类型', align: 'center', sort: true, width:130} 72 + , {field: 'typeName', title: '通知类型', align: 'center', sort: true, width: 130}
73 , { 73 , {
74 field: 'way', title: '通知方式', align: 'center', sort: true, width: 120, 74 field: 'way', title: '通知方式', align: 'center', sort: true, width: 120,
75 templet: function (d) { 75 templet: function (d) {
@@ -135,7 +135,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -135,7 +135,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
135 url: `${common.domainName}/api-web/notice/getNoticeUsers?access_token=${accessToken}`, 135 url: `${common.domainName}/api-web/notice/getNoticeUsers?access_token=${accessToken}`,
136 method: 'GET', 136 method: 'GET',
137 success: function (response) { 137 success: function (response) {
138 - if (response && response.success) { 138 + if (response && response.success && response.data.length > 0) {
139 userSelect = xmSelect.render({ 139 userSelect = xmSelect.render({
140 el: '#notice_user_list', 140 el: '#notice_user_list',
141 name: 'users', 141 name: 'users',
@@ -171,8 +171,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -171,8 +171,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
171 reloadData(); 171 reloadData();
172 } 172 }
173 }); 173 });
174 - } else {  
175 - layer.msg('获取资源类型失败', {icon: 2}); 174 + }else {
  175 + $('#notice_user_list_div').hide();
176 } 176 }
177 if (userSelect) { 177 if (userSelect) {
178 //追加样式 178 //追加样式
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </div> 36 </div>
37 </div> 37 </div>
38 <!--用户列表--> 38 <!--用户列表-->
39 - <div class="layui-inline"> 39 + <div class="layui-inline" id="notice_user_list_div">
40 <div class="layui-input-inline layui-input-inline--long"> 40 <div class="layui-input-inline layui-input-inline--long">
41 <div class="xm-select-demo" id="notice_user_list"></div> 41 <div class="xm-select-demo" id="notice_user_list"></div>
42 </div> 42 </div>