monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit fe64ddc5518bc23d05b4fe70098a622dd628c580 2 parents 31a826f6 a603e488

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 3 changed files with 25 additions and 17 deletions
... ... @@ -306,13 +306,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
}
}
}
, {title: '操作', align: 'center',width:200,fixed: 'right', toolbar:
, {title: '操作', align: 'center',minWidth:200,fixed: 'right', toolbar:
'<div>' +
'<button data-id="{{d.subId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmsubscribe-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
'<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="layui-icon layui-icon-star"></i></button>' +
'<button data-id="{{d.subId}}" lay-tips="指标订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-kpi-btn"><i class="layui-icon layui-icon-star-fill"></i></button>' +
'<button data-id="{{d.subId}}" lay-tips="资源类型订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resType-btn"><i class="layui-icon layui-icon-star-fill"></i></button>' +
'<button data-id="{{d.subId}}" lay-tips="业务类型订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-busId-btn"><i class="layui-icon layui-icon-star-fill"></i></button>' +
'<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="iconfont">&#XE523;</i></button>' +
'<button data-id="{{d.subId}}" lay-tips="指标订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-kpi-btn"><i class="iconfont">&#XE520;</i></button>' +
'<button data-id="{{d.subId}}" lay-tips="资源类型订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resType-btn"><i class="iconfont">&#XE521;</i></button>' +
'<button data-id="{{d.subId}}" lay-tips="业务类型订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-busId-btn"><i class="iconfont">&#XE522;</i></button>' +
'</div>'
}
]],
... ... @@ -919,7 +919,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
var subId = $(this).data("id");
var list = getResTypeOrBusId(subId, 0);
//回填数据
common.openWin("baseconfig/resourcetype/index", "选择资源类型", {"resTypes": list,"showType":0}, ["选择"], function () {
common.openWin("baseconfig/resourcetype/index", "选择资源类型",
{
//"resTypes": list,"showType":0
}, ["选择"], function () {
//找到选择的资源类型 并且订阅
var resourcetype = layui.resourcetype({"resTypes": list});
var data = resourcetype.getResTypeChecks();
... ... @@ -931,7 +934,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
var subId = $(this).data("id");
var list = getResTypeOrBusId(subId, 1);
//回填数据
common.openWin("baseconfig/bustype/index", "选择业务类型", {busIds: list}, ["选择"], function () {
common.openWin("baseconfig/bustype/index", "选择业务类型",
{
//busIds: list
}, ["选择"], function () {
//找到选择的所有业务 并且订阅
var bustype = layui.bustype({"busIds": list});
var data = bustype.getData();
... ... @@ -947,7 +953,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
let typeSubscribe = {
id: id,
subId: subId,
subType: type,
type: type,
targetId: targetId
};
admin.req({
... ... @@ -998,7 +1004,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
function getResTypeOrBusId(subId, type) {
let list = [];
admin.req({
url: common.domainName + '/api-web/bTypeSubscribe/subscribeList?subId=' + subId + '&subType=' + type,
url: common.domainName + '/api-web/bTypeSubscribe/subscribeList?subId=' + subId + '&type=' + type,
async: false,
success: function (response) {
if (response.success) {
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
exports('typeSubscribeList', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().access_token;
var subType = data.type ? data.type : 0;//默认为资源类型
var type = data.type ? data.type : 0;//默认为资源类型
var subId = data.subId ? data.subId : '';
//回车搜索
$('#type_subscribe_list_keyword').keydown(function (e) {
... ... @@ -21,7 +21,7 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
});
var cols = [];
if (subType) {//业务类型
if (type) {//业务类型
cols = [[
{type: 'checkbox'},
{type: 'numbers', title: '序号', align: 'center'}
... ... @@ -56,7 +56,7 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
, where: {
access_token: accessToken,
keyword: $("#type_subscribe_list_keyword").val(),
subType: subType,
type: type,
subId: subId
}
, height: 'full'
... ... @@ -71,19 +71,19 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
var $this = $(this);
var id = $this.data('id');
var ids = new Array(id);
deleteTypeSubscribe(ids,subType);
deleteTypeSubscribe(ids,type);
});
}
});
//删除数据
function deleteTypeSubscribe(ids,subType) {
function deleteTypeSubscribe(ids,type) {
layer.confirm('数据删除后将无法恢复，您确定要删除吗？', {
btn: ['确定', '取消'] //按钮
}, function () {
let data = {
ids:ids.toString(),
"subType":subType
"type":type
}
admin.req({
url: common.domainName + '/api-web/bTypeSubscribe/deleteTypeSubscribe?access_token=' + accessToken
... ... @@ -119,15 +119,17 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
$("#typeSubscribe_delete").on("click", function () {
//获取选中数据
var li = getCheckKpiData();
deleteTypeSubscribe(li.map(item => item.id),subType);
deleteTypeSubscribe(li.map(item => item.id),type);
});
//刷新表格
function reloadTypeSubscribeTable() {
debugger
var a= accessToken;
typeSubscribeListable.reload({
where: {
keyword: $("#type_subscribe_list_keyword").val(),
subType: subType,
type: type,
subId: subId,
access_token: accessToken
}
... ...