monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by ww
Commit 9dc552b172cb9bc8d35566d783be9fc65d7d4796 1 parent dd143163

fix: 配置段BUG修改

Inline Side-by-side
Showing 8 changed files with 43 additions and 36 deletions
@@ -1181,34 +1181,40 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1181,34 +1181,40 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1181 }); 1181 });
1182 //用户 1182 //用户
1183 $.ajax({ 1183 $.ajax({
1184 - url: domainName + '/api-user/users/getAll', 1184 + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1',
1185 data: { 1185 data: {
1186 accessToken: accessToken 1186 accessToken: accessToken
1187 }, 1187 },
1188 success: function (response) { 1188 success: function (response) {
1189 if (response) { 1189 if (response) {
1190 - var busTypeList = response;  
1191 - var bizList = response.map(item => {  
1192 - return {  
1193 - name: item.nickname,  
1194 - value: item.username,  
1195 - parentId: item.parentId  
1196 - }  
1197 - });  
1198 - var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); 1190 + // var busTypeList = response;
  1191 + // var bizList = response.map(item => {
  1192 + // return {
  1193 + // name: item.nickname,
  1194 + // value: item.username,
  1195 + // parentId: item.parentId
  1196 + // }
  1197 + // });
  1198 + // var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
1199 1199
1200 // 影响业务下拉框 1200 // 影响业务下拉框
1201 xmSelect.render({ 1201 xmSelect.render({
1202 el: '#alarmsubscribe_user', 1202 el: '#alarmsubscribe_user',
1203 name: 'bizId', 1203 name: 'bizId',
1204 - tips: '=订阅用户=', 1204 + tips: '订阅用户',
1205 toolbar: { 1205 toolbar: {
1206 show: true, 1206 show: true,
1207 list: ['ALL', 'CLEAR'] 1207 list: ['ALL', 'CLEAR']
1208 }, 1208 },
  1209 + prop: {
  1210 + name: 'nickname',
  1211 + value: 'username'
  1212 + },
  1213 + layVerify: 'required',
  1214 + data: response.data.rows,
1209 filterable: true, 1215 filterable: true,
1210 layVerType: 'msg', 1216 layVerType: 'msg',
1211 - data: bizTree, 1217 + // data: bizTree,
1212 on: function (data) { 1218 on: function (data) {
1213 if (data.arr.length > 0) { 1219 if (data.arr.length > 0) {
1214 userName = data.arr.map(t=>t.value).join(','); 1220 userName = data.arr.map(t=>t.value).join(',');
@@ -150,14 +150,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -150,14 +150,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
150 return '' + 150 return '' +
151 '<div>' + 151 '<div>' +
152 '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + 152 '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' +
153 - '<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' +  
154 - '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + 153 + // '<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' +
  154 + // '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
155 '</div>' 155 '</div>'
156 } else { 156 } else {
157 return '' + 157 return '' +
158 '<div class="layui-row">' + 158 '<div class="layui-row">' +
159 '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + 159 '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' +
160 - '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + 160 + // '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
161 '</div>' 161 '</div>'
162 } 162 }
163 } 163 }
@@ -763,7 +763,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -763,7 +763,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
763 layer.open({ 763 layer.open({
764 title: ['当前绑定的告警订阅', 'font-size:18px;'], 764 title: ['当前绑定的告警订阅', 'font-size:18px;'],
765 type: 1, 765 type: 1,
766 - area: ['60%', '70%'], 766 + area: ['80%', '80%'],
767 content: laytpl(res.body).render(JSON.stringify(params)), 767 content: laytpl(res.body).render(JSON.stringify(params)),
768 resize: false, 768 resize: false,
769 // yes: function (index, layero) { 769 // yes: function (index, layero) {
@@ -953,7 +953,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -953,7 +953,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
953 collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(), 953 collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
954 pageName: 'resmanage' 954 pageName: 'resmanage'
955 } 955 }
956 - , height: 'full-200' 956 + , height: 'full-120'
957 , cellMinWidth: 80 957 , cellMinWidth: 80
958 , page: { 958 , page: {
959 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 959 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
@@ -90,7 +90,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'laytpl', @@ -90,7 +90,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'laytpl',
90 <div class="layui-colla-item"> 90 <div class="layui-colla-item">
91 <h2 class="layui-colla-title">${v.tempName}&nbsp;&nbsp;协议：${v.tempType}&nbsp;&nbsp;数量：${v.resList.length} 91 <h2 class="layui-colla-title">${v.tempName}&nbsp;&nbsp;协议：${v.tempType}&nbsp;&nbsp;数量：${v.resList.length}
92 <a data-index="${i}" class="layui-btn layui-btn-xs layui-btn-normal btn-task-checktemp-add"> 92 <a data-index="${i}" class="layui-btn layui-btn-xs layui-btn-normal btn-task-checktemp-add">
93 - <i class="layui-icon">&#xe654;</i></a> 93 + 添加</a>
94 </h2> 94 </h2>
95 <div class="layui-colla-content"> 95 <div class="layui-colla-content">
96 <table id="table-task-checktemp-list-${i}"></table> 96 <table id="table-task-checktemp-list-${i}"></table>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 <div class="box-group-left" style="text-align: center">告警内容<br/>描述表达式</div> 91 <div class="box-group-left" style="text-align: center">告警内容<br/>描述表达式</div>
92 <div class="box-group-right"> 92 <div class="box-group-right">
93 <div class="layui-form-item"> 93 <div class="layui-form-item">
94 - <div class="layui-input-block"> 94 + <div class="layui-input-block textarea-border">
95 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="alarmContentExpr" name="alarmContentExpr"></textarea> 95 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="alarmContentExpr" name="alarmContentExpr"></textarea>
96 </div> 96 </div>
97 </div> 97 </div>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 </div> 136 </div>
137 </div> 137 </div>
138 <div class="layui-form-item cont-other"> 138 <div class="layui-form-item cont-other">
139 - <div class="layui-input-block"> 139 + <div class="layui-input-block textarea-border">
140 <textarea placeholder="请输入内容" class="layui-textarea" id="seriousPolicy" name="seriousPolicy"></textarea> 140 <textarea placeholder="请输入内容" class="layui-textarea" id="seriousPolicy" name="seriousPolicy"></textarea>
141 </div> 141 </div>
142 </div> 142 </div>
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> 147 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
148 <div class="box-group-right"> 148 <div class="box-group-right">
149 <div class="layui-form-item"> 149 <div class="layui-form-item">
150 - <div class="layui-input-block"> 150 + <div class="layui-input-block textarea-border">
151 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="seriousExpr" name="seriousExpr"></textarea> 151 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="seriousExpr" name="seriousExpr"></textarea>
152 </div> 152 </div>
153 </div> 153 </div>
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
192 </div> 192 </div>
193 </div> 193 </div>
194 <div class="layui-form-item cont-other"> 194 <div class="layui-form-item cont-other">
195 - <div class="layui-input-block"> 195 + <div class="layui-input-block textarea-border">
196 <textarea placeholder="请输入内容" class="layui-textarea" id="importantPolicy" name="importantPolicy"></textarea> 196 <textarea placeholder="请输入内容" class="layui-textarea" id="importantPolicy" name="importantPolicy"></textarea>
197 </div> 197 </div>
198 </div> 198 </div>
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> 203 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
204 <div class="box-group-right"> 204 <div class="box-group-right">
205 <div class="layui-form-item"> 205 <div class="layui-form-item">
206 - <div class="layui-input-block"> 206 + <div class="layui-input-block textarea-border">
207 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="importantExpr" name="importantExpr"></textarea> 207 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="importantExpr" name="importantExpr"></textarea>
208 </div> 208 </div>
209 </div> 209 </div>
@@ -248,7 +248,7 @@ @@ -248,7 +248,7 @@
248 </div> 248 </div>
249 </div> 249 </div>
250 <div class="layui-form-item cont-other"> 250 <div class="layui-form-item cont-other">
251 - <div class="layui-input-block"> 251 + <div class="layui-input-block textarea-border">
252 <textarea placeholder="请输入内容" class="layui-textarea" id="commonlyPolicy" name="commonlyPolicy"></textarea> 252 <textarea placeholder="请输入内容" class="layui-textarea" id="commonlyPolicy" name="commonlyPolicy"></textarea>
253 </div> 253 </div>
254 </div> 254 </div>
@@ -259,7 +259,7 @@ @@ -259,7 +259,7 @@
259 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> 259 <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
260 <div class="box-group-right"> 260 <div class="box-group-right">
261 <div class="layui-form-item"> 261 <div class="layui-form-item">
262 - <div class="layui-input-block"> 262 + <div class="layui-input-block textarea-border">
263 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="commonlyExpr" name="commonlyExpr"></textarea> 263 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="commonlyExpr" name="commonlyExpr"></textarea>
264 </div> 264 </div>
265 </div> 265 </div>
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@
304 </div> 304 </div>
305 </div> 305 </div>
306 <div class="layui-form-item cont-other"> 306 <div class="layui-form-item cont-other">
307 - <div class="layui-input-block"> 307 + <div class="layui-input-block textarea-border">
308 <textarea placeholder="请输入内容" class="layui-textarea" id="filterPolicy" name="filterPolicy"></textarea> 308 <textarea placeholder="请输入内容" class="layui-textarea" id="filterPolicy" name="filterPolicy"></textarea>
309 </div> 309 </div>
310 </div> 310 </div>
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 </div> 323 </div>
324 </div> 324 </div>
325 <div class="layui-form-item"> 325 <div class="layui-form-item">
326 - <div class="layui-input-block"> 326 + <div class="layui-input-block textarea-border">
327 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="cleanPolicy" name="cleanPolicy"></textarea> 327 <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="cleanPolicy" name="cleanPolicy"></textarea>
328 </div> 328 </div>
329 </div> 329 </div>
@@ -336,7 +336,7 @@ @@ -336,7 +336,7 @@
336 <div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div> 336 <div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div>
337 <div class="box-group-right"> 337 <div class="box-group-right">
338 <div class="layui-form-item"> 338 <div class="layui-form-item">
339 - <div class="layui-input-block"> 339 + <div class="layui-input-block textarea-border">
340 <textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea> 340 <textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea>
341 </div> 341 </div>
342 </div> 342 </div>
@@ -118,8 +118,7 @@ @@ -118,8 +118,7 @@
118 118
119 <fieldset class="layui-elem-field layui-field-title" id="message-time-quantum-div"> 119 <fieldset class="layui-elem-field layui-field-title" id="message-time-quantum-div">
120 <legend>订阅信息 120 <legend>订阅信息
121 - <i class="layui-icon layui-icon-edit" id="alarmsubscirbe-form-select-users"  
122 - lay-tips="订阅绑定用户、部门及组" style="background-color: #1E9FFF;color: #fff;font-size: 20px"></i> 121 + <a id="alarmsubscirbe-form-select-users" class="layui-btn layui-btn-xs layui-btn-normal" id="add_alarmtemplate_policy" lay-tips="订阅绑定用户、部门及组"> 绑定 </a>
123 </legend> 122 </legend>
124 </fieldset> 123 </fieldset>
125 <div class="layui-form-item"> 124 <div class="layui-form-item">
@@ -149,8 +148,8 @@ @@ -149,8 +148,8 @@
149 </div> 148 </div>
150 149
151 <div class="layui-form-item"> 150 <div class="layui-form-item">
152 - <label class="layui-form-label textarea-label">订阅描述</label>  
153 - <div class="layui-input-block"> 151 + <label class="layui-form-label">订阅描述</label>
  152 + <div class="layui-input-block textarea-border">
154 <textarea class="layui-textarea" name="subDesc"></textarea> 153 <textarea class="layui-textarea" name="subDesc"></textarea>
155 </div> 154 </div>
156 </div> 155 </div>
@@ -24,9 +24,9 @@ @@ -24,9 +24,9 @@
24 </div> 24 </div>
25 <div class="layui-card-body"> 25 <div class="layui-card-body">
26 <div class="warn-btns"> 26 <div class="warn-btns">
27 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create"> 27 + <!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create">
28 <i class="layui-icon">&#xe654;</i>新增 28 <i class="layui-icon">&#xe654;</i>新增
29 - </button> 29 + </button>-->
30 <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-bustype-delete"> 30 <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-bustype-delete">
31 <i class="layui-icon">&#xe640;</i>删除 31 <i class="layui-icon">&#xe640;</i>删除
32 </button> 32 </button>
1 spring: 1 spring:
2 application: 2 application:
3 - name: zjweb 3 + name: mj-zhjk-web
4 server: 4 server:
5 - port: 8088 5 + port: 28089
6 ssl: 6 ssl:
7 enabled: false 7 enabled: false
8 key-alias: tomcat_https 8 key-alias: tomcat_https
@@ -12,6 +12,8 @@ server: @@ -12,6 +12,8 @@ server:
12 key-password: Hg0801.. 12 key-password: Hg0801..
13 url: 13 url:
14 gateway: http://127.0.0.1:7895 14 gateway: http://127.0.0.1:7895
  15 +# gateway: http://192.168.0.75:28088
  16 +# gateway: http://192.168.0.196:7895
15 inspection_web: http://localhost:8082 17 inspection_web: http://localhost:8082
16 assetsweb: http://localhost:8082 18 assetsweb: http://localhost:8082
17 mxgraph_editor: http://192.168.0.44:8085 19 mxgraph_editor: http://192.168.0.44:8085