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
});
//用户
$.ajax({
url: domainName + '/api-user/users/getAll',
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1',
data: {
accessToken: accessToken
},
success: function (response) {
if (response) {
var busTypeList = response;
var bizList = response.map(item => {
return {
name: item.nickname,
value: item.username,
parentId: item.parentId
}
});
var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
// var busTypeList = response;
// var bizList = response.map(item => {
// return {
// name: item.nickname,
// value: item.username,
// parentId: item.parentId
// }
// });
// var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
// 影响业务下拉框
xmSelect.render({
el: '#alarmsubscribe_user',
name: 'bizId',
tips: '=订阅用户=',
tips: '订阅用户',
toolbar: {
show: true,
list: ['ALL', 'CLEAR']
},
prop: {
name: 'nickname',
value: 'username'
},
layVerify: 'required',
data: response.data.rows,
filterable: true,
layVerType: 'msg',
data: bizTree,
// data: bizTree,
on: function (data) {
if (data.arr.length > 0) {
userName = data.arr.map(t=>t.value).join(',');
... ...
... ... @@ -150,14 +150,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
return '' +
'<div>' +
'<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' +
'<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' +
'<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
// '<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' +
// '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
'</div>'
} else {
return '' +
'<div class="layui-row">' +
'<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' +
'<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
// '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' +
'</div>'
}
}
... ...
... ... @@ -763,7 +763,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
layer.open({
title: ['当前绑定的告警订阅', 'font-size:18px;'],
type: 1,
area: ['60%', '70%'],
area: ['80%', '80%'],
content: laytpl(res.body).render(JSON.stringify(params)),
resize: false,
// yes: function (index, layero) {
... ... @@ -953,7 +953,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
pageName: 'resmanage'
}
, height: 'full-200'
, height: 'full-120'
, cellMinWidth: 80
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
... ...
... ... @@ -90,7 +90,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'laytpl',
<div class="layui-colla-item">
<h2 class="layui-colla-title">${v.tempName}&nbsp;&nbsp;协议：${v.tempType}&nbsp;&nbsp;数量：${v.resList.length}
<a data-index="${i}" class="layui-btn layui-btn-xs layui-btn-normal btn-task-checktemp-add">
<i class="layui-icon">&#xe654;</i></a>
添加</a>
</h2>
<div class="layui-colla-content">
<table id="table-task-checktemp-list-${i}"></table>
... ...
... ... @@ -91,7 +91,7 @@
<div class="box-group-left" style="text-align: center">告警内容<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="alarmContentExpr" name="alarmContentExpr"></textarea>
</div>
</div>
... ... @@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-form-item cont-other">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea" id="seriousPolicy" name="seriousPolicy"></textarea>
</div>
</div>
... ... @@ -147,7 +147,7 @@
<div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="seriousExpr" name="seriousExpr"></textarea>
</div>
</div>
... ... @@ -192,7 +192,7 @@
</div>
</div>
<div class="layui-form-item cont-other">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea" id="importantPolicy" name="importantPolicy"></textarea>
</div>
</div>
... ... @@ -203,7 +203,7 @@
<div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="importantExpr" name="importantExpr"></textarea>
</div>
</div>
... ... @@ -248,7 +248,7 @@
</div>
</div>
<div class="layui-form-item cont-other">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea" id="commonlyPolicy" name="commonlyPolicy"></textarea>
</div>
</div>
... ... @@ -259,7 +259,7 @@
<div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="commonlyExpr" name="commonlyExpr"></textarea>
</div>
</div>
... ... @@ -304,7 +304,7 @@
</div>
</div>
<div class="layui-form-item cont-other">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea" id="filterPolicy" name="filterPolicy"></textarea>
</div>
</div>
... ... @@ -323,7 +323,7 @@
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="cleanPolicy" name="cleanPolicy"></textarea>
</div>
</div>
... ... @@ -336,7 +336,7 @@
<div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<div class="layui-input-block textarea-border">
<textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea>
</div>
</div>
... ...
... ... @@ -118,8 +118,7 @@
<fieldset class="layui-elem-field layui-field-title" id="message-time-quantum-div">
<legend>订阅信息
<i class="layui-icon layui-icon-edit" id="alarmsubscirbe-form-select-users"
lay-tips="订阅绑定用户、部门及组" style="background-color: #1E9FFF;color: #fff;font-size: 20px"></i>
<a id="alarmsubscirbe-form-select-users" class="layui-btn layui-btn-xs layui-btn-normal" id="add_alarmtemplate_policy" lay-tips="订阅绑定用户、部门及组"> 绑定 </a>
</legend>
</fieldset>
<div class="layui-form-item">
... ... @@ -149,8 +148,8 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">订阅描述</label>
<div class="layui-input-block">
<label class="layui-form-label">订阅描述</label>
<div class="layui-input-block textarea-border">
<textarea class="layui-textarea" name="subDesc"></textarea>
</div>
</div>
... ...
... ... @@ -24,9 +24,9 @@
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create">
<!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create">
<i class="layui-icon">&#xe654;</i>新增
</button>
</button>-->
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-bustype-delete">
<i class="layui-icon">&#xe640;</i>删除
</button>
... ...
spring:
application:
name: zjweb
name: mj-zhjk-web
server:
port: 8088
port: 28089
ssl:
enabled: false
key-alias: tomcat_https
... ... @@ -12,6 +12,8 @@ server:
key-password: Hg0801..
url:
gateway: http://127.0.0.1:7895
# gateway: http://192.168.0.75:28088
# gateway: http://192.168.0.196:7895
inspection_web: http://localhost:8082
assetsweb: http://localhost:8082
mxgraph_editor: http://192.168.0.44:8085
... ...