monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 3d40155b4f47ad1fc2ad10b1572b75c6beba4761 2 parents 5062f8e7 0588e909

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

fix:，cmdb机房信息加载优化



See merge request !1176
Inline Side-by-side
Showing 9 changed files with 17 additions and 11 deletions
@@ -20,6 +20,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -20,6 +20,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
20 var accessToken = ''; 20 var accessToken = '';
21 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行 21 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
22 var obj = { 22 var obj = {
  23 + cmdbMachineRoomObjId: "5A130B5304C348B9A98E7E3BDE765611",
23 domainName: sessionStorage.getItem('domainName'), // gateway地址 24 domainName: sessionStorage.getItem('domainName'), // gateway地址
24 domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址 25 domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址
25 domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址 26 domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址
@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
14 exports('deviceAdd', function (data) { 14 exports('deviceAdd', function (data) {
15 var accessToken = common.getMjToken(); 15 var accessToken = common.getMjToken();
16 //机房cmdb配置项类id 16 //机房cmdb配置项类id
17 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 17 + var objectId = common.cmdbMachineRoomObjId;
18 var enterTime = {}; 18 var enterTime = {};
19 var outTime = {}; 19 var outTime = {};
20 var devicesBak = []; 20 var devicesBak = [];
@@ -11,7 +11,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
11 exports('devicehitch', function () { 11 exports('devicehitch', function () {
12 var accessToken = common.getMjToken(); 12 var accessToken = common.getMjToken();
13 //机房cmdb配置项类id 13 //机房cmdb配置项类id
14 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 14 + var objectId = common.cmdbMachineRoomObjId;
15 var domainName = common.domainName; 15 var domainName = common.domainName;
16 var orgChart = echarts.init(document.getElementById('chart-devicehitch-report')); 16 var orgChart = echarts.init(document.getElementById('chart-devicehitch-report'));
17 var dateLimit = ""; 17 var dateLimit = "";
@@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
16 exports('devicehitchAdd', function (data) { 16 exports('devicehitchAdd', function (data) {
17 var accessToken = common.getMjToken(); 17 var accessToken = common.getMjToken();
18 //机房cmdb配置项类id 18 //机房cmdb配置项类id
19 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 19 + var objectId = common.cmdbMachineRoomObjId;
20 var userSelect = ""; 20 var userSelect = "";
21 var currentDate = {} 21 var currentDate = {}
22 var applyDate = {} 22 var applyDate = {}
@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
20 var manufactureArr = []; 20 var manufactureArr = [];
21 var machineArr = []; 21 var machineArr = [];
22 //机房cmdb配置项类id 22 //机房cmdb配置项类id
23 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 23 + var objectId = common.cmdbMachineRoomObjId;
24 //日期范围选择 24 //日期范围选择
25 laydate.render({ 25 laydate.render({
26 elem: '#devicedateLimit' 26 elem: '#devicedateLimit'
@@ -514,7 +514,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -514,7 +514,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
514 show: true, 514 show: true,
515 position: 'top', 515 position: 'top',
516 textStyle: { 516 textStyle: {
517 - color: '#555' 517 + color: '#ff00ff'
518 }, 518 },
519 formatter: function (data) { 519 formatter: function (data) {
520 return totalList[data.dataIndex] 520 return totalList[data.dataIndex]
@@ -530,7 +530,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -530,7 +530,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
530 title: { 530 title: {
531 text: '设备出入和配件更换图示', 531 text: '设备出入和配件更换图示',
532 textStyle: { 532 textStyle: {
533 - color: '#00D81E06', 533 + color: 'rgba(255,0,255,0.02)',
534 fontSize: 5 534 fontSize: 5
535 } 535 }
536 }, 536 },
@@ -549,6 +549,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -549,6 +549,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
549 }, 549 },
550 legend: { 550 legend: {
551 data: ['设备进出', '配件更换'], 551 data: ['设备进出', '配件更换'],
  552 + textStyle: {
  553 + color: '#ff00ff'
  554 +
  555 + },
552 selectedMode: false 556 selectedMode: false
553 }, 557 },
554 grid: [{ 558 grid: [{
@@ -561,7 +565,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -561,7 +565,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
561 type: 'category', 565 type: 'category',
562 data: xData, 566 data: xData,
563 axisLabel: { 567 axisLabel: {
564 - color: '#333', 568 + color: '#ff00ff',
565 show: true, 569 show: true,
566 interval: 0, 570 interval: 0,
567 rotate: 15 571 rotate: 15
@@ -582,7 +586,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -582,7 +586,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
582 type: 'value', 586 type: 'value',
583 gridIndex: 0, 587 gridIndex: 0,
584 axisLabel: { 588 axisLabel: {
585 - color: '#333' 589 + color: '#ff00ff'
586 }, 590 },
587 splitLine: { 591 splitLine: {
588 lineStyle: { 592 lineStyle: {
@@ -17,7 +17,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -17,7 +17,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
17 var dateLimit = "" 17 var dateLimit = ""
18 var createTime = "month" 18 var createTime = "month"
19 //机房cmdb配置项类id 19 //机房cmdb配置项类id
20 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 20 + var objectId = common.cmdbMachineRoomObjId;
21 21
22 //日期范围选择 22 //日期范围选择
23 laydate.render({ 23 laydate.render({
@@ -126,7 +126,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -126,7 +126,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
126 }, { 126 }, {
127 field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) { 127 field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
128 var manufacturerName = ''; 128 var manufacturerName = '';
129 - if(d.manufacturerId == '0'){ 129 + if(d.omanufacturerId == '0'){
130 manufacturerName = d.manufacturerOther; 130 manufacturerName = d.manufacturerOther;
131 }else { 131 }else {
132 if(manufactureArr && manufactureArr.length>0){ 132 if(manufactureArr && manufactureArr.length>0){
@@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
16 var enterTime = {} 16 var enterTime = {}
17 var outTime = {} 17 var outTime = {}
18 var staffsBak = [] 18 var staffsBak = []
19 - var objectId = '5A130B5304C348BA98E7E3BDE765611'; 19 + var objectId = common.cmdbMachineRoomObjId;
20 // var tableBak = table.cache.identifying-table; 20 // var tableBak = table.cache.identifying-table;
21 //渲染表单 21 //渲染表单
22 form.render(null, 'add-staff-form') 22 form.render(null, 'add-staff-form')
@@ -19,6 +19,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -19,6 +19,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
19 , admin = layui.admin; 19 , admin = layui.admin;
20 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行 20 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
21 var obj = { 21 var obj = {
  22 + cmdbMachineRoomObjId: "5A130B5304C348B9A98E7E3BDE765611",
22 domainIpManage: "http://94.12.40.231:8080/zoneportal/", 23 domainIpManage: "http://94.12.40.231:8080/zoneportal/",
23 domainName: sessionStorage.getItem('domainName'), // gateway地址 24 domainName: sessionStorage.getItem('domainName'), // gateway地址
24 domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址 25 domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址