monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit d861222dbeb844ec5cb63dafa9c72d54c533a46b 2 parents fba4c94a 4aff2b9d wangfeng-mj ... master-mj master-mj-joke master-mj-yuanjinpeng master-mj-ztq

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

Inline Side-by-side
Showing 20 changed files with 214 additions and 70 deletions
@@ -673,7 +673,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -673,7 +673,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
673 var trs = ''; 673 var trs = '';
674 if (res.data && res.data.length > 0) { 674 if (res.data && res.data.length > 0) {
675 $.each(res.data, function (i, v) { 675 $.each(res.data, function (i, v) {
676 - trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 676 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
677 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 677 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
678 }); 678 });
679 } 679 }
@@ -689,7 +689,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -689,7 +689,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
689 function reloadData(res) { 689 function reloadData(res) {
690 var trs = ''; 690 var trs = '';
691 $.each(res.data, function (i, v) { 691 $.each(res.data, function (i, v) {
692 - trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 692 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
693 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 693 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
694 }); 694 });
695 var tb = ` 695 var tb = `
@@ -751,7 +751,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -751,7 +751,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
751 kpiIdent = "告警指标"; 751 kpiIdent = "告警指标";
752 } 752 }
753 753
754 - trs += `<tr><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td> 754 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
755 <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`; 755 <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`;
756 }); 756 });
757 var tb = `<div class="layui-form" style="padding: 0 10px;"> 757 var tb = `<div class="layui-form" style="padding: 0 10px;">
@@ -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 currSelect = 0; 17 var currSelect = 0;
18 var dateLimit = "" 18 var dateLimit = ""
19 var createTime = "month" 19 var createTime = "month"
20 - 20 + var manufactureArr = [];
21 21
22 //日期范围选择 22 //日期范围选择
23 laydate.render({ 23 laydate.render({
@@ -143,11 +143,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -143,11 +143,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
143 }, { 143 }, {
144 field: 'upgradePerson', title: '升级人', align: 'center', 144 field: 'upgradePerson', title: '升级人', align: 'center',
145 },{ 145 },{
146 - field: 'manufacturerName', title: '升级人单位', align: 'center',templet: function (d) { 146 + field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
147 if(d.manufacturerId == '0'){ 147 if(d.manufacturerId == '0'){
148 - return '其他'; 148 + return d.manufacturerOther;
149 }else { 149 }else {
150 - return d.manufacturerName; 150 + if(manufactureArr && manufactureArr.length>0){
  151 + $.each(manufactureArr, function (i, v) {
  152 + if(d.manufacturerId==v.id) {
  153 + return v.name;
  154 + }
  155 + })
  156 + }
151 } 157 }
152 } 158 }
153 },{ 159 },{
@@ -215,11 +221,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -215,11 +221,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
215 }, { 221 }, {
216 field: 'upgradePerson', title: '升级人', align: 'center', 222 field: 'upgradePerson', title: '升级人', align: 'center',
217 },{ 223 },{
218 - field: 'manufacturerName', title: '升级人单位', align: 'center',templet: function (d) { 224 + field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
219 if(d.manufacturerId == '0'){ 225 if(d.manufacturerId == '0'){
220 - return '其他'; 226 + return d.manufacturerOther;
221 }else { 227 }else {
222 - return d.manufacturerName; 228 + if(manufactureArr && manufactureArr.length>0){
  229 + $.each(manufactureArr, function (i, v) {
  230 + if(d.manufacturerId==v.id) {
  231 + return v.name;
  232 + }
  233 + })
  234 + }
223 } 235 }
224 } 236 }
225 },{ 237 },{
@@ -272,11 +284,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -272,11 +284,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
272 form.render("select"); 284 form.render("select");
273 }); 285 });
274 admin.req({ 286 admin.req({
275 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 287 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
276 }).done(function (response) { 288 }).done(function (response) {
277 var options = "<option value=''>=升级单位=</option>"; 289 var options = "<option value=''>=升级单位=</option>";
278 $.each(response.data, function (i, v) { 290 $.each(response.data, function (i, v) {
279 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 291 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  292 + var obj = {};
  293 + obj[id] = v.id;
  294 + obj[name] = v.shortName;
  295 + manufactureArr.push(obj);
280 }); 296 });
281 options += "<option value='0'>其他</option>"; 297 options += "<option value='0'>其他</option>";
282 $('#slt-bizupgrade-group').html(options); 298 $('#slt-bizupgrade-group').html(options);
@@ -116,11 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -116,11 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
116 116
117 }); 117 });
118 admin.req({ 118 admin.req({
119 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 119 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
120 }).done(function (response) { 120 }).done(function (response) {
121 var options = "<option value=''>=工作单位=</option>"; 121 var options = "<option value=''>=工作单位=</option>";
122 $.each(response.data, function (i, v) { 122 $.each(response.data, function (i, v) {
123 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 123 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
124 }); 124 });
125 options += "<option value='0'>其他</option>"; 125 options += "<option value='0'>其他</option>";
126 $('#slt-upgradeadd-group').html(options); 126 $('#slt-upgradeadd-group').html(options);
@@ -245,21 +245,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -245,21 +245,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
245 // 初始化下拉框 245 // 初始化下拉框
246 function loadSelect() { 246 function loadSelect() {
247 admin.req({ 247 admin.req({
248 - url: domainName + '/api-web/machineRoom/getMachineRoomInfo' 248 + url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
249 }).done(function (response) { 249 }).done(function (response) {
250 var options = "<option value=''>=归属机房=</option>"; 250 var options = "<option value=''>=归属机房=</option>";
251 $.each(response.data, function (i, v) { 251 $.each(response.data, function (i, v) {
252 - options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>" 252 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
253 }); 253 });
254 $('#slt-staffadd-machine').html(options); 254 $('#slt-staffadd-machine').html(options);
255 form.render(); 255 form.render();
256 }); 256 });
257 admin.req({ 257 admin.req({
258 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 258 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
259 }).done(function (response) { 259 }).done(function (response) {
260 var options = "<option value=''>=工作单位=</option>"; 260 var options = "<option value=''>=工作单位=</option>";
261 $.each(response.data, function (i, v) { 261 $.each(response.data, function (i, v) {
262 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 262 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
263 }); 263 });
264 options += "<option value='0'>其他</option>"; 264 options += "<option value='0'>其他</option>";
265 $('#slt-staffadd-group').html(options); 265 $('#slt-staffadd-group').html(options);
@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
14 var orgChart = echarts.init(document.getElementById('chart-devicehitch-report')); 14 var orgChart = echarts.init(document.getElementById('chart-devicehitch-report'));
15 var dateLimit = ""; 15 var dateLimit = "";
16 var createTime = "month"; 16 var createTime = "month";
17 - 17 + var machineArr = [];
18 //日期范围选择 18 //日期范围选择
19 laydate.render({ 19 laydate.render({
20 elem: '#hitchdateLimit' 20 elem: '#hitchdateLimit'
@@ -113,7 +113,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -113,7 +113,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
113 field: 'title', title: '维修单编号', align: 'center',width:100, 113 field: 'title', title: '维修单编号', align: 'center',width:100,
114 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-devicehitch-title" >{{d.title}}</span></div>' 114 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-devicehitch-title" >{{d.title}}</span></div>'
115 }, { 115 }, {
116 - field: 'machineRoomName', title: '机房', align: 'center',width:100 116 + field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
  117 + if(machineArr && machineArr.length>0){
  118 + $.each(machineArr, function (i, v) {
  119 + if(d.machineRoomId==v.id) {
  120 + return v.name;
  121 + }
  122 + })
  123 + }
  124 + }
117 }, { 125 }, {
118 field: 'deviceTypeName', title: '设备类型', align: 'center',width:88 126 field: 'deviceTypeName', title: '设备类型', align: 'center',width:88
119 }, { 127 }, {
@@ -121,22 +121,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -121,22 +121,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
121 121
122 }); 122 });
123 admin.req({ 123 admin.req({
124 - url: domainName + '/api-web/machineRoom/getMachineRoomInfo' 124 + url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
125 }).done(function (response) { 125 }).done(function (response) {
126 var options = "<option value=''>=归属机房=</option>"; 126 var options = "<option value=''>=归属机房=</option>";
127 $.each(response.data, function (i, v) { 127 $.each(response.data, function (i, v) {
128 - options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>" 128 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
129 }); 129 });
130 $('#slt-devicehitch-machine').html(options); 130 $('#slt-devicehitch-machine').html(options);
131 form.render(); 131 form.render();
132 fromAssignment() 132 fromAssignment()
133 }); 133 });
134 admin.req({ 134 admin.req({
135 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 135 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
136 }).done(function (response) { 136 }).done(function (response) {
137 var options = "<option value=''>=工作单位=</option>"; 137 var options = "<option value=''>=工作单位=</option>";
138 $.each(response.data, function (i, v) { 138 $.each(response.data, function (i, v) {
139 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 139 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
140 }); 140 });
141 options += "<option value='0'>其他</option>"; 141 options += "<option value='0'>其他</option>";
142 $('#slt-discoverMfId-group').html(options); 142 $('#slt-discoverMfId-group').html(options);
@@ -319,11 +319,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -319,11 +319,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
319 form.render("select"); 319 form.render("select");
320 }); 320 });
321 admin.req({ 321 admin.req({
322 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 322 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
323 }).done(function (response) { 323 }).done(function (response) {
324 var options = "<option value=''>=运维单位=</option>"; 324 var options = "<option value=''>=运维单位=</option>";
325 $.each(response.data, function (i, v) { 325 $.each(response.data, function (i, v) {
326 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 326 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
327 }); 327 });
328 options += "<option value='0'>其他</option>"; 328 options += "<option value='0'>其他</option>";
329 $('#slt-emergency-group').html(options); 329 $('#slt-emergency-group').html(options);
@@ -175,11 +175,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -175,11 +175,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
175 form.render("select"); 175 form.render("select");
176 }); 176 });
177 admin.req({ 177 admin.req({
178 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 178 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
179 }).done(function (response) { 179 }).done(function (response) {
180 var options = "<option value=''>=运维公司=</option>"; 180 var options = "<option value=''>=运维公司=</option>";
181 $.each(response.data, function (i, v) { 181 $.each(response.data, function (i, v) {
182 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 182 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
183 }); 183 });
184 options += "<option value='0'>其他</option>"; 184 options += "<option value='0'>其他</option>";
185 $('#slt-emergencyadd-group').html(options); 185 $('#slt-emergencyadd-group').html(options);
@@ -17,7 +17,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -17,7 +17,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
17 var currSelect = 0; 17 var currSelect = 0;
18 var dateLimit = "" 18 var dateLimit = ""
19 var createTime = "month" 19 var createTime = "month"
20 - 20 + var manufactureArr = [];
  21 + var machineArr = [];
21 22
22 //日期范围选择 23 //日期范围选择
23 laydate.render({ 24 laydate.render({
@@ -125,14 +126,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -125,14 +126,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
125 limit: common.limit, 126 limit: common.limit,
126 limits: common.limits, 127 limits: common.limits,
127 even: true, 128 even: true,
128 - cols: [[ {type: 'checkbox'},{  
129 - field: 'machineRoomName', title: '机房', align: 'center', 129 + cols: [[
  130 + {type: 'checkbox'},{
  131 + field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
  132 + if(machineArr && machineArr.length>0){
  133 + $.each(machineArr, function (i, v) {
  134 + if(d.machineRoomId==v.id){}
  135 + return v.name;
  136 + })
  137 + }
  138 + }
130 }, { 139 }, {
131 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { 140 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
132 if(d.manufacturerId == '0'){ 141 if(d.manufacturerId == '0'){
133 return d.manufacturerOther; 142 return d.manufacturerOther;
134 }else { 143 }else {
135 - return d.manufacturerName; 144 + if(manufactureArr && manufactureArr.length>0){
  145 + $.each(manufactureArr, function (i, v) {
  146 + if(d.manufacturerId==v.id){}
  147 + return v.name;
  148 + })
  149 + }
136 } 150 }
137 } 151 }
138 }, { 152 }, {
@@ -216,13 +230,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -216,13 +230,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
216 limits: common.limits, 230 limits: common.limits,
217 even: true, 231 even: true,
218 cols: [[ {type: 'checkbox'},{ 232 cols: [[ {type: 'checkbox'},{
219 - field: 'machineRoomName', title: '机房', align: 'center', 233 + field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
  234 + if(machineArr && machineArr.length>0){
  235 + $.each(machineArr, function (i, v) {
  236 + if(d.machineRoomId==v.id) {
  237 + return v.name;
  238 + }
  239 + })
  240 + }
  241 + }
220 }, { 242 }, {
221 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { 243 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
222 if(d.manufacturerId == '0'){ 244 if(d.manufacturerId == '0'){
223 return d.manufacturerOther; 245 return d.manufacturerOther;
224 }else { 246 }else {
225 - return d.manufacturerName; 247 + if(manufactureArr && manufactureArr.length>0){
  248 + $.each(manufactureArr, function (i, v) {
  249 + if(d.manufacturerId==v.id) {
  250 + return v.name;
  251 + }
  252 + })
  253 + }
226 } 254 }
227 } 255 }
228 }, { 256 }, {
@@ -312,16 +340,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -312,16 +340,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
312 // 加载查询条件下拉框 340 // 加载查询条件下拉框
313 function loadConditionSelect() { 341 function loadConditionSelect() {
314 admin.req({ 342 admin.req({
315 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 343 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
316 }).done(function (response) { 344 }).done(function (response) {
317 var options = "<option value=''>=工作单位=</option>"; 345 var options = "<option value=''>=工作单位=</option>";
318 $.each(response.data, function (i, v) { 346 $.each(response.data, function (i, v) {
319 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 347 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  348 + var obj = {};
  349 + obj[id] = v.id;
  350 + obj[name] = v.shortName;
  351 + manufactureArr.push(obj);
320 }); 352 });
321 options += "<option value='0'>其他</option>"; 353 options += "<option value='0'>其他</option>";
322 $('#slt-staff-group').html(options); 354 $('#slt-staff-group').html(options);
323 form.render(); 355 form.render();
324 }); 356 });
  357 + admin.req({
  358 + url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
  359 + }).done(function (response) {
  360 + var options = "<option value=''>=归属机房=</option>";
  361 + $.each(response.data, function (i, v) {
  362 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  363 + var obj = {};
  364 + obj[id] = v.id;
  365 + obj[name] = v.shortName;
  366 + machineArr.push(obj);
  367 + });
  368 + });
325 } 369 }
326 370
327 $("#device-export-excel").on('click', function () { 371 $("#device-export-excel").on('click', function () {
@@ -12,7 +12,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -12,7 +12,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
12 var accessToken = localStorage.getItem("accessToken"); 12 var accessToken = localStorage.getItem("accessToken");
13 var domainName = common.domainName; 13 var domainName = common.domainName;
14 var timeChart = echarts.init(document.getElementById('chart-time-record')); 14 var timeChart = echarts.init(document.getElementById('chart-time-record'));
15 - 15 + var manufactureArr = [];
  16 + var machineArr = [];
16 var dateLimit = "" 17 var dateLimit = ""
17 var createTime = "month" 18 var createTime = "month"
18 19
@@ -108,13 +109,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -108,13 +109,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
108 even: true, 109 even: true,
109 cols: [[ 110 cols: [[
110 {type: 'checkbox'},{ 111 {type: 'checkbox'},{
111 - field: 'machineRoomName', title: '机房', align: 'center', 112 + field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
  113 + if(machineArr && machineArr.length>0){
  114 + $.each(machineArr, function (i, v) {
  115 + if(d.machineRoomId==v.id) {
  116 + return v.name;
  117 + }
  118 + })
  119 + }
  120 + }
112 }, { 121 }, {
113 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { 122 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
114 if(d.manufacturerId == '0'){ 123 if(d.manufacturerId == '0'){
115 return d.manufacturerOther; 124 return d.manufacturerOther;
116 }else { 125 }else {
117 - return d.manufacturerName; 126 + if(manufactureArr && manufactureArr.length>0){
  127 + $.each(manufactureArr, function (i, v) {
  128 + if(d.manufacturerId==v.id) {
  129 + return v.name;
  130 + }
  131 + })
  132 + }
118 } 133 }
119 } 134 }
120 }, { 135 }, {
@@ -197,16 +212,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -197,16 +212,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
197 // 加载查询条件下拉框 212 // 加载查询条件下拉框
198 function loadConditionSelect() { 213 function loadConditionSelect() {
199 admin.req({ 214 admin.req({
200 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 215 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
201 }).done(function (response) { 216 }).done(function (response) {
202 var options = "<option value=''>=工作单位=</option>"; 217 var options = "<option value=''>=工作单位=</option>";
203 $.each(response.data, function (i, v) { 218 $.each(response.data, function (i, v) {
204 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 219 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  220 + var obj = {};
  221 + obj[id] = v.id;
  222 + obj[name] = v.shortName;
  223 + manufactureArr.push(obj);
205 }); 224 });
206 options += "<option value='0'>其他</option>"; 225 options += "<option value='0'>其他</option>";
207 $('#slt-staff-group').html(options); 226 $('#slt-staff-group').html(options);
208 form.render(); 227 form.render();
209 }); 228 });
  229 + admin.req({
  230 + url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
  231 + }).done(function (response) {
  232 + var options = "<option value=''>=归属机房=</option>";
  233 + $.each(response.data, function (i, v) {
  234 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  235 + var obj = {};
  236 + obj[id] = v.id;
  237 + obj[name] = v.shortName;
  238 + machineArr.push(obj);
  239 + });
  240 + });
210 } 241 }
211 242
212 243
@@ -16,6 +16,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -16,6 +16,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
16 var createTime = "month"; 16 var createTime = "month";
17 var manufacturerId = ""; 17 var manufacturerId = "";
18 var extraWorker=""; 18 var extraWorker="";
  19 + var manufactureArr = [];
19 //日期范围选择 20 //日期范围选择
20 laydate.render({ 21 laydate.render({
21 elem: '#extradateLimit' 22 elem: '#extradateLimit'
@@ -114,11 +115,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -114,11 +115,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
114 }, { 115 }, {
115 field: 'extraWorker', title: '加班人', align: 'center' 116 field: 'extraWorker', title: '加班人', align: 'center'
116 }, { 117 }, {
117 - field: 'manufacturerId', title: '单位', align: 'center',templet: function (d) { 118 + field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
118 if(d.manufacturerId == '0'){ 119 if(d.manufacturerId == '0'){
119 return d.manufacturerOther; 120 return d.manufacturerOther;
120 }else { 121 }else {
121 - return d.manufacturerName; 122 + if(manufactureArr && manufactureArr.length>0){
  123 + $.each(manufactureArr, function (i, v) {
  124 + if(d.manufacturerId==v.id) {
  125 + return v.name;
  126 + }
  127 + })
  128 + }
122 } 129 }
123 } 130 }
124 }, { 131 }, {
@@ -185,11 +192,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -185,11 +192,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
185 // 加载查询条件下拉框 192 // 加载查询条件下拉框
186 function loadConditionSelect() { 193 function loadConditionSelect() {
187 admin.req({ 194 admin.req({
188 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 195 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
189 }).done(function (response) { 196 }).done(function (response) {
190 - var options = "<option value=''>=工作单位=</option>"; 197 + var options = "<option value=''>=单位=</option>";
191 $.each(response.data, function (i, v) { 198 $.each(response.data, function (i, v) {
192 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 199 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  200 + var obj = {};
  201 + obj[id] = v.id;
  202 + obj[name] = v.shortName;
  203 + manufactureArr.push(obj);
193 }); 204 });
194 options += "<option value='0'>其他</option>"; 205 options += "<option value='0'>其他</option>";
195 $('#slt-extra-group').html(options); 206 $('#slt-extra-group').html(options);
@@ -109,11 +109,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -109,11 +109,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
109 // 初始化下拉框 109 // 初始化下拉框
110 function loadSelect() { 110 function loadSelect() {
111 admin.req({ 111 admin.req({
112 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 112 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
113 }).done(function (response) { 113 }).done(function (response) {
114 var options = "<option value=''>=工作单位=</option>"; 114 var options = "<option value=''>=工作单位=</option>";
115 $.each(response.data, function (i, v) { 115 $.each(response.data, function (i, v) {
116 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 116 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
117 }); 117 });
118 options += "<option value='0'>其他</option>"; 118 options += "<option value='0'>其他</option>";
119 $('#slt-extraAdd-org').html(options); 119 $('#slt-extraAdd-org').html(options);
@@ -109,7 +109,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -109,7 +109,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
109 } 109 }
110 }) 110 })
111 }*/ 111 }*/
112 - var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`; 112 + var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0&accessToken=${accessToken}`;
113 /* 113 /*
114 let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}` 114 let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
115 */ 115 */
@@ -120,7 +120,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -120,7 +120,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
120 var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']"); 120 var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
121 $sel.append('<option value="">请选择</option>') 121 $sel.append('<option value="">请选择</option>')
122 $.each(selects, function (i, e) { 122 $.each(selects, function (i, e) {
123 - $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>') 123 + $sel.append('<option value="' + e.id + '">' + e.shortName + '</option>')
124 /* 124 /*
125 $sel.append(`<option value="${e.code}"> ${e.label}</option>`) 125 $sel.append(`<option value="${e.code}"> ${e.label}</option>`)
126 */ 126 */
@@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
14 // var accessToken = session.getToken()['access_token'] 14 // var accessToken = session.getToken()['access_token']
15 var accessToken = common.getMjToken(); 15 var accessToken = common.getMjToken();
16 let theirTypeOptions = []; 16 let theirTypeOptions = [];
17 - 17 + let manufactureArr = [];
  18 + loadConditionSelect();
18 // initGroupSelect() 19 // initGroupSelect()
19 20
20 //回车搜索 21 //回车搜索
@@ -80,7 +81,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -80,7 +81,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
80 cols: [[ 81 cols: [[
81 {type: 'checkbox'}, 82 {type: 'checkbox'},
82 {field: 'name', title: '配置名称', align: 'center', width: 150,}, 83 {field: 'name', title: '配置名称', align: 'center', width: 150,},
83 - {field: 'manufacturerName', title: '所属厂商', align: 'center', width: 150,}, 84 + {
  85 + field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
  86 + if(manufactureArr && manufactureArr.length>0){
  87 + $.each(manufactureArr, function (i, v) {
  88 + if(d.manufacturerId==v.id) {
  89 + return v.name;
  90 + }
  91 + })
  92 + }
  93 + }
  94 + },
84 { 95 {
85 field: 'theirType', title: '所属类型', align: 'center', width: 150, 96 field: 'theirType', title: '所属类型', align: 'center', width: 150,
86 templet: function (d) { 97 templet: function (d) {
@@ -227,6 +238,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -227,6 +238,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
227 } 238 }
228 }) 239 })
229 } 240 }
  241 + function loadConditionSelect() {
  242 + admin.req({
  243 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
  244 + }).done(function (response) {
  245 + $.each(response.data, function (i, v) {
  246 + var obj = {};
  247 + obj[id] = v.id;
  248 + obj[name] = v.shortName;
  249 + manufactureArr.push(obj);
  250 + });
  251 + });
  252 + }
230 253
231 // 所属类型表单赋值 254 // 所属类型表单赋值
232 function fromTheirType() { 255 function fromTheirType() {
@@ -1179,11 +1179,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1179,11 +1179,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1179 //背景色改变 1179 //背景色改变
1180 $.each($(this).parents('tbody').eq(0).find('tr'), function (i, v) { 1180 $.each($(this).parents('tbody').eq(0).find('tr'), function (i, v) {
1181 $(this).css('background-color', ''); 1181 $(this).css('background-color', '');
1182 - if ($(this).hasClass('tbody-tr-background-color')) {  
1183 - $(this).removeClass('tbody-tr-background-color');  
1184 - } 1182 + // if ($(this).hasClass('tbody-tr-background-color')) {
  1183 + // $(this).removeClass('tbody-tr-background-color');
  1184 + // }
1185 }); 1185 });
1186 - $(this).parents('tr').eq(0).addClass("tbody-tr-background-color"); 1186 + // $(this).parents('tr').eq(0).addClass("tbody-tr-background-color");
1187 var resId = $(this).attr("resmanage-data-openDetail"); 1187 var resId = $(this).attr("resmanage-data-openDetail");
1188 var resType = $(this).data("restype"); 1188 var resType = $(this).data("restype");
1189 var name = $(this).data("name"); 1189 var name = $(this).data("name");
@@ -108,9 +108,8 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin'], function (exports @@ -108,9 +108,8 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin'], function (exports
108 btn: ['确定', '取消'] //按钮 108 btn: ['确定', '取消'] //按钮
109 }, function () { 109 }, function () {
110 admin.req({ 110 admin.req({
111 - url: domainName + '/api-web/bResourceKpiDescribe/delete',  
112 - type: 'delete',  
113 - data: {ids: id} 111 + url: domainName + '/api-web/bResourceKpiDescribe/delete?ids='+id,
  112 + type: 'delete'
114 }).done(function (res) { 113 }).done(function (res) {
115 layer.msg('删除成功', { 114 layer.msg('删除成功', {
116 offset: '15px', 115 offset: '15px',
@@ -187,21 +187,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -187,21 +187,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
187 // 初始化下拉框 187 // 初始化下拉框
188 function loadSelect() { 188 function loadSelect() {
189 admin.req({ 189 admin.req({
190 - url: domainName + '/api-web/machineRoom/getMachineRoomInfo' 190 + url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
191 }).done(function (response) { 191 }).done(function (response) {
192 var options = "<option value=''>=归属机房=</option>"; 192 var options = "<option value=''>=归属机房=</option>";
193 $.each(response.data, function (i, v) { 193 $.each(response.data, function (i, v) {
194 - options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>" 194 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
195 }); 195 });
196 $('#slt-staffadd-machine').html(options); 196 $('#slt-staffadd-machine').html(options);
197 form.render(); 197 form.render();
198 }); 198 });
199 admin.req({ 199 admin.req({
200 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 200 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
201 }).done(function (response) { 201 }).done(function (response) {
202 var options = "<option value=''>=工作单位=</option>"; 202 var options = "<option value=''>=工作单位=</option>";
203 $.each(response.data, function (i, v) { 203 $.each(response.data, function (i, v) {
204 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 204 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
205 }); 205 });
206 options += "<option value='0'>其他</option>"; 206 options += "<option value='0'>其他</option>";
207 $('#slt-staffadd-group').html(options); 207 $('#slt-staffadd-group').html(options);
@@ -20,6 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -20,6 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
20 var urlRepType = '' 20 var urlRepType = ''
21 var manufacturerId = '' 21 var manufacturerId = ''
22 var reportDetailTable; 22 var reportDetailTable;
  23 + var manufactureArr = [];
23 getUrlType() 24 getUrlType()
24 25
25 /* $.each($("button.date"), function (i, e) { 26 /* $.each($("button.date"), function (i, e) {
@@ -262,7 +263,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -262,7 +263,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
262 }, { 263 }, {
263 field: 'createUserNickName', title: '汇报人', align: 'center', 264 field: 'createUserNickName', title: '汇报人', align: 'center',
264 }, { 265 }, {
265 - field: 'manufacturerName', title: '厂商', align: 'center', 266 + field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
  267 + if(manufactureArr && manufactureArr.length>0){
  268 + $.each(manufactureArr, function (i, v) {
  269 + if(d.manufacturerId==v.id) {
  270 + return v.name;
  271 + }
  272 + })
  273 + }
  274 + }
266 }, { 275 }, {
267 field: 'createTime', title: '上报时间', align: 'center', 276 field: 'createTime', title: '上报时间', align: 'center',
268 }]], 277 }]],
@@ -313,12 +322,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -313,12 +322,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
313 // 加载查询条件下拉框 322 // 加载查询条件下拉框
314 function loadConditionSelect() { 323 function loadConditionSelect() {
315 admin.req({ 324 admin.req({
316 - url: domainName + '/api-web/bWorkreportGroup/findManufacturerList' 325 + url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
317 }).done(function (response) { 326 }).done(function (response) {
318 var options = "<option value=''>=选择厂商=</option>"; 327 var options = "<option value=''>=选择厂商=</option>";
319 $.each(response.data, function (i, v) { 328 $.each(response.data, function (i, v) {
320 - options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"  
321 - }); 329 + options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
  330 + var obj = {};
  331 + obj[id] = v.id;
  332 + obj[name] = v.shortName;
  333 + manufactureArr.push(obj); });
322 $('#slt-workreport-group').html(options); 334 $('#slt-workreport-group').html(options);
323 if (manufacturerId != '') { 335 if (manufacturerId != '') {
324 $('#slt-workreport-group').val(manufacturerId) 336 $('#slt-workreport-group').val(manufacturerId)
@@ -916,7 +928,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -916,7 +928,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
916 field: 'readCount', title: '已报数量', align: 'center' 928 field: 'readCount', title: '已报数量', align: 'center'
917 }, { 929 }, {
918 field: 'needReport', title: '未报数量', align: 'center', style: 'color:red', templet: function (d) { 930 field: 'needReport', title: '未报数量', align: 'center', style: 'color:red', templet: function (d) {
919 - return d.needReport - d.readCount 931 + return d.needReport - d.readCount;
920 } 932 }
921 }]], 933 }]],
922 }) 934 })
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 </div> 82 </div>
83 </div> 83 </div>
84 <div class="layui-inline"> 84 <div class="layui-inline">
85 - <div class="layui-input-inline layui-input-inline--long"> 85 + <div class=""><!--layui-input-inline layui-input-inline--long-->
86 <button class="layui-btn layui-btn-sm layui-btn-normal" id="seachReport" 86 <button class="layui-btn layui-btn-sm layui-btn-normal" id="seachReport"
87 type="button"> 87 type="button">
88 搜索 88 搜索
@@ -2196,7 +2196,7 @@ a cite { @@ -2196,7 +2196,7 @@ a cite {
2196 } 2196 }
2197 2197
2198 .layui-select-disabled .layui-disabled { 2198 .layui-select-disabled .layui-disabled {
2199 - border-color: #eee !important 2199 + /*border-color: #eee !important*/
2200 } 2200 }
2201 2201
2202 .layui-select-disabled .layui-edge { 2202 .layui-select-disabled .layui-edge {