monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit dbebd57f09224297c9ebcbbca5d42d69115174c1 1 parent c9ca5f05

fix:巡检配置->分析报告配置

Inline Side-by-side
Showing 4 changed files with 129 additions and 159 deletions
... ... @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
exports('analysisconfig', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().access_token;
var accessToken = common.getMjToken();
$('form[lay-filter="form-analysisconfig-condition"] input').keydown(function (e) {
if (e.keyCode === 13) {
... ... @@ -67,27 +67,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
var result = false;
layer.load(2);
admin.req({
url: domainName + '/api-web/analysis/config/sqlList?access_token=' + accessToken,
url: domainName + '/api-web/analysis/config/sqlList',
type: 'POST',
async: false,
data: {
sqlIdList: checks.map(item => item.sqlId).toString(),
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('配置sql成功!', {icon: 1});
reloadTable();
result = true;
} else {
layer.msg('配置sql失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('配置sql成功!', {icon: 1});
reloadTable();
result = true;
} else {
layer.msg('配置sql失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading');
layer.msg('配置sql失败!', {icon: 2});
})
return result;
}, null, null, null, {
... ... @@ -95,26 +93,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
layer.confirm('确认要取消所有关联sql吗？', {icon: 0, title: '警告'}, function () {
layer.load(2);
admin.req({
url: domainName + '/api-web/analysis/config/sqlList?access_token=' + accessToken,
url: domainName + '/api-web/analysis/config/sqlList',
type: 'POST',
data: {
sqlIdList: [].toString(),
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('取消所有关联sql成功!', {icon: 1});
reloadTable();
layer.close(index);
} else {
layer.msg('取消所有关联sql失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('取消所有关联sql成功!', {icon: 1});
reloadTable();
layer.close(index);
} else {
layer.msg('取消所有关联sql失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading');
layer.msg('取消所有关联sql失败!', {icon: 2});
})
})
return false
... ... @@ -168,25 +164,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
layer.load(2);
admin.req({
url: domainName + '/api-web/analysis/export',
data: {configId: checks[0].configId},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('生成成功!', {icon: 1});
} else {
layer.msg('生成失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading');
data: {configId: checks[0].configId}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('生成成功!', {icon: 1});
} else {
layer.msg('生成失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading');
layer.msg('生成失败!', {icon: 2});
})
});
upload.render({
elem: '#btn-analysisconfig-upload-template',
url: domainName + '/api-web/analysis/config/upload?access_token=' + accessToken,
url: domainName + '/api-web/analysis/config/upload?accessToken=' + accessToken,
accept: 'file',
exts: 'docx',
data: {
... ... @@ -216,7 +210,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
elem: '#table-analysisconfig',
url: domainName + '/api-web/analysis/config/page',
where: Object.assign({
access_token: accessToken,
accessToken: accessToken,
}, form.val('form-analysisconfig-condition')),
height: 'full-200',
cols: [[{
... ... @@ -287,7 +281,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
function reloadTable() {
table.reload('table-analysisconfig', {
where: Object.assign({
access_token: accessToken,
accessToken: accessToken,
}, form.val('form-analysisconfig-condition'))
})
}
... ... @@ -305,20 +299,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/config/deleteByIdList',
data: {
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('删除成功!', {icon: 1});
reloadTable();
} else {
layer.msg('删除失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('删除成功!', {icon: 1});
reloadTable();
} else {
layer.msg('删除失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading');
layer.msg('删除失败!', {icon: 2});
})
})
}
... ... @@ -329,28 +321,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/config/syncByIdList',
data: {
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg(response.msg, {icon: 1});
reloadTable();
} else {
layer.msg('同步失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg(response.msg, {icon: 1});
reloadTable();
} else {
layer.msg('同步失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
}).error(function () {
layer.closeAll('loading');
layer.msg('同步失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
})
}
... ... @@ -360,28 +350,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/config/disableByIdList',
data: {
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('禁用成功', {icon: 1});
reloadTable();
} else {
layer.msg('禁用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('禁用成功', {icon: 1});
reloadTable();
} else {
layer.msg('禁用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
}).error(function () {
layer.closeAll('loading');
layer.msg('禁用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
})
}
... ... @@ -391,28 +379,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/config/enableByIdList',
data: {
configIdList: configIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('启用成功!', {icon: 1});
reloadTable();
} else {
layer.msg('启用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
},
error() {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('启用成功!', {icon: 1});
reloadTable();
} else {
layer.msg('启用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
}
}).error(function () {
layer.closeAll('loading');
layer.msg('启用失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
})
}
... ...
... ... @@ -37,7 +37,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
$('form[lay-filter="form-edit-analysisconfig"] input[name="reportTypeName"]').unbind('click').on('click', function () {
$('li[lay-id="/baseconfig/analysissql/"] .layui-tab-close').click();
var params = {documentType: 'fxbg,gf,gzgl,jkjc,lxwh,pzgl,rcxj'};
var params = {documentType: 'fxbg,gf,gzgl,jkjc,lxwh,pzgl,rcxj', isParent: true};
var reporttype = layui.reporttype(params);
common.openWin("baseconfig/reporttype/index", "选择巡检类型", params, ["选择", "取消"], function () {
var checks = reporttype.getChecks(false);
... ... @@ -60,12 +60,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
if (configId) {
admin.req({
url: domainName + '/api-web/analysis/config/page',
data: {configId: configId},
success(response) {
if (response && response.success) {
config = response.data[0];
form.val('form-edit-analysisconfig', config);
}
data: {configId: configId}
}).done(function (response) {
if (response && response.success) {
config = response.data[0];
form.val('form-edit-analysisconfig', config);
}
})
}
... ... @@ -74,31 +73,29 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
(!data.field.enable) && (data.field.enable = false);
layer.load(2);
admin.req({
url: domainName + '/api-web/analysis/config/save?access_token=' + accessToken,
url: domainName + '/api-web/analysis/config/save',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(Object.assign({}, config, data.field)),
success(response) {
layer.closeAll('loading')
if (response && response.success) {
layer.msg('保存成功!', {icon: 1});
layer.closeAll('page');
table.reload('table-analysisconfig', {
page: {
curr: 1
},
where: Object.assign({
access_token: accessToken,
}, form.val('form-analysisconfig-condition'))
})
} else {
layer.msg('保存失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading')
layer.msg('保存失败!', {icon: 2})
data: JSON.stringify(Object.assign({}, config, data.field))
}).done(function (response) {
layer.closeAll('loading')
if (response && response.success) {
layer.msg('保存成功!', {icon: 1});
layer.closeAll('page');
table.reload('table-analysisconfig', {
page: {
curr: 1
},
where: Object.assign({
access_token: accessToken,
}, form.val('form-analysisconfig-condition'))
})
} else {
layer.msg('保存失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading')
layer.msg('保存失败!', {icon: 2})
})
return false;
... ...
... ... @@ -72,7 +72,7 @@ layui.define(['table', 'form', 'laydate', 'treeTable', 'admin', 'layer', 'laytpl
roleTable = table.render({
elem: '#role_table'
, url: domainName + "/api-user/roles"
, url: domainName + "/mj/sys/role/roles"
, where: {
access_token: accessToken,
name: $('#roleSearchForm').find("input[name='name']").val()
... ... @@ -83,6 +83,12 @@ layui.define(['table', 'form', 'laydate', 'treeTable', 'admin', 'layer', 'laytpl
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
, theme: '#1E9FFF'
}
, parseData: function (data) {
return {
"code": data.status,
"data": data.data.rows
}
}
// , limit: common.limit
// , limits: common.limits
, even: true
... ... @@ -91,9 +97,7 @@ layui.define(['table', 'form', 'laydate', 'treeTable', 'admin', 'layer', 'laytpl
{type: 'checkbox'}
// , {title: '序号', align: "center", type: 'numbers', event: 'dblclick', width: '5%'}
, {
field: 'name', title: '角色名', align: 'center', sort: true, width: '15%',
templet: '<div><span role-data-edit="{{d.id}}" data-name="{{d.name}}" ' +
'data-code="{{d.code}}" data-remark="{{d.remark}}" class="layui-table-link">{{d.name}}</span></div>'
field: 'name', title: '角色名', align: 'center', sort: true, width: '15%'
}
, {field: 'code', title: '编码', align: 'left', width: '10%'}
, {field: 'userNames', title: '角色用户', align: 'left', width: '20%'}
... ... @@ -105,23 +109,6 @@ layui.define(['table', 'form', 'laydate', 'treeTable', 'admin', 'layer', 'laytpl
width: '10%',
templet: '<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'
}
, {
title: '操作', align: 'center', width: '20%', templet: function (d) {
var tips = "一键赋权功能点";
if (d.code === 'ADMIN' || d.code === 'ROOT') {
tips = "一键赋权菜单、功能点、业务及资源类型"
}
return '<div>' +
' <a role-data-delete="' + d.id + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn">删除</a>' +
// ' <button role-data-default="'+d.id+'" lay-tips="设置默认首页" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn"><i class="layui-icon layui-icon-home"></i></button>'+
' <a role-data-permiss="' + d.id + '" lay-tips="功能点授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn">功能点授权</a>' +
' <a role-data-menu="' + d.id + '" lay-tips="菜单授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn">菜单授权</a>' +
// ' <button role-data-query-menus="'+d.id+'" role-data-name="'+d.name+'" lay-tips="角色菜单查看" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn"><i class="layui-icon layui-icon-search"></i></button>'+
' <a role-data-oneKey="' + d.id + '" lay-tips="' + tips + '" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn">' + tips + '</a>' +
' <a data-code="' + d.code + '" data-id="' + d.id + '" lay-tips="配置默认首页" type="button" class="layui-btn layui-btn-xs layui-btn-normal config-default-index">配置默认首页</a>' +
'</div>';
}
}
]],
done: function (res, curr, count) {
//点击角色名称 进行编辑
... ...
... ... @@ -25,12 +25,12 @@
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="addrole" type="button"><i
class="layui-icon">&#xe654;</i>新增
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="delrole" type="button"><i
class="layui-icon">&#xe640;</i>删除
</button>
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="addrole" type="button"><i-->
<!-- class="layui-icon">&#xe654;</i>新增-->
<!-- </button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="delrole" type="button"><i-->
<!-- class="layui-icon">&#xe640;</i>删除-->
<!-- </button>-->
<!--joke 屏蔽于20210413-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="role-menu-grant-btn">-->
<!-- <i class="layui-icon">&#xe66f;</i>分配菜单权限-->
... ...