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

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



See merge request !1176

@@ -20,6 +20,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
     var accessToken = '';
     //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
     var obj = {
+        cmdbMachineRoomObjId: "5A130B5304C348B9A98E7E3BDE765611",
         domainName: sessionStorage.getItem('domainName'), // gateway地址
         domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址
         domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址

@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
     exports('deviceAdd', function (data) {
         var accessToken = common.getMjToken();
         //机房cmdb配置项类id
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
         var enterTime = {};
         var outTime = {};
         var devicesBak = [];

@@ -11,7 +11,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
     exports('devicehitch', function () {
         var accessToken = common.getMjToken();
         //机房cmdb配置项类id
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
         var domainName = common.domainName;
         var orgChart = echarts.init(document.getElementById('chart-devicehitch-report'));
         var dateLimit = "";

@@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
     exports('devicehitchAdd', function (data) {
         var accessToken = common.getMjToken();
         //机房cmdb配置项类id
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
         var userSelect = "";
         var currentDate = {}
         var applyDate = {}

@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var manufactureArr = [];
         var machineArr = [];
         //机房cmdb配置项类id
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
         //日期范围选择
         laydate.render({
             elem: '#devicedateLimit'
@@ -514,7 +514,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         show: true,
                         position: 'top',
                         textStyle: {
-                            color: '#555'
+                            color: '#ff00ff'
                         },
                         formatter: function (data) {
                             return totalList[data.dataIndex]
@@ -530,7 +530,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     title: {
                         text: '设备出入和配件更换图示',
                         textStyle: {
-                            color: '#00D81E06',
+                            color: 'rgba(255,0,255,0.02)',
                             fontSize: 5
                         }
                     },
@@ -549,6 +549,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     },
                     legend: {
                         data: ['设备进出', '配件更换'],
+                        textStyle: {
+                            color: '#ff00ff'
+
+                        },
                         selectedMode: false
                     },
                     grid: [{
@@ -561,7 +565,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         type: 'category',
                         data: xData,
                         axisLabel: {
-                            color: '#333',
+                            color: '#ff00ff',
                             show: true,
                             interval: 0,
                             rotate: 15
@@ -582,7 +586,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         type: 'value',
                         gridIndex: 0,
                         axisLabel: {
-                            color: '#333'
+                            color: '#ff00ff'
                         },
                         splitLine: {
                             lineStyle: {

@@ -17,7 +17,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var dateLimit = ""
         var createTime = "month"
         //机房cmdb配置项类id
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
 
         //日期范围选择
         laydate.render({

@@ -126,7 +126,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                         field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                             var manufacturerName = '';
-                            if(d.manufacturerId == '0'){
+                            if(d.omanufacturerId == '0'){
                                 manufacturerName = d.manufacturerOther;
                             }else {
                                 if(manufactureArr && manufactureArr.length>0){

@@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
         var enterTime = {}
         var outTime = {}
         var staffsBak = []
-        var objectId = '5A130B5304C348BA98E7E3BDE765611';
+        var objectId = common.cmdbMachineRoomObjId;
         // var tableBak = table.cache.identifying-table;
         //渲染表单
         form.render(null, 'add-staff-form')

@@ -19,6 +19,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
         , admin = layui.admin;
     //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
     var obj = {
+        cmdbMachineRoomObjId: "5A130B5304C348B9A98E7E3BDE765611",
         domainIpManage: "http://94.12.40.231:8080/zoneportal/",
         domainName: sessionStorage.getItem('domainName'), // gateway地址
         domainInspectionURI: sessionStorage.getItem('domainInspectionURI'), // 巡检系统地址