monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit 4d0173b49d41ec23e64e59b2cc3eaf1fe6669a9c 1 parent a085f5e7

fix:巡检配置->巡检任务配置

Inline Side-by-side
Showing 4 changed files with 174 additions and 196 deletions
... ... @@ -33,7 +33,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function initTable() {
inspectionTaskHisTable = table.render({
elem: '#inspectionTaskHis_table'
, url: domainName + '/api-web/inspectiontask/hisPage?access_token=' + accessToken
, url: domainName + '/api-web/inspectiontask/hisPage'
, where: whereSearch()
, height: 'full-210'
, cellMinWidth: 80
... ... @@ -250,7 +250,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//获取巡检结果PDF
function inspectionResultPDF(batchNo) {
admin.req({
url: domainName + '/api-web/inspectionTaskHis/getPdfPath?access_token=' + accessToken + '&batchNo=' + batchNo
url: domainName + '/api-web/inspectionTaskHis/getPdfPath?batchNo=' + batchNo
}).done(function (response) {
if ("success" == response.msg) {
window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
... ...
... ... @@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function initTable() {
inspectionTaskTable = table.render({
elem: '#inspectionTask_table'
, url: domainName + '/api-web/inspectiontask/findPage?accessToken=' + accessToken
, url: domainName + '/api-web/inspectiontask/findPage'
, where: whereSearch()
, height: 'full-210'
, cellMinWidth: 80
... ... @@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
publishStatus = '0'
}
admin.req({
url: domainName + '/api-web/inspectiontask/publishTask?accessToken=' + accessToken,
url: domainName + '/api-web/inspectiontask/publishTask',
type: 'get',
data: {taskId: taskId, publishStatus: publishStatus},
contentType: 'application/json',
... ... @@ -300,24 +300,22 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
data: {
taskId: taskId,
taskStatus: taskStatus
},
success: function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('操作成功!', {icon: 1});
reloadTable();
} else {
obj.elem.checked = !obj.elem.checked;
form.render();
layer.msg(response.msg, {icon: 2});
}
},
error: function (error) {
layer.closeAll('loading');
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('操作成功!', {icon: 1});
reloadTable();
} else {
obj.elem.checked = !obj.elem.checked;
form.render();
layer.msg('操作失败!', {icon: 2});
layer.msg(response.msg, {icon: 2});
}
}).error(function (error) {
layer.closeAll('loading');
obj.elem.checked = !obj.elem.checked;
form.render();
layer.msg('操作失败!', {icon: 2});
});
});
// 查看巡检任务执行详情
... ... @@ -465,13 +463,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
// 上传模板事件
upload.render({
elem: '#upload_tasktemp' //绑定元素
, url: common.domainName + '/api-web/inspectiontask/upload?accessToken=' + accessToken //上传接口
, url: common.domainName + '/api-web/inspectiontask/upload' //上传接口
, accept: 'file' //允许上传的文件类型
, exts: 'docx|doc'
, multiple: false
, before: function () {
layer.load(2);
this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&accessToken=' + accessToken;
this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId;
}
, done: function (res) {
layer.closeAll("loading");
... ... @@ -492,17 +490,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function sync(taskIds, elem) {
layer.load(2);
admin.req({
url: domainName + '/api-web/inspectiontask/sync?accessToken=' + accessToken,
url: domainName + '/api-web/inspectiontask/sync',
type: 'get',
data: {taskIds: taskIds},
contentType: 'application/json',
error: function (e) {
layer.closeAll('loading');
if (elem) {
elem.checked = !elem.checked;
form.render();
}
}
contentType: 'application/json'
}).done(function (response) {
layer.closeAll('loading');
if (response.success) {
... ... @@ -515,13 +506,19 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
form.render();
}
}
}).error(function (e) {
layer.closeAll('loading');
if (elem) {
elem.checked = !elem.checked;
form.render();
}
});
}
//获取巡检结果PDF
function inspectionResultPDF(batchNo) {
admin.req({
url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo
url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
}).done(function (response) {
if ("success" == response.msg) {
window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
... ... @@ -532,13 +529,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function exec(taskId) {
layer.load(2);
admin.req({
url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken,
url: domainName + '/api-web/inspectiontask/exec',
type: 'get',
data: {taskId: taskId},
contentType: 'application/json',
error: function (error) {
layer.closeAll('loading');
}
contentType: 'application/json'
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
... ... @@ -555,6 +549,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
} else {
layer.msg(response.msg, {icon: 2});
}
}).error(function (error) {
layer.closeAll('loading');
});
}
... ... @@ -659,27 +655,22 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
element: elementInfo
}
var url = `${common.domainName}/api-web/inspectiontask/saveOrUpdate`
$.ajax({
admin.req({
url: url,
headers: {
"Authorization": "Bearer " + accessToken + ""
},
type: 'post',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(param),
success: function (res) {
layer.close(load);
if (res && res.success) {
layer.msg('保存成功!', {offset: '15px', icon: 1});
layer.close(index);
reloadTable();
} else {
layer.msg(res.msg, {offset: '15px', icon: 2});
}
},
error: function () {
layer.close(load);
data: JSON.stringify(param)
}).done(function (res) {
layer.close(load);
if (res && res.success) {
layer.msg('保存成功!', {offset: '15px', icon: 1});
layer.close(index);
reloadTable();
} else {
layer.msg(res.msg, {offset: '15px', icon: 2});
}
}).error(function () {
layer.close(load);
})
... ... @@ -757,10 +748,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
layer.close(index);
layer.load(2);
admin.req({
url: common.domainName + '/api-web/inspectiontask/deleteByIds?taskIds=' + ids,
error: function (e) {
layer.closeAll('loading');
}
url: common.domainName + '/api-web/inspectiontask/deleteByIds?taskIds=' + ids
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
... ... @@ -829,34 +817,33 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
admin.req({
url: domainName + '/api-web/inspectiontask/findPage',
data: lastSearchCondition,
async: false,
success: function (response) {
if (response && response.success) {
for (var i = 0; i < response.data.length; i++) {
var taskId = response.data[i].taskId;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + taskId + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
if (statusStr == '未执行') {
$statusDom.removeClass('link');
} else {
$statusDom.addClass('link');
$statusDom.attr('batchno', response.data[i].batchNo);
}
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
async: false
}).done(function (response) {
if (response && response.success) {
for (var i = 0; i < response.data.length; i++) {
var taskId = response.data[i].taskId;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + taskId + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
if (statusStr == '未执行') {
$statusDom.removeClass('link');
} else {
$statusDom.addClass('link');
$statusDom.attr('batchno', response.data[i].batchNo);
}
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
}
}
}
setTimeout(refreshTaskStatus, 7000);
}
setTimeout(refreshTaskStatus, 7000);
});
}
}
... ...
... ... @@ -124,41 +124,38 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
params[$dom.attr("id")] = dirctiveIds.toString();
}
}
$.ajax({
admin.req({
url: `${common.domainName}/api-web/manage/dirctive/findDistinctKpiInfo`,
headers: {
"Authorization": "Bearer " + accessToken + ""
},
data: params,
success: function (res) {
if (!res || !res.object) {
return;
}
var obj = res.object;
$.each($('#page3 .baseline-element-box'), (index, element) => {
var baselineList = obj[$(element).data('id')];
if (baselineList) {
var selectedResList = $.map($(element).find('.baseline-kpi-box[data-kpiid]'), baselineDom => $(baselineDom).data('kpiid'));
var baselineKpiIdList = $.map(baselineList, item => item.kpiId);
for (var j = 0; j < selectedResList.length; j++) {
if (baselineKpiIdList.indexOf(selectedResList[j]) === -1) {
$(element).find('.baseline-kpi-box[data-kpiid="' + selectedResList[j] + '"]').remove();
}
data: params
}).done(function (res) {
if (!res || !res.object) {
return;
}
var obj = res.object;
$.each($('#page3 .baseline-element-box'), (index, element) => {
var baselineList = obj[$(element).data('id')];
if (baselineList) {
var selectedResList = $.map($(element).find('.baseline-kpi-box[data-kpiid]'), baselineDom => $(baselineDom).data('kpiid'));
var baselineKpiIdList = $.map(baselineList, item => item.kpiId);
for (var j = 0; j < selectedResList.length; j++) {
if (baselineKpiIdList.indexOf(selectedResList[j]) === -1) {
$(element).find('.baseline-kpi-box[data-kpiid="' + selectedResList[j] + '"]').remove();
}
for (var i = 0; i < baselineList.length; i++) {
var kpiId = baselineList[i].kpiId;
if (selectedResList.indexOf(kpiId) !== -1) {
continue;
} else {
var protocol = $(element).data('id').split("#")[2];
var funType = '', funVal = '';
var reg = /\[默认基线:.+\((.+)\)(.*)]/;
if (reg.test(baselineList[i].remark)) {
var strList = reg.exec(baselineList[i].remark);
funType = strList[1];
funVal = strList[2];
}
$(element).append(`
}
for (var i = 0; i < baselineList.length; i++) {
var kpiId = baselineList[i].kpiId;
if (selectedResList.indexOf(kpiId) !== -1) {
continue;
} else {
var protocol = $(element).data('id').split("#")[2];
var funType = '', funVal = '';
var reg = /\[默认基线:.+\((.+)\)(.*)]/;
if (reg.test(baselineList[i].remark)) {
var strList = reg.exec(baselineList[i].remark);
funType = strList[1];
funVal = strList[2];
}
$(element).append(`
<div class="layui-row baseline-kpi-box" data-kpiid="${baselineList[i].kpiId}">
<label class="baseline-kpi-title">${baselineList[i].kpiName}</label>
<div class="layui-input-inline">
... ... @@ -181,19 +178,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
</div>
</div>
`);
}
}
delete obj[$(element).data('id')];
} else {
$(element).remove();
}
});
delete obj[$(element).data('id')];
} else {
$(element).remove();
}
});
$(".baseline-element-content").append(laytpl($("#baselineCofigTpl").html()).render(res['object']))
baselineProtocolAddEvent();
$("#taskEditFlag").val("0");
//console.log(res.object);
}
$(".baseline-element-content").append(laytpl($("#baselineCofigTpl").html()).render(res['object']))
baselineProtocolAddEvent();
$("#taskEditFlag").val("0");
//console.log(res.object);
})
} else {
//未选择资源则跳转回任务项配置
... ... @@ -303,37 +299,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
$.each(data, function (i, e) {
resIds.push(e.resId);
})
var url = common.domainName + '/api-web/bResource/groupByProtocolAndResType?access_token=' + accessToken
$.ajax({
var url = common.domainName + '/api-web/bResource/groupByProtocolAndResType'
admin.req({
url: url,
type: 'get',
data: {resIds: resIds.toString()},
success: function (res) {
if (!res || !res.object) {
return;
}
var obj = res.object;
$.each($('#page2 .inspection-task-box'), (index, element) => {
var resList = obj[$(element).attr('id')];
if (resList) {
var selectedResList = $.map($(element).find('.res-tags[data-resid]'), resDom => $(resDom).data('resid'));
for (var i = 0; i < resList.length; i++) {
if (selectedResList.indexOf(resList[i].resId) !== -1) {
continue;
} else {
$(element).find('.res-tags[data-resid]:last-child').after(`<label class="res-tags" data-resid="${resList[i].resId}">${resList[i].resName} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`);
}
data: {resIds: resIds.toString()}
}).done(function (res) {
if (!res || !res.object) {
return;
}
var obj = res.object;
$.each($('#page2 .inspection-task-box'), (index, element) => {
var resList = obj[$(element).attr('id')];
if (resList) {
var selectedResList = $.map($(element).find('.res-tags[data-resid]'), resDom => $(resDom).data('resid'));
for (var i = 0; i < resList.length; i++) {
if (selectedResList.indexOf(resList[i].resId) !== -1) {
continue;
} else {
$(element).find('.res-tags[data-resid]:last-child').after(`<label class="res-tags" data-resid="${resList[i].resId}">${resList[i].resName} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`);
}
delete obj[$(element).attr('id')];
}
});
$(".choose-res-content").append(laytpl($("#inspectionTaskBoxHtml").html()).render(res['object']))
resTagsCloseEvent();
bottomResAddEvent();
protoTagsCloseEvent();
bottomProtocolAddEvent();
resBoxEvent();
}
delete obj[$(element).attr('id')];
}
});
$(".choose-res-content").append(laytpl($("#inspectionTaskBoxHtml").html()).render(res['object']))
resTagsCloseEvent();
bottomResAddEvent();
protoTagsCloseEvent();
bottomProtocolAddEvent();
resBoxEvent();
})
return true;
}
... ... @@ -360,48 +355,44 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
taskId = hisTaskId;
url = `${common.domainName}/api-web/inspectiontask/findByHisId`
}
$.ajax({
admin.req({
url: url,
headers: {
"Authorization": "Bearer " + accessToken + ""
},
data: {taskId: taskId},
success: function (res) {
var obj = res.object;
var base = obj['base'];
var element = obj['element'];
var tplData = {}, tplDirctive = {}, tplInputName = {}, baselinetpl = {};
form.val('form-inspectiontask-edit', obj['base']);
$('#task-title-version').text(obj['base'].version);
$("#form-inspectiontask-edit").find("[data-name='executionWay'] [data-value='" + base['executionWay'] + "']").trigger("click");
$("#form-inspectiontask-edit").find("[data-name='frequencyType'] [data-value='" + base['frequencyType'] + "']").trigger("click");
$.each(element, function (i, e) {
var tplId = e.resType + "#" + e.resTypeName + "#" + e.protocol;
tplData[tplId] = e.resourceList;
tplDirctive[tplId] = e.dirctiveList;
baselinetpl[tplId] = e.baselineList;
tplInputName[tplId] = e.elementName;
})
$(".choose-res-content").html(laytpl($("#inspectionTaskBoxHtml").html()).render(tplData))
$.each(tplDirctive, function (j, k) {
var html = '';
$.each(k, function (l, m) {
html += `<label class="res-tags" data-dirctiveid="${m.dirctiveId}">${m.dirctiveName}<a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`
})
$(document.getElementById(j)).find(".proto-tags-box div.div-proto-tags").append(html)
$(document.getElementById(j)).find("input[name='taskResName']").val(tplInputName[j])
data: {taskId: taskId}
}).done(function (res) {
var obj = res.object;
var base = obj['base'];
var element = obj['element'];
var tplData = {}, tplDirctive = {}, tplInputName = {}, baselinetpl = {};
form.val('form-inspectiontask-edit', obj['base']);
$('#task-title-version').text(obj['base'].version);
$("#form-inspectiontask-edit").find("[data-name='executionWay'] [data-value='" + base['executionWay'] + "']").trigger("click");
$("#form-inspectiontask-edit").find("[data-name='frequencyType'] [data-value='" + base['frequencyType'] + "']").trigger("click");
$.each(element, function (i, e) {
var tplId = e.resType + "#" + e.resTypeName + "#" + e.protocol;
tplData[tplId] = e.resourceList;
tplDirctive[tplId] = e.dirctiveList;
baselinetpl[tplId] = e.baselineList;
tplInputName[tplId] = e.elementName;
})
$(".choose-res-content").html(laytpl($("#inspectionTaskBoxHtml").html()).render(tplData))
$.each(tplDirctive, function (j, k) {
var html = '';
$.each(k, function (l, m) {
html += `<label class="res-tags" data-dirctiveid="${m.dirctiveId}">${m.dirctiveName}<a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`
})
$(".baseline-element-content").html(laytpl($("#baselineCofigTpl").html()).render(baselinetpl))
resTagsCloseEvent();
bottomResAddEvent();
protoTagsCloseEvent();
bottomProtocolAddEvent();
resBoxEvent();
protoTagsCloseEvent();
baselineProtocolAddEvent();
baselineCloseEvent();
form.render();
}
$(document.getElementById(j)).find(".proto-tags-box div.div-proto-tags").append(html)
$(document.getElementById(j)).find("input[name='taskResName']").val(tplInputName[j])
})
$(".baseline-element-content").html(laytpl($("#baselineCofigTpl").html()).render(baselinetpl))
resTagsCloseEvent();
bottomResAddEvent();
protoTagsCloseEvent();
bottomProtocolAddEvent();
resBoxEvent();
protoTagsCloseEvent();
baselineProtocolAddEvent();
baselineCloseEvent();
form.render();
})
}
... ...
... ... @@ -84,12 +84,12 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
var userListTable = table.render({
elem: '#userlist-table'
, height: '650'
, url: domainName + '/api-user/users'
, url: domainName + '/mj/user/page'
, parseData: function (res) {
return {
"code": 0,
"count": res.count,
"data": res.data
"count": res.data.count,
"data": res.data.rows
};
}
, where: {
... ... @@ -106,13 +106,13 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
done: function (res, curr, count) {
//判断的条件是否选中
if (oldUsers) {
$.each(res.data, function (i, e) {
$.each(res.rows, function (i, e) {
$.each(oldUsers, function (j, k) {
if (e.username === k) {
//选中
res.data[i]["LAY_CHECKED"] = 'true';
res.rows[i]["LAY_CHECKED"] = 'true';
//下面三句是通过更改css来实现选中的效果
var index = res.data[i]['LAY_TABLE_INDEX'];
var index = res.rows[i]['LAY_TABLE_INDEX'];
$('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
$('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
}
... ...