monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 846f613310130edba8761f7500ab6bc81301a7f9 2 parents 14677d4b 432110a4

Merge branch 'master-mj-yjpeng' into 'master-mj' 

fix:工作日志厂商加载不出来的问题修改，cmdb厂商。机房信息加载优化



See merge request !1174
Inline Side-by-side
Showing 33 changed files with 671 additions and 390 deletions
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('bizupgrade', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var timeChart = echarts.init(document.getElementById('bizupgrade-chart-time-record'));
var inspIsLoad = false;
... ... @@ -144,17 +144,29 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
field: 'upgradePerson', title: '升级人', align: 'center',
},{
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
return d.manufacturerOther;
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
},{
field: 'upgradePhone', title: '升级人电话', align: 'center',
... ... @@ -222,17 +234,29 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
field: 'upgradePerson', title: '升级人', align: 'center',
},{
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
return d.manufacturerOther;
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
},{
field: 'upgradePhone', title: '升级人电话', align: 'center',
... ... @@ -283,20 +307,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.bizTypeSelect("slt-bizupgrade-biz", function () {
form.render("select");
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=升级单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-bizupgrade-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-bizupgrade-group').html(options);
form.render();
}
});
}
$("#bizupgrade-export-excel").on('click', function () {
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('bizupgradeAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var userSelect = "";
var currentDate = {}
var hitDate = {}
... ... @@ -115,17 +115,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
form.render("select");
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-upgradeadd-group').html(options);
form.render();
fromAssignment();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-upgradeadd-group').html(options);
form.render();
fromAssignment();
}
});
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("bizupgradeList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
createAttachmentTable()
... ...
... ... @@ -9,10 +9,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
var session = layui.sessions;
var laydate = layui.laydate;
var domainName = common.domainName;
var domainName = common.domainName;;
//对外暴露的接口
exports('deviceAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
//机房cmdb配置项类id
var objectId = '5A130B5304C348BA98E7E3BDE765611';
var enterTime = {};
var outTime = {};
var devicesBak = [];
... ... @@ -241,29 +243,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
loadSelect()
initDatePlus()
}
// 初始化下拉框
function loadSelect() {
admin.req({
url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
}).done(function (response) {
var options = "<option value=''>=归属机房=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-staffadd-machine').html(options);
form.render();
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res) {
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-staffadd-machine').html(options);
form.render();
}
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staffadd-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staffadd-group').html(options);
form.render();
}
});
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("deviceList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
createDeviceTable()
function dateForm(time) {
var unixTimestamp = new Date(time);
... ...
... ... @@ -9,7 +9,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('devicehitch', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
//机房cmdb配置项类id
var objectId = '5A130B5304C348BA98E7E3BDE765611';
var domainName = common.domainName;
var orgChart = echarts.init(document.getElementById('chart-devicehitch-report'));
var dateLimit = "";
... ... @@ -114,13 +116,25 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-devicehitch-title" >{{d.title}}</span></div>'
}, {
field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
var machineRoomName = '';
if(machineArr && machineArr.length>0){
$.each(machineArr, function (i, v) {
if(d.machineRoomId==v.id) {
return v.name;
machineRoomName = v.name;
}
})
}else {
var url =domainName +'/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&id='+d.machineRoomId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
$.each(res.data, function (i, v) {
machineRoomName = v.shortName;
});
}
});
}
return machineRoomName;
}
}, {
field: 'deviceTypeName', title: '设备类型', align: 'center',width:88
... ... @@ -201,6 +215,20 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载查询条件下拉框
function loadConditionSelect() {
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
machineArr.push(obj);
});
}
});
admin.req({
url: domainName + '/api-web/bResource/getInfoByAssetsType',
}).done(function (response) {
... ...
... ... @@ -14,7 +14,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('devicehitchAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
//机房cmdb配置项类id
var objectId = '5A130B5304C348BA98E7E3BDE765611';
var userSelect = "";
var currentDate = {}
var applyDate = {}
... ... @@ -120,28 +122,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
form.render();
});
admin.req({
url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
}).done(function (response) {
var options = "<option value=''>=归属机房=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-devicehitch-machine').html(options);
form.render();
fromAssignment()
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res) {
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-devicehitch-machine').html(options);
form.render();
fromAssignment();
}
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-discoverMfId-group').html(options);
$('#slt-repairMfId-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-discoverMfId-group').html(options);
$('#slt-repairMfId-group').html(options);
form.render();
}
});
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("devicehitchList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('emergency', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var timeChart = echarts.init(document.getElementById('emergency-chart-time-record'));
var inspIsLoad = false;
... ... @@ -17,7 +17,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var currSelect = 0;
var dateLimit = ""
var createTime = "month"
var manufactureArr = [];
//日期范围选择
laydate.render({
... ... @@ -148,12 +148,30 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}, {
field: 'operationUser', title: '运维人', align: 'center',
}, {
field: 'manufacturerName', title: '所属单位', align: 'center', templet: function (d) {
if (d.manufacturerId == '0') {
return '其他';
} else {
return d.manufacturerName;
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'mphone', title: '运维电话', align: 'center',
... ... @@ -220,13 +238,31 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}, {
field: 'operationUser', title: '运维人', align: 'center',
}, {
field: 'manufacturerName', title: '所属单位', align: 'center', templet: function (d) {
if (d.manufacturerId == '0') {
return '其他';
} else {
return d.manufacturerName;
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}
}, {
field: 'mphone', title: '运维电话', align: 'center',
}, {
... ... @@ -318,16 +354,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.bizTypeSelect("slt-emergency-biz", function () {
form.render("select");
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=运维单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-emergency-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-emergency-group').html(options);
form.render();
}
});
}
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('emergencyAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var userSelect = "";
var currentDate = {}
var hitDate = {}
... ... @@ -174,17 +174,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
common.bizTypeSelect("slt-biz-add", function () {
form.render("select");
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=运维公司=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-emergencyadd-group').html(options);
form.render();
fromAssignment();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-emergencyadd-group').html(options);
form.render();
fromAssignment();
}
});
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("emergencyList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('enterDevice', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var timeChart = echarts.init(document.getElementById('device-chart-time-record'));
var inspIsLoad = false;
... ... @@ -19,15 +19,16 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var createTime = "month"
var manufactureArr = [];
var machineArr = [];
//机房cmdb配置项类id
var objectId = '5A130B5304C348BA98E7E3BDE765611';
//日期范围选择
laydate.render({
elem: '#devicedateLimit'
,range: '~',
, range: '~',
trigger: 'click',
ready: function(date){
ready: function (date) {
$("#devicedateLimit").removeAttr("lay-key");
$(this).attr("lay-key","1");
$(this).attr("lay-key", "1");
},
done: function (value) {
dateLimit = value
... ... @@ -101,6 +102,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}
currSelect = data.index;
});
// 加载配件更换表格
function renderEnterDeviceListTable() {
var conditions = form.val('form-enterStaff-condition');
... ... @@ -127,35 +129,61 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
limits: common.limits,
even: true,
cols: [[
{type: 'checkbox'},{
field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
if(machineArr && machineArr.length>0){
$.each(machineArr, function (i, v) {
if(d.machineRoomId==v.id){}
return v.name;
})
}
}
}, {
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
if(d.manufacturerId == '0'){
return d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id){}
return v.name;
{type: 'checkbox'}, {
field: 'machineRoomName', title: '机房', align: 'center', templet: function (d) {
var machineRoomName = '';
if (machineArr && machineArr.length > 0) {
$.each(machineArr, function (i, v) {
if (d.machineRoomId == v.id) {
machineRoomName = v.name;
}
})
} else {
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&id=' + d.machineRoomId + '&accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
$.each(res.data, function (i, v) {
machineRoomName = v.shortName;
});
}
});
}
return machineRoomName;
}
}
}, {
field: 'applyUser', title: '申请人', align: 'center',
}, {
field: 'phone', title: '联系方式', align: 'center',
}, {
field: 'actionType', title: '设备出入类型', align: 'center',
templet: `
}, {
field: 'manufacturerName', title: '工作单位', align: 'center', templet: function (d) {
var manufacturerName = '';
if (d.manufacturerId == '0') {
manufacturerName = d.manufacturerOther;
} else {
if (manufactureArr && manufactureArr.length > 0) {
$.each(manufactureArr, function (i, v) {
if (d.manufacturerId == v.id) {
manufacturerName = v.name;
}
})
} else {
var url = domainName + '/cmdb-CI/supplier/find/' + d.manufacturerId + '?accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
if (res.data.cmdbSupplier) {
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'applyUser', title: '申请人', align: 'center',
}, {
field: 'phone', title: '联系方式', align: 'center',
}, {
field: 'actionType', title: '设备出入类型', align: 'center',
templet: `
<div>
{{#
var actionTypeEnum = {
... ... @@ -172,28 +200,28 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
{{actionTypeStr}}
</div>
`
}, {
field: 'enterDevices', title: '设备数量', align: 'center',
templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-device">{{d.enterDevices.length}}</span></div>'
}, {
field: 'reason', title: '进入事由', align: 'center',
}, {
field: 'lastPlace', title: '原物理位置', align: 'center',
}, {
field: 'localPlace', title: '现物理位置', align: 'center',
}, {
field: 'enterTime', title: '进入时间', align: 'center',
}, {
field: 'outTime', title: '出来时间', align: 'center',
}, {
field: 'machineRoomLeader', title: '设备负责人', align: 'center',
}, {
field: 'integration', title: '总集成', align: 'center',
}, {
field: 'operationUser', title: '运维负责人', align: 'center',
}, {
field: 'watchkeeper', title: '机房值班人', align: 'center',
}
}, {
field: 'enterDevices', title: '设备数量', align: 'center',
templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-device">{{d.enterDevices.length}}</span></div>'
}, {
field: 'reason', title: '进入事由', align: 'center',
}, {
field: 'lastPlace', title: '原物理位置', align: 'center',
}, {
field: 'localPlace', title: '现物理位置', align: 'center',
}, {
field: 'enterTime', title: '进入时间', align: 'center',
}, {
field: 'outTime', title: '出来时间', align: 'center',
}, {
field: 'machineRoomLeader', title: '设备负责人', align: 'center',
}, {
field: 'integration', title: '总集成', align: 'center',
}, {
field: 'operationUser', title: '运维负责人', align: 'center',
}, {
field: 'watchkeeper', title: '机房值班人', align: 'center',
}
]],
done: function () {
//获取人员列表
... ... @@ -204,6 +232,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}
});
}
// 加载设备出入表格
function renderFittingFixListTable() {
var conditions = form.val('form-enterStaff-condition');
... ... @@ -229,29 +258,53 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
limit: common.limit,
limits: common.limits,
even: true,
cols: [[ {type: 'checkbox'},{
field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
if(machineArr && machineArr.length>0){
cols: [[{type: 'checkbox'}, {
field: 'machineRoomName', title: '机房', align: 'center', templet: function (d) {
var machineRoomName = '';
if (machineArr && machineArr.length > 0) {
$.each(machineArr, function (i, v) {
if(d.machineRoomId==v.id) {
return v.name;
if (d.machineRoomId == v.id) {
machineRoomName = v.name;
}
})
} else {
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&id=' + d.machineRoomId + '&accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
$.each(res.data, function (i, v) {
machineRoomName = v.shortName;
});
}
});
}
return machineRoomName;
}
}, {
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
if(d.manufacturerId == '0'){
return d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
field: 'manufacturerName', title: '工作单位', align: 'center', templet: function (d) {
var manufacturerName = '';
if (d.manufacturerId == '0') {
manufacturerName = d.manufacturerOther;
} else {
if (manufactureArr && manufactureArr.length > 0) {
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
if (d.manufacturerId == v.id) {
manufacturerName = v.name;
}
})
} else {
var url = domainName + '/cmdb-CI/supplier/find/' + d.manufacturerId + '?accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
if (res.data.cmdbSupplier) {
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'applyUser', title: '申请人', align: 'center',
... ... @@ -276,7 +329,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
{{actionTypeStr}}
</div>
`
}, {
}, {
field: 'deviceModel', title: '设备型号', align: 'center',
}, {
field: 'localPlace', title: '设备物理位置', align: 'center',
... ... @@ -308,6 +361,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}
});
}
//新增日报
$('#device_create').on('click', function () {
openDeviceForm()
... ... @@ -319,7 +373,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
$("#device-form-save-id").trigger("click");
reloadAllChange();
},null,null,null,{end: reloadAllChange()})
}, null, null, null, {end: reloadAllChange()})
}
//查看更换配件列表
... ... @@ -329,6 +383,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/fittingList', title, {id: id}, ['确定', '取消'])
}
//查看进出设备列表
function openDeviceList(id) {
... ... @@ -339,32 +394,36 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载查询条件下拉框
function loadConditionSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
form.render();
}
});
admin.req({
url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
}).done(function (response) {
var options = "<option value=''>=归属机房=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
machineArr.push(obj);
});
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
machineArr.push(obj);
});
}
});
}
... ... @@ -377,29 +436,29 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
window.open(href)
})
//下载
$('#device_download').on('click', function (){
$('#device_download').on('click', function () {
var data = [];
var attachmentId ="";
var attachmentId = "";
var docType = "";
if (currSelect == 0) {
data = table.checkStatus('enterdevice_table_id').data;
attachmentId = '2136d6a1709811edb49f005056aae0ca';
docType = '1';
}else if (currSelect == 1) {
} else if (currSelect == 1) {
data = table.checkStatus('fitting-table').data;
attachmentId = '713fc12f709811edb49f005056aae0ca';
docType = '2';
}
var ids = '';
if(data.length<=0){
layer.msg("请至少选择一条下载", { offset: '15px' , icon: 7 , time: 1500 });
}else if(data.length>=1){
if (data.length <= 0) {
layer.msg("请至少选择一条下载", {offset: '15px', icon: 7, time: 1500});
} else if (data.length >= 1) {
var arr = [];
$.each(data,function (i,e) {
$.each(data, function (i, e) {
arr.push(e.id)
})
ids = arr.toString();
var url = domainName + `/api-web/machineRoom/downloadWordZipforDevice?accessToken=` + accessToken+"&ids="+ids+"&attachmentId="+ attachmentId+"&docType="+docType;
var url = domainName + `/api-web/machineRoom/downloadWordZipforDevice?accessToken=` + accessToken + "&ids=" + ids + "&attachmentId=" + attachmentId + "&docType=" + docType;
window.open(url);
}
})
... ... @@ -439,7 +498,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
itemStyle: {
color: "#1e9fff"
}
},{
}, {
name: '配件更换',
data: fittingList,
barWidth: 20,
... ... @@ -504,8 +563,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
axisLabel: {
color: '#333',
show: true,
interval:0,
rotate:15
interval: 0,
rotate: 15
},
axisLine: {
lineStyle: {
... ...
... ... @@ -9,14 +9,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('enterStaff', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var timeChart = echarts.init(document.getElementById('chart-time-record'));
var manufactureArr = [];
var machineArr = [];
var dateLimit = ""
var createTime = "month"
//机房cmdb配置项类id
var objectId = '5A130B5304C348BA98E7E3BDE765611';
//日期范围选择
laydate.render({
... ... @@ -110,27 +111,51 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
cols: [[
{type: 'checkbox'},{
field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
var machineRoomName = '';
if(machineArr && machineArr.length>0){
$.each(machineArr, function (i, v) {
if(d.machineRoomId==v.id) {
return v.name;
machineRoomName = v.name;
}
})
}else {
var url =domainName +'/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&id='+d.machineRoomId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
$.each(res.data, function (i, v) {
machineRoomName = v.shortName;
});
}
});
}
return machineRoomName;
}
}, {
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
return d.manufacturerOther;
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'applyUser', title: '申请人', align: 'center',
... ... @@ -211,32 +236,36 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载查询条件下拉框
function loadConditionSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
form.render();
}
});
admin.req({
url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
}).done(function (response) {
var options = "<option value=''>=归属机房=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
machineArr.push(obj);
});
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
machineArr.push(obj);
});
}
});
}
... ... @@ -366,6 +395,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}],
series: series
};
option.xAxis.axisLabel.color = function (value, index) {
if (value === 'Thu' || value === 'Fri') {
return 'blue';
} else {
return '#333'; // 普通颜色
}
};
timeChart.setOption(option)
});
}
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('extra', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var orgChart = echarts.init(document.getElementById('chart-extra-report'));
var dateLimit = "";
... ... @@ -115,18 +115,30 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}, {
field: 'extraWorker', title: '加班人', align: 'center'
}, {
field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
if(d.manufacturerId == '0'){
return d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
field: 'manufacturerName', title: '工作单位', align: 'center', templet: function (d) {
var manufacturerName = '';
if (d.manufacturerId == '0') {
manufacturerName = d.manufacturerOther;
} else {
if (manufactureArr && manufactureArr.length > 0) {
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
if (d.manufacturerId == v.id) {
manufacturerName = v.name;
}
})
} else {
var url = domainName + '/cmdb-CI/supplier/find/' + d.manufacturerId + '?accessToken=' + accessToken
$.ajax({
url: url,
success: function (res) {
if (res.data.cmdbSupplier) {
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'extraPhone', title: '联系方式', align: 'center'
... ... @@ -191,20 +203,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载查询条件下拉框
function loadConditionSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-extra-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-extra-group').html(options);
form.render();
}
});
}
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('extraAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var userSelect = "";
var currentDate = {}
var applyDate = {}
... ... @@ -108,17 +108,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
// 初始化下拉框
function loadSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-extraAdd-org').html(options);
form.render();
fromAssignment()
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-extraAdd-org').html(options);
form.render();
fromAssignment()
}
});
}
... ...
... ... @@ -11,9 +11,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("extraList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
$('#attachmentTable').show();
createAttachmentTable()
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("fittingList", function (d) {
var accessToken = session.getToken()['access_token']
var accessToken = common.getMjToken();
createFittingTable()
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('meetingApply', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken =common.getMjToken();
var domainName = common.domainName;
var orgChart = echarts.init(document.getElementById('chart-MeetingApply-report'));
var dateLimit = "";
... ...
... ... @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('meetingApplyAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken =common.getMjToken();
var userSelect = "";
var currentDate = {}
var hitDate = {}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("meetingApplyList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('meetingsummary', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var orgChart = echarts.init(document.getElementById('chart-meetingsummary-report'));
var dateLimit = "";
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
var domainName = common.domainName;
//对外暴露的接口
exports('meetingsummaryAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var id = data.id
rendermeetingsummaryManuListTable();
... ...
... ... @@ -8,14 +8,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var laydate = layui.laydate;
var element = layui.element;
exports('recoveryverify', function () {
var sessions = layui.sessions;
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var timeChart = echarts.init(document.getElementById('recoveryverify-chart-time-record'));
var dateLimit = ""
var createTime = "year"
var manufactureArr = [];
//日期范围选择
laydate.render({
... ... @@ -47,14 +46,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
loadrecoveryverifyChart();
loadConditionSelect();
//监听Esc事件
/* $(document).keyup(function (event) {
if (event.keyCode === 27) {
layer.closeAll();
}
});
*/
// 日期方式选择
$('#btns-recoveryverify-time button').click(function () {
$.each($("button.date"), function (i, e) {
... ... @@ -132,13 +124,31 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}, {
field: 'operationUser', title: '运维负责人', align: 'center',
}, {
field: 'omanufacturerName', title: '所属单位', align: 'center', templet: function (d) {
if (d.omanufacturerId == '0') {
return '其他';
} else {
return d.omanufacturerName;
field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerId == '0'){
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.omanufacturerId==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.omanufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}
}, {
field: 'ophone', title: '联系方式', align: 'center',
},{
... ... @@ -226,16 +236,22 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.bizTypeSelect("slt-recoveryverify-biz", function () {
form.render("select");
});
admin.req({
url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
}).done(function (response) {
var options = "<option value=''>=运维单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-recoveryverify-group').html(options);
form.render("select");
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
options += "<option value='0'>其他</option>";
$('#slt-recoveryverify-group').html(options);
form.render("select");
}
});
}
... ...
... ... @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
var commonDetail = layui.commonDetail;
//对外暴露的接口
exports('recoveryverifyAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var currentDate = {}
var uploadInst = {}
var aAcknowledgingDate = {}
... ... @@ -226,18 +226,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
form.render("select");
fromAssignment()
});
admin.req({
url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
}).done(function (response) {
var options = "<option value=''>=所属公司=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-recoveryverifyadd-group').html(options);
$('#slt-Irecoveryverify-group').html(options);
form.render();
fromAssignment();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-recoveryverifyadd-group').html(options);
$('#slt-Irecoveryverify-group').html(options);
form.render();
fromAssignment();
}
});
}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("recoveryverifyList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#attachmentTable').show()
... ...
... ... @@ -109,7 +109,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
}
})
}*/
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0&accessToken=${accessToken}`;
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
/*
let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
*/
... ...
... ... @@ -16,7 +16,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
let theirTypeOptions = [];
let manufactureArr = [];
loadConditionSelect();
// initGroupSelect()
//回车搜索
$('#adminName').keydown(function (e) {
... ... @@ -83,13 +82,29 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
{field: 'name', title: '配置名称', align: 'center', width: 150,},
{
field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
}
})
var manufacturerName = '';
if(d.manufacturerId == '0'){
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
},
{
... ... @@ -194,7 +209,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
}, function () {
admin.req({
url: common.domainName + '/api-web/bWorkreportGroup/delete'
, type: "delete"
, type: "get"
, data: {ids: id}
}).done(function (res) {
layer.msg('删除成功', {
... ... @@ -239,15 +254,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
})
}
function loadConditionSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
$.each(response.data, function (i, v) {
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj);
});
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
$.each(res.data, function (i, v) {
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
}
});
}
... ...
... ... @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var element = layui.element;
exports('routeAdjust', function () {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var domainName = common.domainName;
var orgChart = echarts.init(document.getElementById('chart-org-report'));
var adjustTypeChart = echarts.init(document.getElementById('chart-adjustType-report'));
... ...
... ... @@ -15,7 +15,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
//对外暴露的接口
exports('routeAdjustAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var adjustDate = {}
var uploadInst = {}
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("routeAdjustDetailList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
createStaffTable()
function dateForm(time) {
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("routeAttachmentList", function (d) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
if (d.type == 'attachment') {
$('#routeAttachmentTable').show()
... ...
... ... @@ -12,10 +12,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
var domainName = common.domainName;
//对外暴露的接口
exports('staffAdd', function (data) {
var accessToken = localStorage.getItem("accessToken");
var accessToken = common.getMjToken();
var enterTime = {}
var outTime = {}
var staffsBak = []
var objectId = '5A130B5304C348BA98E7E3BDE765611';
// var tableBak = table.cache.identifying-table;
//渲染表单
form.render(null, 'add-staff-form')
... ... @@ -186,26 +187,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
// 初始化下拉框
function loadSelect() {
admin.req({
url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
}).done(function (response) {
var options = "<option value=''>=归属机房=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-staffadd-machine').html(options);
form.render();
var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
$.ajax({
url: url,
success: function(res) {
var options = "<option value=''>=归属机房=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
$('#slt-staffadd-machine').html(options);
form.render();
}
});
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=工作单位=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staffadd-group').html(options);
form.render();
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staffadd-group').html(options);
form.render();
}
});
}
form.on('select(slt-staffadd-group)', function (data) {
... ...
... ... @@ -264,13 +264,29 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
field: 'createUserNickName', title: '汇报人', align: 'center',
}, {
field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.manufacturerName == '0'){
manufacturerName = d.manufacturerOther;
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
return v.name;
if(d.manufacturerName==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.machineRoomId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
}
return manufacturerName;
}
}, {
field: 'createTime', title: '上报时间', align: 'center',
... ... @@ -321,22 +337,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载查询条件下拉框
function loadConditionSelect() {
admin.req({
url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
}).done(function (response) {
var options = "<option value=''>=选择厂商=</option>";
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj[id] = v.id;
obj[name] = v.shortName;
manufactureArr.push(obj); });
$('#slt-workreport-group').html(options);
if (manufacturerId != '') {
$('#slt-workreport-group').val(manufacturerId)
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=选择厂商=</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
obj.id = v.id;
obj.name = v.shortName;
manufactureArr.push(obj);
});
$('#slt-workreport-group').html(options);
if (manufacturerId != '') {
$('#slt-workreport-group').val(manufacturerId)
}
form.render();
}
form.render();
});
$.ajax({
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
... ...