monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 3ff077cc6de2e6db6bbc19b594582ce4fa5b635b 2 parents d894ebd3 fa34fe4e

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

Inline Side-by-side
Showing 18 changed files with 557 additions and 619 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;
... ...
... ... @@ -89,7 +89,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
title: '操作', align: 'center', width: 120, fixed: 'right',
templet: `
<div>
<a data-id="{{d.sqlId}}" class="layui-btn layui-btn-xs layui-btn-normal link-delete-analysissql" lay-tips="删除">删除</>a
<a data-id="{{d.sqlId}}" class="layui-btn layui-btn-xs layui-btn-normal link-delete-analysissql" lay-tips="删除">删除</a>
</div>
`
}]],
... ... @@ -128,20 +128,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/sql/deleteByIdList',
data: {
sqlIdList: sqlIdList.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});
})
})
}
... ... @@ -152,27 +150,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
url: domainName + '/api-web/analysis/sql/syncByIdList',
data: {
sqlIdList: sqlIdList.toString()
},
success(response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg(response.msg, {icon: 1});
reloadTable();
} else {
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
layer.msg('同步失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading');
layer.msg('同步失败!', {icon: 2});
}
}).done(function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg(response.msg, {icon: 1});
reloadTable();
} else {
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
layer.msg('同步失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading');
layer.msg('同步失败!', {icon: 2});
if (objElem) {
objElem.checked = !objElem.checked;
form.render('checkbox')
}
})
}
... ...
... ... @@ -22,12 +22,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
if (sqlId) {
admin.req({
url: domainName + '/api-web/analysis/sql/findById',
data: {sqlId},
success(response) {
if (response && response.success) {
sql = response.object;
form.val('form-edit-analysissql', sql);
}
data: {sqlId}
}).done(function (response) {
if (response && response.success) {
sql = response.object;
form.val('form-edit-analysissql', sql);
}
})
}
... ... @@ -35,31 +34,29 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
form.on('submit(btn-analysissql-submit)', function (data) {
layer.load(2)
admin.req({
url: domainName + '/api-web/analysis/sql/save?access_token=' + accessToken,
url: domainName + '/api-web/analysis/sql/save',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(Object.assign({}, sql, data.field)),
success(response) {
layer.closeAll('loading')
if (response && response.success) {
layer.msg('保存成功!', {icon: 1});
layer.closeAll('page');
table.reload('table-analysissql', {
page: {
curr: 1
},
where: Object.assign({
access_token: accessToken,
}, form.val('form-analysissql-condition'))
})
} else {
layer.msg('保存失败!', {icon: 2});
}
},
error() {
layer.closeAll('loading')
layer.msg('保存失败!', {icon: 2})
data: JSON.stringify(Object.assign({}, sql, data.field))
}).done(function (response) {
layer.closeAll('loading')
if (response && response.success) {
layer.msg('保存成功!', {icon: 1});
layer.closeAll('page');
table.reload('table-analysissql', {
page: {
curr: 1
},
where: Object.assign({
access_token: accessToken,
}, form.val('form-analysissql-condition'))
})
} else {
layer.msg('保存失败!', {icon: 2});
}
}).error(function () {
layer.closeAll('loading')
layer.msg('保存失败!', {icon: 2})
})
return false;
... ...
... ... @@ -12,8 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
var upload = layui.upload; //上传
exports('dutyIndex', function () {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
//var sessions = layui.sessions;
var accessToken = localStorage.getItem("accessToken");
var domainName = common.domainName;
var user = localStorage.getItem("lgn");
var roles = sessionStorage.getItem('roles');
... ... @@ -40,13 +40,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
$('.table-duty-title-text').text(yearNew + '年' + monthNew + '月');
loadTable();
var param = {"accessToken": accessToken}
//渲染上传组件
var uploadIndex = upload.render({
elem: '#btn-duty-dutyImport'
, url: domainName + '/api-web/manage/duty/importFromTemplate?access_token=' + accessToken
, accept: 'file',
before: function () {
, url: domainName + '/api-web/manage/duty/importFromTemplate?accessToken=' + accessToken
,data: param
,accept: 'file' //允许上传的文件类型
,exts:'xlsx'
,multiple:true
,before: function () {
loadIndex = layer.load(1, {shade: [0.6], content: '正在导入，请稍后...'});
}
, done: function (res) {
... ... @@ -306,7 +309,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
var paramMonth = $('#duty-calendar-export-month').val();
if (paramYear || paramMonth) {
var params = {};
params.access_token = accessToken;
params.accessToken = accessToken;
params.year = paramYear;
params.month = paramMonth;
layer.closeAll();
... ... @@ -343,7 +346,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
var param = $('#dutyYearMonth').val();
if (param) {
var params = {};
params.access_token = accessToken;
params.accessToken = accessToken;
params.year = param.split("-")[0];
params.month = param.split("-")[1];
window.open(domainName + '/api-web/manage/duty/template?' + $.param(params));
... ... @@ -460,7 +463,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
changeUserAccount
}
admin.req({
url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken,
url: domainName + '/api-web/manage/duty/save?accessToken=' + accessToken,
type: 'POST',
async: false,
contentType: 'application/json',
... ... @@ -486,7 +489,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
function iSExchange(id) {
var value = false;
admin.req({
url: domainName + '/api-web/manage/duty/queryExchange?access_token=' + accessToken,
url: domainName + '/api-web/manage/duty/queryExchange?accessToken=' + accessToken,
async: false,
data: {id: id},
}).done(function (response) {
... ... @@ -502,7 +505,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
function iSExchangeClass(id) {
var value = false;
admin.req({
url: domainName + '/api-web/manage/duty/queryExchangeClass?access_token=' + accessToken,
url: domainName + '/api-web/manage/duty/queryExchangeClass?accessToken=' + accessToken,
async: false,
data: {id: id},
}).done(function (response) {
... ... @@ -582,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
function obtain() {
//获取用户数据
$.ajax({
url: common.domainName + '/api-user/users/getAll?access_token=' + accessToken,
url: common.domainName + '/mj/user/getAll?accessToken=' + accessToken,
async: false,
data: {name: ''},
success: function (data) {
... ... @@ -642,12 +645,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
if (arr && arr.length == 1) {
changeUserId = arr[0].value;
}
if (changeUserId == '') {
if (changeUserId == '') {d
return;
}
//获取时间段数据
$.ajax({
url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&access_token=' + accessToken,
url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&accessToken=' + accessToken,
async: false,
success: function (data) {
data = data.data;
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('inspectionResultElement', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var batchNo = data.batchNo;
execute(batchNo);
... ... @@ -52,7 +52,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var height = false
layer.load(2);
admin.req({
url: domainName + '/api-web/inspectiontask/indpectionElement?access_token=' + accessToken,
url: domainName + '/api-web/inspectiontask/indpectionElement',
type: 'get',
data: {batchNo: batchNo},
contentType: 'application/json',
... ... @@ -61,7 +61,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
if (res.data) {
$.each(res.data, function (v, e) {
$("#inspectionResultExecute").append(laytpl(tableHtml).render(e));
var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?access_token=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId
var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?accessToken=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId
table.render({
elem: "#" + e.elementId
, url: reqUrl
... ... @@ -144,30 +144,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var $table = $('#inspectionResultExecute div[lay-id="' + elementId + '"');
if ($table.length) {
admin.req({
url: url,
success: function (response) {
if (response && response.data) {
for (let i = 0; i < response.data.length; i++) {
var $tr = $table.find('tr[data-index="' + i + '"]');
var colList = ['status', 'duration', 'funResultFlag', 'funResult'];
for (let j = 0; j < colList.length; j++) {
var $td = $tr.find('td[data-field="' + colList[j] + '"]');
// 当且仅当原值与现值不同，并且至少有一方有值时。
if (((response.data[i][colList[j]] + '') != $td.attr('data-content')) && (($td.attr('data-content') || $td.attr('data-content') === 0) || (response.data[i][colList[j]] || response.data[i][colList[j]] === 0))) {
if (response.data[i][colList[j]] || response.data[i][colList[j]] === 0) {
$td.attr('data-content', response.data[i][colList[j]]);
} else {
$td.attr('data-content', '');
}
changeTextSoftly($td.find('div'), eval(colList[j] + 'Format(' + JSON.stringify(response.data[i]) + ')'));
url: url
}).done(function (response) {
if (response && response.data) {
for (let i = 0; i < response.data.length; i++) {
var $tr = $table.find('tr[data-index="' + i + '"]');
var colList = ['status', 'duration', 'funResultFlag', 'funResult'];
for (let j = 0; j < colList.length; j++) {
var $td = $tr.find('td[data-field="' + colList[j] + '"]');
// 当且仅当原值与现值不同，并且至少有一方有值时。
if (((response.data[i][colList[j]] + '') != $td.attr('data-content')) && (($td.attr('data-content') || $td.attr('data-content') === 0) || (response.data[i][colList[j]] || response.data[i][colList[j]] === 0))) {
if (response.data[i][colList[j]] || response.data[i][colList[j]] === 0) {
$td.attr('data-content', response.data[i][colList[j]]);
} else {
$td.attr('data-content', '');
}
changeTextSoftly($td.find('div'), eval(colList[j] + 'Format(' + JSON.stringify(response.data[i]) + ')'));
}
}
}
setTimeout(() => {
refreshElementTable(elementId, url)
}, 3000);
}
setTimeout(() => {
refreshElementTable(elementId, url)
}, 3000);
});
}
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('inspectionResultIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().accessToken;
var accessToken = common.getMjToken();
var inspectionResultTable;
var lastSearchCondition;
//页面关闭状态
... ... @@ -71,7 +71,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function initTable() {
inspectionResultTable = table.render({
elem: '#inspectionResultTable'
, url: domainName + '/api-web/inspectiontask/inspectionTaskLog?accessToken=' + accessToken
, url: domainName + '/api-web/inspectiontask/inspectionTaskLog'
, where: whereSearch()
, height: 'full-210'
, cellMinWidth: 80
... ... @@ -231,7 +231,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var loding = layer.load(2);
// openExelogWindow();
admin.req({
url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken + '&taskId=' + task.taskId
url: domainName + '/api-web/inspectiontask/exec?taskId=' + task.taskId
}).done(function (response) {
if (response.success) {
layer.close(loding);
... ... @@ -255,7 +255,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//获取巡检结果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));
... ... @@ -342,28 +342,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
if ($('li[lay-id="/inspectionresult/index"]').length) {
admin.req({
url: domainName + '/api-web/inspectiontask/inspectionTaskLog',
data: lastSearchCondition,
success: function (response) {
if (response && response.data) {
for (var i = 0; i < response.data.length; i++) {
var batchNo = response.data[i].batchNo;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + batchNo + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
}
data: lastSearchCondition
}).done(function (response) {
if (response && response.data) {
for (var i = 0; i < response.data.length; i++) {
var batchNo = response.data[i].batchNo;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + batchNo + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
}
}
}
setTimeout(refreshTaskStatus, 7000);
}
setTimeout(refreshTaskStatus, 7000);
});
}
}
... ...
... ... @@ -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();
})
}
... ...
... ... @@ -3,6 +3,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
var $ = layui.$;
var form = layui.form;
var common = layui.common;
var admin = layui.admin;
var table = layui.table;
//对外暴露的接口
exports('reportSelectAdd', function (data) {
... ... @@ -12,7 +13,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
form.render();
if (id) {
var url = common.domainName + '/inspection-report/report/select/findByIds';
$.get(url, {'id': id, 'access_token': accessToken}, function (res) {
admin.req({
url: url,
data: {'id': id}
}).done(function (res) {
if (res.object) {
let data = res.object;
var $form = $("#reportSelectAddForm");
... ... @@ -67,24 +71,22 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
form.on('submit(reportSelect-add-submit)', function (data) {
var bean = data.field;
var loading = layer.load(2);
$.ajax({
admin.req({
type: 'post',
url: common.domainName + '/inspection-report/report/select/saveOrUpdate?access_token=' + accessToken,
url: common.domainName + '/inspection-report/report/select/saveOrUpdate',
contentType: "application/json; charset=utf-8",
data: JSON.stringify(bean),
success: function (res) {
layer.close(loading);
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
table.reload('reportSelect_table', {});
})
}
data: JSON.stringify(bean)
}).done(function (res) {
layer.close(loading);
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
table.reload('reportSelect_table', {});
})
});
})
});
... ...
... ... @@ -4,6 +4,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
var form = layui.form;
var common = layui.common;
var table = layui.table;
var admin = layui.admin;
//对外暴露的接口
exports('reportparamAdd', function (data) {
var id = data.paramId;
... ... @@ -28,22 +29,21 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
}
} else {
var url = domainName + '/inspection-report/dataSource/validateDataSource';
$.ajax({
admin.req({
url: url,
data: {
"pollName": $form.find("select[name='pollName']").val(),
"content": value,
'access_token': accessToken
'accessToken': accessToken
},
async: false,
success: function (res) {
if (res.success && (res.data[0] != '`key`' || res.data[1] != '`value`')) {
msg = '当前输出内容未检测倒输出关键字 key或value'
} else {
msg = res.msg;
}
async: false
}).done(function (res) {
if (res.success && (res.data[0] != '`key`' || res.data[1] != '`value`')) {
msg = '当前输出内容未检测倒输出关键字 key或value'
} else {
msg = res.msg;
}
})
});
}
return msg
}
... ... @@ -53,8 +53,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
function loadSelect() {
var $dom = $("#reportparamAddForm").find("select[name='pollName']");
var url = domainName + '/inspection-report/dataSource/loadSelect?access_token=' + accessToken;
$.get(url, function (res) {
var url = domainName + '/inspection-report/dataSource/loadSelect';
admin.req({
url: url
}).done(function (res) {
$dom.empty();
if (res.success) {
let html = '';
... ... @@ -64,7 +66,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
$dom.append(html)
if (id) {
var url = common.domainName + '/inspection-report/report/param/findById';
$.get(url, {'paramId': id, 'access_token': accessToken}, function (res) {
admin.req({
url: url,
data: {'paramId': id}
}).done(function (res) {
if (res.object) {
let data = res.object;
var $form = $("#reportparamAddForm");
... ... @@ -98,24 +103,22 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
form.on('submit(reportparam-add-submit)', function (data) {
var bean = data.field;
var loading = layer.load(2);
$.ajax({
admin.req({
type: 'post',
url: common.domainName + '/inspection-report/report/param/save?access_token=' + accessToken,
url: common.domainName + '/inspection-report/report/param/save',
contentType: "application/json; charset=utf-8",
data: JSON.stringify(bean),
success: function (res) {
layer.close(loading);
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
table.reload('reportparam_table', {});
})
}
data: JSON.stringify(bean)
}).done(function (res) {
layer.close(loading);
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
table.reload('reportparam_table', {});
})
});
})
});
... ...
... ... @@ -52,7 +52,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
elem: '#reportparam_table'
, url: domainName + '/inspection-report/report/param/page'
, where: {
access_token: accessToken,
paramName: $('#reportparamSearchForm').find("input[name='keyword']").val()
}
, height: 'full-200'
... ... @@ -170,7 +169,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
curr: 1
}
, where: {
access_token: accessToken,
paramName: $('#reportparamSearchForm').find("input[name='keyword']").val()
}
});
... ...
... ... @@ -62,22 +62,20 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
, function () {
loading = layer.load(2);
admin.req({
url: domainName + '/inspection-report/type/delete?access_token=' + accessToken
url: domainName + '/inspection-report/type/delete'
, type: 'get'
, data: {ids: ids.toString()}
, success(response) {
layer.close(loading);
if (response.success) {
layer.msg("已删除", {icon: 1, time: 3000})
loadreporttypeTable()
} else {
layer.msg('删除失败!', {icon: 2, time: 3000})
}
}
, error(error) {
layer.close(loading);
}).done(function (response) {
layer.close(loading);
if (response.success) {
layer.msg("已删除", {icon: 1, time: 3000})
loadreporttypeTable()
} else {
layer.msg('删除失败!', {icon: 2, time: 3000})
}
}).error(function (error) {
layer.close(loading);
layer.msg('删除失败!', {icon: 2, time: 3000})
})
})
}
... ... @@ -122,41 +120,38 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
var $form = $("#form-reporttype-edit");
//xmSelect.get("#rt_reporttype_pid")[0].setValue();
$("#form-reporttype-edit").find("input[name='id']").val(id)
$.ajax({
url: common.domainName + '/inspection-report/type/fidnById?id=' + id + '&access_token=' + accessToken,
success: function (res) {
var bean = res.object;
xmSelect.get("#rt_reporttype_pid")[0].setValue([bean.pid]);
$form.find("input[name='name']").val(bean.name);
$form.find("input[name='docNo']").val(bean.docNo);
$form.find("input[name='sort']").val(bean.sort);
form.render();
},
error: function () {
layer.close(loding)
layer.msg("配置失败！服务异常", {offset: '15px', icon: 7, time: 2000});
}
admin.req({
url: common.domainName + '/inspection-report/type/fidnById?id=' + id
}).done(function (res) {
var bean = res.object;
xmSelect.get("#rt_reporttype_pid")[0].setValue([bean.pid]);
$form.find("input[name='name']").val(bean.name);
$form.find("input[name='docNo']").val(bean.docNo);
$form.find("input[name='sort']").val(bean.sort);
form.render();
}).error(function () {
layer.close(loding)
layer.msg("配置失败！服务异常", {offset: '15px', icon: 7, time: 2000});
})
}
form.on('submit(report-type-submit)', function (data) {
var bean = data.field;
loading = layer.load(2);
$.ajax({
url: common.domainName + '/inspection-report/type/save?access_token=' + accessToken,
admin.req({
url: common.domainName + '/inspection-report/type/save',
type: 'post',
data: JSON.stringify(bean),
contentType: "application/json;charset=utf-8",
success: function (res) {
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
loadreporttypeTable();
})
}
contentType: "application/json;charset=utf-8"
}).done(function (res) {
layer.msg('保存成功', {
offset: '15px'
, icon: 1
, time: 2000
}, function () {
layer.closeAll();
loadreporttypeTable();
})
})
})
}
... ... @@ -177,70 +172,68 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
admin.req({
url: domainName + '/inspection-report/type/page'
, data: conditions
, success(response) {
layer.close(loading)
reporttypeTable = treeTable.render({
elem: '#reporttype-table'
, cellMinWidth: 80
, data: response.data
, tree: {
iconIndex: 1 // 折叠图标显示在第几列
, isPidData: true // 是否是id、pid形式数据
, idName: 'id' // id字段名称
, pidName: 'pid' // pid字段名称
, onlyIconControl: true // 仅允许点击图标折叠
}).done(function (response) {
layer.close(loading)
reporttypeTable = treeTable.render({
elem: '#reporttype-table'
, cellMinWidth: 80
, data: response.data
, tree: {
iconIndex: 1 // 折叠图标显示在第几列
, isPidData: true // 是否是id、pid形式数据
, idName: 'id' // id字段名称
, pidName: 'pid' // pid字段名称
, onlyIconControl: true // 仅允许点击图标折叠
}
, cols: [
{
type: 'checkbox'
}
, cols: [
{
type: 'checkbox'
}
, {
field: 'reporttypeName', title: '名称', align: 'left', sort: true
, templet:
'<div>' +
' <span' +
' data-id="{{d.id}}" ' +
' class="layui-table-link btn-reporttype-edit">{{d.name}}' +
' </span>' +
'</div>'
}
, {field: 'docNo', title: '文档编号', align: 'center', sort: true}
, {field: 'sort', title: '排序', align: 'center', sort: true}
, {
field: 'createTime',
title: '创建时间',
align: 'center',
sort: true,
templet: '<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>\''
}
, {
title: '操作', align: 'center'
, toolbar:
'<div>' +
' <a data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal delete-reporttype-btn" lay-tips="删除">删除</a>' +
'</div>'
}
]
});
// 删除按钮事件
$(".delete-reporttype-btn").on("click", function () {
var ids = reporttypeTable.getIdsById($(this).data("id"), 'id');
deletereporttype(ids);
});
// 编辑事件
$(".btn-reporttype-edit").click(function () {
if (!common.hasPermission('back:reporttype:update')) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
, {
field: 'reporttypeName', title: '名称', align: 'left', sort: true
, templet:
'<div>' +
' <span' +
' data-id="{{d.id}}" ' +
' class="layui-table-link btn-reporttype-edit">{{d.name}}' +
' </span>' +
'</div>'
}
savereporttype($(this).data("id"))
})
}
, error(error) {
layer.close(loading)
}
, {field: 'docNo', title: '文档编号', align: 'center', sort: true}
, {field: 'sort', title: '排序', align: 'center', sort: true}
, {
field: 'createTime',
title: '创建时间',
align: 'center',
sort: true,
templet: '<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>\''
}
, {
title: '操作', align: 'center'
, toolbar:
'<div>' +
' <a data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal delete-reporttype-btn" lay-tips="删除">删除</a>' +
'</div>'
}
]
});
// 删除按钮事件
$(".delete-reporttype-btn").on("click", function () {
var ids = reporttypeTable.getIdsById($(this).data("id"), 'id');
deletereporttype(ids);
});
// 编辑事件
$(".btn-reporttype-edit").click(function () {
if (!common.hasPermission('back:reporttype:update')) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
savereporttype($(this).data("id"))
})
}).error(function (error) {
layer.close(loading)
})
}
... ...
... ... @@ -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) {
//点击角色名称 进行编辑
... ...
... ... @@ -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');
}
... ...
... ... @@ -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>分配菜单权限-->
... ...
... ... @@ -15,7 +15,7 @@
</div>
</div>
<button class="layui-btn layui-btn-normal" id="selfmonitorQueryBtn" type="button">
查询
搜索
</button>
<!-- <div class="layui-inline">-->
<!-- <button id="heartbeatQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i-->
... ...