monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit 3446038067367cad5b83da56ac6a92814fcec2b4 1 parent b864f386

fix:自监控管理->常用运维接口功能迁移页面接口调整

Inline Side-by-side
Showing 4 changed files with 855 additions and 929 deletions
@@ -264,15 +264,14 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -264,15 +264,14 @@ layui.define(['xmSelect', 'md5'], function (exports) {
264 }); 264 });
265 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&access_token=' + accessToken; 265 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&access_token=' + accessToken;
266 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 266 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
267 - $.ajax({ 267 + admin.req({
268 type: "get", 268 type: "get",
269 url: url, 269 url: url,
270 - async: true,  
271 - success: function (data) {  
272 - if (data.code == 0) {  
273 - layer.close(loadIndex);  
274 - window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.pdfPath));  
275 - } 270 + async: true
  271 + }).done(function (data) {
  272 + if (data.code == 0) {
  273 + layer.close(loadIndex);
  274 + window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.pdfPath));
276 } 275 }
277 }); 276 });
278 }, 277 },
@@ -285,15 +284,14 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -285,15 +284,14 @@ layui.define(['xmSelect', 'md5'], function (exports) {
285 }); 284 });
286 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&access_token=' + accessToken; 285 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&access_token=' + accessToken;
287 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 286 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
288 - $.ajax({ 287 + admin.req({
289 type: "get", 288 type: "get",
290 url: url, 289 url: url,
291 - async: true,  
292 - success: function (data) {  
293 - if (data.code == 0) {  
294 - layer.close(loadIndex);  
295 - window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));  
296 - } 290 + async: true
  291 + }).done(function (data) {
  292 + if (data.code == 0) {
  293 + layer.close(loadIndex);
  294 + window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
297 } 295 }
298 }); 296 });
299 }, 297 },
@@ -339,39 +337,38 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -339,39 +337,38 @@ layui.define(['xmSelect', 'md5'], function (exports) {
339 resTypeXmSelect: function (xmSelectParams) { 337 resTypeXmSelect: function (xmSelectParams) {
340 admin.req({ 338 admin.req({
341 url: `${obj.domainName}/api-web/manage/restype/list`, 339 url: `${obj.domainName}/api-web/manage/restype/list`,
342 - async: false,  
343 - success: function (res) {  
344 - // 资源类型下拉框  
345 - var resTypeList = res.data;  
346 - var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");  
347 - xmSelect.render(Object.assign({  
348 - el: '#',  
349 - tips: '=资源类型=',  
350 - filterable: true,  
351 - radio: false,  
352 - clickClose: false,  
353 - initValue: [],  
354 - prop: {  
355 - name: 'resTypeName',  
356 - value: 'resTypeCode'  
357 - },  
358 - toolbar: {  
359 - show: true,  
360 - list: ['CLEAR']  
361 - },  
362 - tree: {  
363 - show: true,  
364 - showFolderIcon: true,  
365 - showLine: true,  
366 - strict: false,  
367 - indent: 20  
368 - },  
369 - data: resTypeTree,  
370 - on: function (data) { 340 + async: false
  341 + }).done(function (res) {
  342 + // 资源类型下拉框
  343 + var resTypeList = res.data;
  344 + var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");
  345 + xmSelect.render(Object.assign({
  346 + el: '#',
  347 + tips: '=资源类型=',
  348 + filterable: true,
  349 + radio: false,
  350 + clickClose: false,
  351 + initValue: [],
  352 + prop: {
  353 + name: 'resTypeName',
  354 + value: 'resTypeCode'
  355 + },
  356 + toolbar: {
  357 + show: true,
  358 + list: ['CLEAR']
  359 + },
  360 + tree: {
  361 + show: true,
  362 + showFolderIcon: true,
  363 + showLine: true,
  364 + strict: false,
  365 + indent: 20
  366 + },
  367 + data: resTypeTree,
  368 + on: function (data) {
371 369
372 - }  
373 - }, xmSelectParams));  
374 - } 370 + }
  371 + }, xmSelectParams));
375 }); 372 });
376 }, 373 },
377 /** 374 /**
@@ -477,45 +474,44 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -477,45 +474,44 @@ layui.define(['xmSelect', 'md5'], function (exports) {
477 var roleId = roleId_ ? roleId_ : ''; 474 var roleId = roleId_ ? roleId_ : '';
478 admin.req({ 475 admin.req({
479 url: `${obj.domainName}/api-user/menus/findMenus?username=` + username + '&roleIds=' + roleId, 476 url: `${obj.domainName}/api-user/menus/findMenus?username=` + username + '&roleIds=' + roleId,
480 - success: function (res) {  
481 - // 菜单下拉框  
482 - var menuList = res.data;  
483 - // menuList.forEach(item => {  
484 - // item.disabled = item.isLeaf !== 'Y';  
485 - // });  
486 - var menuTree = obj.pidToChildren(menuList, "id", "parentId");  
487 - //XuHaoJie 2021/10/21 添加是否是父节点  
488 - addProperty(menuTree);  
489 - var menuSelect = xmSelect.render(Object.assign({  
490 - el: '#',  
491 - tips: '=菜单=',  
492 - filterable: true,  
493 - radio: false,  
494 - clickClose: false,  
495 - initValue: [],  
496 - prop: {  
497 - name: 'name',  
498 - value: 'id'  
499 - },  
500 - toolbar: {  
501 - show: true,  
502 - list: ['CLEAR']  
503 - },  
504 - tree: {  
505 - show: true,  
506 - showFolderIcon: true,  
507 - showLine: true,  
508 - strict: false,  
509 - indent: 20  
510 - },  
511 - data: menuTree,  
512 - on: function (data) { 477 + }).done(function (res) {
  478 + // 菜单下拉框
  479 + var menuList = res.data;
  480 + // menuList.forEach(item => {
  481 + // item.disabled = item.isLeaf !== 'Y';
  482 + // });
  483 + var menuTree = obj.pidToChildren(menuList, "id", "parentId");
  484 + //XuHaoJie 2021/10/21 添加是否是父节点
  485 + addProperty(menuTree);
  486 + var menuSelect = xmSelect.render(Object.assign({
  487 + el: '#',
  488 + tips: '=菜单=',
  489 + filterable: true,
  490 + radio: false,
  491 + clickClose: false,
  492 + initValue: [],
  493 + prop: {
  494 + name: 'name',
  495 + value: 'id'
  496 + },
  497 + toolbar: {
  498 + show: true,
  499 + list: ['CLEAR']
  500 + },
  501 + tree: {
  502 + show: true,
  503 + showFolderIcon: true,
  504 + showLine: true,
  505 + strict: false,
  506 + indent: 20
  507 + },
  508 + data: menuTree,
  509 + on: function (data) {
513 510
514 - }  
515 - }, xmSelectParams));  
516 - if (done) {  
517 - done(menuSelect);  
518 } 511 }
  512 + }, xmSelectParams));
  513 + if (done) {
  514 + done(menuSelect);
519 } 515 }
520 }); 516 });
521 517
@@ -534,32 +530,31 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -534,32 +530,31 @@ layui.define(['xmSelect', 'md5'], function (exports) {
534 }, 530 },
535 relationTypeXmSelect: function (xmSelectParams, done) { 531 relationTypeXmSelect: function (xmSelectParams, done) {
536 admin.req({ 532 admin.req({
537 - url: `${obj.domainName}/api-web/relationType/getAll`,  
538 - success: function (res) {  
539 - var relationTypeList = res.data;  
540 - var relationTypeSelect = xmSelect.render(Object.assign({  
541 - el: '#',  
542 - tips: '=关系=',  
543 - filterable: true,  
544 - radio: false,  
545 - clickClose: false,  
546 - initValue: [],  
547 - prop: {  
548 - name: 'typeName',  
549 - value: 'reType'  
550 - },  
551 - toolbar: {  
552 - show: true,  
553 - list: ['ALL', 'CLEAR']  
554 - },  
555 - data: relationTypeList,  
556 - on: function (data) { 533 + url: `${obj.domainName}/api-web/relationType/getAll`
  534 + }).done(function (res) {
  535 + var relationTypeList = res.data;
  536 + var relationTypeSelect = xmSelect.render(Object.assign({
  537 + el: '#',
  538 + tips: '=关系=',
  539 + filterable: true,
  540 + radio: false,
  541 + clickClose: false,
  542 + initValue: [],
  543 + prop: {
  544 + name: 'typeName',
  545 + value: 'reType'
  546 + },
  547 + toolbar: {
  548 + show: true,
  549 + list: ['ALL', 'CLEAR']
  550 + },
  551 + data: relationTypeList,
  552 + on: function (data) {
557 553
558 - }  
559 - }, xmSelectParams));  
560 - if (done) {  
561 - done(relationTypeSelect);  
562 } 554 }
  555 + }, xmSelectParams));
  556 + if (done) {
  557 + done(relationTypeSelect);
563 } 558 }
564 }); 559 });
565 }, 560 },
@@ -616,49 +611,46 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -616,49 +611,46 @@ layui.define(['xmSelect', 'md5'], function (exports) {
616 admin.req({ 611 admin.req({
617 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}` 612 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
618 , method: 'get' 613 , method: 'get'
619 - , success: function (res) {  
620 - if (res && res.data) {  
621 - var ddiclist = res.data;  
622 - $.each(ddiclist, function (i, v) {  
623 - options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';  
624 - });  
625 - $('#' + targtetId).html($(options));  
626 - if (callback) {  
627 - callback(ddiclist);  
628 - } 614 + }).done(function (res) {
  615 + if (res && res.data) {
  616 + var ddiclist = res.data;
  617 + $.each(ddiclist, function (i, v) {
  618 + options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
  619 + });
  620 + $('#' + targtetId).html($(options));
  621 + if (callback) {
  622 + callback(ddiclist);
629 } 623 }
630 } 624 }
631 - , error(error) {  
632 - console.error(error);  
633 - } 625 + }).error(function (error) {
  626 + console.error(error);
634 }); 627 });
635 }, 628 },
636 // 用户下拉框 629 // 用户下拉框
637 userXmSelect: function (xmSelectParams) { 630 userXmSelect: function (xmSelectParams) {
638 var userSelect; 631 var userSelect;
639 - $.ajax({  
640 - url: this.domainName + '/api-user/users/getAll?access_token=' + localStorage.getItem("access_token"),  
641 - async: false,  
642 - success: function (response) {  
643 - userSelect = xmSelect.render(Object.assign({  
644 - el: '#',  
645 - tips: '=选择用户=',  
646 - prop: {  
647 - name: 'nickname',  
648 - value: 'username'  
649 - },  
650 - autoRow: true,  
651 - filterable: true,  
652 - toolbar: {  
653 - show: true,  
654 - list: ['ALL', 'REVERSE', 'CLEAR']  
655 - },  
656 - data: response,  
657 - on: function (data) { 632 + admin.req({
  633 + url: this.domainName + '/mj/user/getAll?accessToken=' + localStorage.getItem("access_token"),
  634 + async: false
  635 + }).done(function (response) {
  636 + userSelect = xmSelect.render(Object.assign({
  637 + el: '#',
  638 + tips: '=选择用户=',
  639 + prop: {
  640 + name: 'nickname',
  641 + value: 'username'
  642 + },
  643 + autoRow: true,
  644 + filterable: true,
  645 + toolbar: {
  646 + show: true,
  647 + list: ['ALL', 'REVERSE', 'CLEAR']
  648 + },
  649 + data: response,
  650 + on: function (data) {
658 651
659 - }  
660 - }, xmSelectParams));  
661 - } 652 + }
  653 + }, xmSelectParams));
662 }); 654 });
663 return userSelect; 655 return userSelect;
664 }, 656 },
@@ -839,19 +831,18 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -839,19 +831,18 @@ layui.define(['xmSelect', 'md5'], function (exports) {
839 return "template/detail/" + resType.toLowerCase(); 831 return "template/detail/" + resType.toLowerCase();
840 }, 832 },
841 checkHasCluster: function (resType, resId) { 833 checkHasCluster: function (resType, resId) {
842 - $.ajax({ 834 + admin.req({
843 url: this.domainName + '/api-web/detail/block?access_token=' + layui.sessions.getToken()['access_token'], 835 url: this.domainName + '/api-web/detail/block?access_token=' + layui.sessions.getToken()['access_token'],
844 data: { 836 data: {
845 resId: resId, 837 resId: resId,
846 kpiId: 'KPI096EB5BA' 838 kpiId: 'KPI096EB5BA'
847 }, 839 },
848 - async: false,  
849 - success: function (res) { 840 + async: false
  841 + }).done(function (res) {
850 842
851 - if (res && res.data && res.data.length > 0) {  
852 - if (res.data[0].value == '是') {  
853 - resType = 'ORACLE_RAC';  
854 - } 843 + if (res && res.data && res.data.length > 0) {
  844 + if (res.data[0].value == '是') {
  845 + resType = 'ORACLE_RAC';
855 } 846 }
856 } 847 }
857 }); 848 });
@@ -859,51 +850,50 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -859,51 +850,50 @@ layui.define(['xmSelect', 'md5'], function (exports) {
859 }, 850 },
860 //BMC服务器和共享存储根据厂商和型号跳转不同的详情页 851 //BMC服务器和共享存储根据厂商和型号跳转不同的详情页
861 detailPathByProviderAndModel: function (resType, resId) { 852 detailPathByProviderAndModel: function (resType, resId) {
862 - $.ajax({ 853 + admin.req({
863 url: this.domainName + '/api-web/manage/resource/findById?access_token=' + layui.sessions.getToken()['access_token'], 854 url: this.domainName + '/api-web/manage/resource/findById?access_token=' + layui.sessions.getToken()['access_token'],
864 data: {resId: resId}, 855 data: {resId: resId},
865 - async: false,  
866 - success: function (res) {  
867 - var res = res.obj;  
868 - var bean = res['bean']; 856 + async: false
  857 + }).done(function (res) {
  858 + var res = res.obj;
  859 + var bean = res['bean'];
869 860
870 - //存放BMC服务器厂商和详情页关系的map  
871 - var BMCMap = new Map();  
872 - BMCMap.set('DELL', 'HOST_BMC_DELL');  
873 - BMCMap.set('H3C', 'HOST_BMC_H3C');  
874 - BMCMap.set('HUAWEI', 'HOST_BMC_HUAWEI');  
875 - BMCMap.set('LENOVO', 'HOST_BMC_LENOVO');  
876 - BMCMap.set("IBM", "HOST_BMC_IBM");  
877 - BMCMap.set('Inspur', 'HOST_BMC_INSPUR');  
878 - BMCMap.set('sugon', 'HOST_BMC_SUGON');  
879 - BMCMap.set('HP', 'HOST_BMC_HP');  
880 - BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX');  
881 - BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX');  
882 - BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE'); 861 + //存放BMC服务器厂商和详情页关系的map
  862 + var BMCMap = new Map();
  863 + BMCMap.set('DELL', 'HOST_BMC_DELL');
  864 + BMCMap.set('H3C', 'HOST_BMC_H3C');
  865 + BMCMap.set('HUAWEI', 'HOST_BMC_HUAWEI');
  866 + BMCMap.set('LENOVO', 'HOST_BMC_LENOVO');
  867 + BMCMap.set("IBM", "HOST_BMC_IBM");
  868 + BMCMap.set('Inspur', 'HOST_BMC_INSPUR');
  869 + BMCMap.set('sugon', 'HOST_BMC_SUGON');
  870 + BMCMap.set('HP', 'HOST_BMC_HP');
  871 + BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX');
  872 + BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX');
  873 + BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE');
883 874
884 - //存放共享存储厂商和详情页关系的map  
885 - var shareMap = new Map();  
886 - shareMap.set('HUAWEI', 'STORAGE_SHARE');  
887 - shareMap.set('Inspur', 'STORAGE_SHARE_INSPUR'); 875 + //存放共享存储厂商和详情页关系的map
  876 + var shareMap = new Map();
  877 + shareMap.set('HUAWEI', 'STORAGE_SHARE');
  878 + shareMap.set('Inspur', 'STORAGE_SHARE_INSPUR');
888 879
889 - if (resType.indexOf('HOST_X86SERVER') != -1) {  
890 - if (bean.provider == 'HP' && bean.model.split('-')[0] == 'C7000') {  
891 - resType = BMCMap.get('HP_knifeBox');  
892 - } else if (bean.provider == 'H3C' && bean.model.split('-')[1] == 'R690') {  
893 - resType = BMCMap.get('HP');  
894 - } else if (bean.provider === 'HUAWEI' && bean.model === 'E9000') {  
895 - resType = BMCMap.get('HUAWEI_KNIFEBOX');  
896 - } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) {  
897 - resType = BMCMap.get('HUAWEI_BLADE');  
898 - } else {  
899 - if (BMCMap.get(bean.provider)) {  
900 - resType = BMCMap.get(bean.provider)  
901 - } 880 + if (resType.indexOf('HOST_X86SERVER') != -1) {
  881 + if (bean.provider == 'HP' && bean.model.split('-')[0] == 'C7000') {
  882 + resType = BMCMap.get('HP_knifeBox');
  883 + } else if (bean.provider == 'H3C' && bean.model.split('-')[1] == 'R690') {
  884 + resType = BMCMap.get('HP');
  885 + } else if (bean.provider === 'HUAWEI' && bean.model === 'E9000') {
  886 + resType = BMCMap.get('HUAWEI_KNIFEBOX');
  887 + } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) {
  888 + resType = BMCMap.get('HUAWEI_BLADE');
  889 + } else {
  890 + if (BMCMap.get(bean.provider)) {
  891 + resType = BMCMap.get(bean.provider)
902 } 892 }
903 } 893 }
904 - if (resType.indexOf('STORAGE_SHARE') != -1) {  
905 - resType = shareMap.get(bean.provider)  
906 - } 894 + }
  895 + if (resType.indexOf('STORAGE_SHARE') != -1) {
  896 + resType = shareMap.get(bean.provider)
907 } 897 }
908 }) 898 })
909 return resType; 899 return resType;
@@ -1374,8 +1364,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1374,8 +1364,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1374 } 1364 }
1375 alink.setAttribute("lay-href", layHref.split('=')[0] + param); 1365 alink.setAttribute("lay-href", layHref.split('=')[0] + param);
1376 admin.req({ 1366 admin.req({
1377 - url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/' + layHref.split('=')[2],  
1378 - success(response) { 1367 + url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/' + layHref.split('=')[2]
  1368 + }).done(
  1369 + function (response) {
1379 //LH 修改 弹框展示子拓扑 1370 //LH 修改 弹框展示子拓扑
1380 layer.open({ 1371 layer.open({
1381 title: response.object.topoName, 1372 title: response.object.topoName,
@@ -1383,11 +1374,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1383,11 +1374,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1383 area: ['90%', '90%'], 1374 area: ['90%', '90%'],
1384 content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + layHref.split('=')[2],//+ "&layout=organic", 1375 content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + layHref.split('=')[2],//+ "&layout=organic",
1385 }) 1376 })
1386 - },  
1387 - error() {  
1388 - layer.closeAll('loading');  
1389 - layer.msg('生成资源拓扑失败...', {icon: 2});  
1390 - } 1377 + }).error(function () {
  1378 + layer.closeAll('loading');
  1379 + layer.msg('生成资源拓扑失败...', {icon: 2});
1391 }); 1380 });
1392 1381
1393 // document.body.appendChild(alink); 1382 // document.body.appendChild(alink);
@@ -1404,66 +1393,65 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1404,66 +1393,65 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1404 admin.req({ 1393 admin.req({
1405 url: obj.domainName + "/api-web/home/resource/findById?resId=" + resId 1394 url: obj.domainName + "/api-web/home/resource/findById?resId=" + resId
1406 , type: "get" 1395 , type: "get"
1407 - , done: function (res) {  
1408 - if (res.str === 'false') {  
1409 - layer.msg('暂无该资源权限!', {icon: 0});  
1410 - return; 1396 + }).done(function (res) {
  1397 + if (res.str === 'false') {
  1398 + layer.msg('暂无该资源权限!', {icon: 0});
  1399 + return;
  1400 + }
  1401 + var data = res.object;
  1402 + if (data) {
  1403 + // var resTypeName = data.resTypeName ? data.resTypeName + " | " : "";
  1404 + // var resName = data.resName ? data.resName + " | " : "";
  1405 + // var resIp = data.ip ? data.ip + " | " : "";
  1406 + // var resPositon = data.resPositon ? data.resPositon + " | " : "";
  1407 + // var resLabel = data.resLabel ? data.resLabel + " | " : "";
  1408 + // var admin = data.admin ? data.admin : "";
  1409 + // var title = resTypeName + resName + resIp + resPositon + resLabel + admin;
  1410 + var resId = data.resId;
  1411 + var resType = data.resType;
  1412 + var resName = data.resName;
  1413 + var ip = data.ip;
  1414 + var resTypeName = data.resTypeName;
  1415 + var adminName = data.adminName;
  1416 + var manageIp = data.manageIp;
  1417 + var collProtocol = data.collProtocol;
  1418 + var title = resName;
  1419 + if (title && title != '') {
  1420 + title += '|';
1411 } 1421 }
1412 - var data = res.object;  
1413 - if (data) {  
1414 - // var resTypeName = data.resTypeName ? data.resTypeName + " | " : "";  
1415 - // var resName = data.resName ? data.resName + " | " : "";  
1416 - // var resIp = data.ip ? data.ip + " | " : "";  
1417 - // var resPositon = data.resPositon ? data.resPositon + " | " : "";  
1418 - // var resLabel = data.resLabel ? data.resLabel + " | " : "";  
1419 - // var admin = data.admin ? data.admin : "";  
1420 - // var title = resTypeName + resName + resIp + resPositon + resLabel + admin;  
1421 - var resId = data.resId;  
1422 - var resType = data.resType;  
1423 - var resName = data.resName;  
1424 - var ip = data.ip;  
1425 - var resTypeName = data.resTypeName;  
1426 - var adminName = data.adminName;  
1427 - var manageIp = data.manageIp;  
1428 - var collProtocol = data.collProtocol;  
1429 - var title = resName;  
1430 - if (title && title != '') {  
1431 - title += '|';  
1432 - }  
1433 - if (resTypeName && resType !== 'HOST_X86SERVER') {  
1434 - title += resTypeName + '|';  
1435 - }  
1436 - if (ip) {  
1437 - if (resType === 'HOST_X86SERVER') {  
1438 - if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {  
1439 - title += '应用IP-' + ip + '|';  
1440 - }  
1441 - } else {  
1442 - title += ip + '|';  
1443 - }  
1444 - }  
1445 - if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {  
1446 - if (manageIp) {  
1447 - title += '管理IP-' + manageIp + '|'; 1422 + if (resTypeName && resType !== 'HOST_X86SERVER') {
  1423 + title += resTypeName + '|';
  1424 + }
  1425 + if (ip) {
  1426 + if (resType === 'HOST_X86SERVER') {
  1427 + if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
  1428 + title += '应用IP-' + ip + '|';
1448 } 1429 }
  1430 + } else {
  1431 + title += ip + '|';
1449 } 1432 }
1450 - if (adminName) {  
1451 - title += adminName + '|';  
1452 - }  
1453 - if (title.length > 0) {  
1454 - title = title.substr(0, title.length - 1);  
1455 - }  
1456 - if (!commonDetail) {  
1457 - commonDetail = layui.commonDetail;  
1458 - }  
1459 - if (data.pingEnable == '2') { //如果pingEnable为2，则进入ping状态详情页面  
1460 - commonDetail.openNewWin('template/detail/pingIndex', title, {'resId': data.resId}, false);  
1461 - } else { //否则进入监控详情页面  
1462 - commonDetail.openDetail(data.resId, data.resType, title); 1433 + }
  1434 + if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
  1435 + if (manageIp) {
  1436 + title += '管理IP-' + manageIp + '|';
1463 } 1437 }
1464 - } else {  
1465 - layer.msg("获取资源详细信息失败，请稍后再试！", {offset: '15px', icon: 7, time: 2000});  
1466 } 1438 }
  1439 + if (adminName) {
  1440 + title += adminName + '|';
  1441 + }
  1442 + if (title.length > 0) {
  1443 + title = title.substr(0, title.length - 1);
  1444 + }
  1445 + if (!commonDetail) {
  1446 + commonDetail = layui.commonDetail;
  1447 + }
  1448 + if (data.pingEnable == '2') { //如果pingEnable为2，则进入ping状态详情页面
  1449 + commonDetail.openNewWin('template/detail/pingIndex', title, {'resId': data.resId}, false);
  1450 + } else { //否则进入监控详情页面
  1451 + commonDetail.openDetail(data.resId, data.resType, title);
  1452 + }
  1453 + } else {
  1454 + layer.msg("获取资源详细信息失败，请稍后再试！", {offset: '15px', icon: 7, time: 2000});
1467 } 1455 }
1468 }); 1456 });
1469 }, 1457 },
@@ -1471,49 +1459,46 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1471,49 +1459,46 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1471 layer.load(2); 1459 layer.load(2);
1472 admin.req({ 1460 admin.req({
1473 url: obj.domainName + '/api-web/mxgraph/generateByResId', 1461 url: obj.domainName + '/api-web/mxgraph/generateByResId',
1474 - data: {resId},  
1475 - success(response) {  
1476 - layer.closeAll('loading');  
1477 - if (response && response.success) {  
1478 - layer.open({  
1479 - type: 2,  
1480 - content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + response.str + "&layout=organic",  
1481 - area: ['98%', '98%'],  
1482 - title: ''  
1483 - });  
1484 - } else {  
1485 - layer.msg('生成资源拓扑失败!', {icon: 2});  
1486 - }  
1487 - },  
1488 - error() {  
1489 - layer.closeAll('loading');  
1490 - layer.msg('生成资源拓扑失败...', {icon: 2}); 1462 + data: {resId}
  1463 + }).done(function (response) {
  1464 + layer.closeAll('loading');
  1465 + if (response && response.success) {
  1466 + layer.open({
  1467 + type: 2,
  1468 + content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + response.str + "&layout=organic",
  1469 + area: ['98%', '98%'],
  1470 + title: ''
  1471 + });
  1472 + } else {
  1473 + layer.msg('生成资源拓扑失败!', {icon: 2});
1491 } 1474 }
1492 - }); 1475 + }).error(function () {
  1476 + layer.closeAll('loading');
  1477 + layer.msg('生成资源拓扑失败...', {icon: 2});
  1478 + })
1493 }, 1479 },
1494 viewAjView: function (reportCode, height, width) { 1480 viewAjView: function (reportCode, height, width) {
1495 layer.load(2); 1481 layer.load(2);
1496 admin.req({ 1482 admin.req({
1497 url: obj.domainName + '/api-web/ajConfig/findOneById', 1483 url: obj.domainName + '/api-web/ajConfig/findOneById',
1498 - data: {id: reportCode},  
1499 - success(response) { 1484 + data: {id: reportCode}
  1485 + }).done(function (response) {
  1486 + layer.closeAll('loading');
  1487 + if (response && response.success) {
  1488 + layer.open({
  1489 + type: 2,
  1490 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + response.object.designPage + response.object.param + "&access_token=" + localStorage.getItem('access_token'),
  1491 + area: [height, width],
  1492 + title: response.object.title
  1493 + });
  1494 + } else {
  1495 + layer.open({
  1496 + type: 2,
  1497 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode + "&access_token=" + localStorage.getItem('access_token'),
  1498 + area: [height, width],
  1499 + title: ''
  1500 + });
1500 layer.closeAll('loading'); 1501 layer.closeAll('loading');
1501 - if (response && response.success) {  
1502 - layer.open({  
1503 - type: 2,  
1504 - content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + response.object.designPage + response.object.param + "&access_token=" + localStorage.getItem('access_token'),  
1505 - area: [height, width],  
1506 - title: response.object.title  
1507 - });  
1508 - } else {  
1509 - layer.open({  
1510 - type: 2,  
1511 - content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode + "&access_token=" + localStorage.getItem('access_token'),  
1512 - area: [height, width],  
1513 - title: ''  
1514 - });  
1515 - layer.closeAll('loading');  
1516 - }  
1517 } 1502 }
1518 }); 1503 });
1519 }, 1504 },
@@ -1521,24 +1506,22 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1521,24 +1506,22 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1521 layer.load(2); 1506 layer.load(2);
1522 admin.req({ 1507 admin.req({
1523 url: obj.domainName + '/api-web/mxgraph/generateByBusId', 1508 url: obj.domainName + '/api-web/mxgraph/generateByBusId',
1524 - data: {busId},  
1525 - success(response) {  
1526 - layer.closeAll('loading');  
1527 - if (response && response.success) {  
1528 - layer.open({  
1529 - type: 2,  
1530 - content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + response.str + "&layout=organic",  
1531 - area: ['98%', '98%'],  
1532 - title: ''  
1533 - });  
1534 - } else {  
1535 - layer.msg('生成业务拓扑失败!', {icon: 2});  
1536 - }  
1537 - },  
1538 - error() {  
1539 - layer.closeAll('loading');  
1540 - layer.msg('生成业务拓扑失败...', {icon: 2}); 1509 + data: {busId}
  1510 + }).done(function (response) {
  1511 + layer.closeAll('loading');
  1512 + if (response && response.success) {
  1513 + layer.open({
  1514 + type: 2,
  1515 + content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + response.str + "&layout=organic",
  1516 + area: ['98%', '98%'],
  1517 + title: ''
  1518 + });
  1519 + } else {
  1520 + layer.msg('生成业务拓扑失败!', {icon: 2});
1541 } 1521 }
  1522 + }).error(function () {
  1523 + layer.closeAll('loading');
  1524 + layer.msg('生成业务拓扑失败...', {icon: 2});
1542 }); 1525 });
1543 }, 1526 },
1544 1527
@@ -1573,54 +1556,52 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1573,54 +1556,52 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1573 //绑定业务下拉选择数据 1556 //绑定业务下拉选择数据
1574 admin.req({ 1557 admin.req({
1575 url: this.domainName + '/api-web/home/business/findAllBusType', 1558 url: this.domainName + '/api-web/home/business/findAllBusType',
1576 - async: false,  
1577 - success: function (response) {  
1578 - if (response && response.success) {  
1579 - var bizList = response.data.map(item => {  
1580 - return {  
1581 - name: item.busTypeName,  
1582 - value: item.busId,  
1583 - parentId: item.parentId  
1584 - }  
1585 - });  
1586 - var bizTree = obj.pidToChildren(bizList, 'value', 'parentId', canNotCheckPranet);  
1587 - // 影响业务下拉框  
1588 - xmSelect.render(Object.assign({  
1589 - el: '#',  
1590 - name: '',  
1591 - tips: '=所属业务=',  
1592 - //默认开启多选、选完不关闭下拉  
1593 - radio: false,  
1594 - clickClose: false,  
1595 - //开启搜索  
1596 - filterable: true,  
1597 - direction: 'down',  
1598 - initValue: [],  
1599 - toolbar: {  
1600 - show: true,  
1601 - list: ['ALL', 'REVERSE', 'CLEAR']  
1602 - },  
1603 - height: '400px',  
1604 - tree: {  
1605 - show: true,  
1606 - showFolderIcon: true,  
1607 - showLine: true,  
1608 - strict: true,  
1609 - //间距  
1610 - indent: 20,  
1611 - },  
1612 - data: bizTree,  
1613 - on: function (data) {  
1614 - }  
1615 - }, xmSelectParams));  
1616 - } else {  
1617 - layer.msg('获取业务失败', {icon: 2});  
1618 - }  
1619 - },  
1620 - error: function () { 1559 + async: false
  1560 + }).done(function (response) {
  1561 + if (response && response.success) {
  1562 + var bizList = response.data.map(item => {
  1563 + return {
  1564 + name: item.busTypeName,
  1565 + value: item.busId,
  1566 + parentId: item.parentId
  1567 + }
  1568 + });
  1569 + var bizTree = obj.pidToChildren(bizList, 'value', 'parentId', canNotCheckPranet);
  1570 + // 影响业务下拉框
  1571 + xmSelect.render(Object.assign({
  1572 + el: '#',
  1573 + name: '',
  1574 + tips: '=所属业务=',
  1575 + //默认开启多选、选完不关闭下拉
  1576 + radio: false,
  1577 + clickClose: false,
  1578 + //开启搜索
  1579 + filterable: true,
  1580 + direction: 'down',
  1581 + initValue: [],
  1582 + toolbar: {
  1583 + show: true,
  1584 + list: ['ALL', 'REVERSE', 'CLEAR']
  1585 + },
  1586 + height: '400px',
  1587 + tree: {
  1588 + show: true,
  1589 + showFolderIcon: true,
  1590 + showLine: true,
  1591 + strict: true,
  1592 + //间距
  1593 + indent: 20,
  1594 + },
  1595 + data: bizTree,
  1596 + on: function (data) {
  1597 + }
  1598 + }, xmSelectParams));
  1599 + } else {
1621 layer.msg('获取业务失败', {icon: 2}); 1600 layer.msg('获取业务失败', {icon: 2});
1622 } 1601 }
1623 - },); 1602 + }).error(function () {
  1603 + layer.msg('获取业务失败', {icon: 2});
  1604 + })
1624 }, 1605 },
1625 getTingyunToken: function () { 1606 getTingyunToken: function () {
1626 var token = ''; 1607 var token = '';
@@ -1691,23 +1672,21 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1691,23 +1672,21 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1691 var err = null; 1672 var err = null;
1692 do { 1673 do {
1693 try { 1674 try {
1694 - $.ajax(Object.assign({ 1675 + admin.req(Object.assign({
1695 url: '', 1676 url: '',
1696 headers: { 1677 headers: {
1697 Authorization: token 1678 Authorization: token
1698 }, 1679 },
1699 - async: false,  
1700 - success(response) {  
1701 - res = response;  
1702 - if (response && response.code.toString().startsWith('401')) {  
1703 - throw new Error();  
1704 - }  
1705 - },  
1706 - error(error) {  
1707 - err = error; 1680 + async: false
  1681 + }, ajaxParams)).done(function (response) {
  1682 + res = response;
  1683 + if (response && response.code.toString().startsWith('401')) {
1708 throw new Error(); 1684 throw new Error();
1709 } 1685 }
1710 - }, ajaxParams)); 1686 + }).error(function (error) {
  1687 + err = error;
  1688 + throw new Error();
  1689 + });
1711 } catch (e) { 1690 } catch (e) {
1712 failCount--; 1691 failCount--;
1713 if (failCount) { 1692 if (failCount) {
@@ -1771,14 +1750,12 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1771,14 +1750,12 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1771 admin.req({ 1750 admin.req({
1772 url: this.domainName + '/api-web/manage/resource/getShowType?resId=' + resId + '&username=' + username, 1751 url: this.domainName + '/api-web/manage/resource/getShowType?resId=' + resId + '&username=' + username,
1773 async: false, 1752 async: false,
1774 - success: function (response) {  
1775 - if (response && response.success) {  
1776 - value = response.str;  
1777 - }  
1778 - },  
1779 - error: function () {  
1780 - layer.msg('获取用户权限失败', {icon: 2}); 1753 + }).done(function (response) {
  1754 + if (response && response.success) {
  1755 + value = response.str;
1781 } 1756 }
  1757 + }).error(function () {
  1758 + layer.msg('获取用户权限失败', {icon: 2});
1782 }); 1759 });
1783 return value; 1760 return value;
1784 }, 1761 },
@@ -2008,7 +1985,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -2008,7 +1985,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
2008 return fmt; 1985 return fmt;
2009 } 1986 }
2010 1987
2011 - if(form){ 1988 + if (form) {
2012 // 表单验证 1989 // 表单验证
2013 form.verify({ 1990 form.verify({
2014 json: function (d) { 1991 json: function (d) {
@@ -19,18 +19,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -19,18 +19,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
19 layer.close(confirmIndex); 19 layer.close(confirmIndex);
20 layer.load(2); 20 layer.load(2);
21 admin.req({ 21 admin.req({
22 - url: domainName + '/api-web/manage/sync/redis',  
23 - done: function (response) {  
24 - layer.closeAll('loading');  
25 - if (response.success) {  
26 - layer.msg('同步成功!', {icon: 1, time: 3000});  
27 - } else {  
28 - layer.msg('同步失败!' + response.msg, {icon: 2, time: 3000});  
29 - }  
30 - },  
31 - error: function () {  
32 - layer.closeAll('loading'); 22 + url: domainName + '/api-web/manage/sync/redis'
  23 + }).done(function (response) {
  24 + layer.closeAll('loading');
  25 + if (response.success) {
  26 + layer.msg('同步成功!', {icon: 1, time: 3000});
  27 + } else {
  28 + layer.msg('同步失败!' + response.msg, {icon: 2, time: 3000});
33 } 29 }
  30 + }).error(function () {
  31 + layer.closeAll('loading');
34 }); 32 });
35 }); 33 });
36 }); 34 });
@@ -41,18 +39,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -41,18 +39,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
41 layer.close(confirmIndex); 39 layer.close(confirmIndex);
42 layer.load(2); 40 layer.load(2);
43 admin.req({ 41 admin.req({
44 - url: domainName + '/api-web/manage/sync/es',  
45 - done: function (response) {  
46 - layer.closeAll('loading');  
47 - if (response.success) {  
48 - layer.msg('同步成功!', {icon: 1, time: 3000});  
49 - } else {  
50 - layer.msg('同步失败!' + response.msg, {icon: 2, time: 3000});  
51 - }  
52 - },  
53 - error: function () {  
54 - layer.closeAll('loading'); 42 + url: domainName + '/api-web/manage/sync/es'
  43 + }).done(function (response) {
  44 + layer.closeAll('loading');
  45 + if (response.success) {
  46 + layer.msg('同步成功!', {icon: 1, time: 3000});
  47 + } else {
  48 + layer.msg('同步失败!' + response.msg, {icon: 2, time: 3000});
55 } 49 }
  50 + }).error(function () {
  51 + layer.closeAll('loading');
56 }); 52 });
57 }); 53 });
58 }); 54 });
@@ -79,18 +75,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -79,18 +75,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
79 data: { 75 data: {
80 url: $btnDom.data('url'), 76 url: $btnDom.data('url'),
81 urlPrefix: $btnDom.data('prefix') 77 urlPrefix: $btnDom.data('prefix')
82 - },  
83 - success: function (response) {  
84 - layer.closeAll('loading');  
85 - if (response.success) {  
86 - layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});  
87 - } else {  
88 - layer.confirm('请求失败!' + response.msg, {icon: 2});  
89 - }  
90 - },  
91 - error: function (e) {  
92 - layer.closeAll('loading');  
93 } 78 }
  79 + }).done(function (response) {
  80 + layer.closeAll('loading');
  81 + if (response.success) {
  82 + layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});
  83 + } else {
  84 + layer.confirm('请求失败!' + response.msg, {icon: 2});
  85 + }
  86 + }).error(function (e) {
  87 + layer.closeAll('loading');
94 }); 88 });
95 }); 89 });
96 }); 90 });
@@ -108,18 +102,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -108,18 +102,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
108 data: { 102 data: {
109 url: '/delete/key?key=' + value, 103 url: '/delete/key?key=' + value,
110 urlPrefix: $('#btn-delete-redis-key').data('prefix') 104 urlPrefix: $('#btn-delete-redis-key').data('prefix')
111 - },  
112 - success: function (response) {  
113 - layer.closeAll('loading');  
114 - if (response.success) {  
115 - layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});  
116 - } else {  
117 - layer.confirm('请求失败!' + response.msg, {icon: 2});  
118 - }  
119 - },  
120 - error: function (e) {  
121 - layer.closeAll('loading');  
122 } 105 }
  106 + }).done(function (response) {
  107 + layer.closeAll('loading');
  108 + if (response.success) {
  109 + layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});
  110 + } else {
  111 + layer.confirm('请求失败!' + response.msg, {icon: 2});
  112 + }
  113 + }).error(function (e) {
  114 + layer.closeAll('loading');
123 }); 115 });
124 }); 116 });
125 }); 117 });
@@ -146,18 +138,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -146,18 +138,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
146 data: { 138 data: {
147 url: $btnDom.data('url') + data[0].resId, 139 url: $btnDom.data('url') + data[0].resId,
148 urlPrefix: $btnDom.data('prefix') 140 urlPrefix: $btnDom.data('prefix')
149 - },  
150 - success: function (response) {  
151 - layer.closeAll('loading');  
152 - if (response.success) {  
153 - layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});  
154 - } else {  
155 - layer.confirm('请求失败!' + response.msg, {icon: 2});  
156 - }  
157 - },  
158 - error: function (e) {  
159 - layer.closeAll('loading');  
160 } 141 }
  142 + }).done(function (response) {
  143 + layer.closeAll('loading');
  144 + if (response.success) {
  145 + layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});
  146 + } else {
  147 + layer.confirm('请求失败!' + response.msg, {icon: 2});
  148 + }
  149 + }).error(function (e) {
  150 + layer.closeAll('loading');
161 }); 151 });
162 return true 152 return true
163 }); 153 });
@@ -187,18 +177,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -187,18 +177,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
187 data: { 177 data: {
188 url: $btnDom.data('url') + data[0].id, 178 url: $btnDom.data('url') + data[0].id,
189 urlPrefix: $btnDom.data('prefix') 179 urlPrefix: $btnDom.data('prefix')
190 - },  
191 - success: function (response) {  
192 - layer.closeAll('loading');  
193 - if (response.success) {  
194 - layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});  
195 - } else {  
196 - layer.confirm('请求失败!' + response.msg, {icon: 2});  
197 - }  
198 - },  
199 - error: function (e) {  
200 - layer.closeAll('loading');  
201 } 180 }
  181 + }).done(function (response) {
  182 + layer.closeAll('loading');
  183 + if (response.success) {
  184 + layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});
  185 + } else {
  186 + layer.confirm('请求失败!' + response.msg, {icon: 2});
  187 + }
  188 + }).error(function (e) {
  189 + layer.closeAll('loading');
202 }); 190 });
203 return true 191 return true
204 }, null, null, function () { 192 }, null, null, function () {
@@ -247,7 +235,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -247,7 +235,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
247 }).done(function (response) { 235 }).done(function (response) {
248 if (response.data.length == 0) { 236 if (response.data.length == 0) {
249 admin.req({ 237 admin.req({
250 - url: domainName + '/api-web/manage/ddic/save?access_token=' + accessToken, 238 + url: domainName + '/api-web/manage/ddic/save',
251 type: 'POST', 239 type: 'POST',
252 contentType: 'application/json', 240 contentType: 'application/json',
253 data: JSON.stringify(ddic) 241 data: JSON.stringify(ddic)
@@ -273,7 +261,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -273,7 +261,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
273 //查询所有数据IP中的数据 261 //查询所有数据IP中的数据
274 function selectIP() { 262 function selectIP() {
275 admin.req({ 263 admin.req({
276 - url: domainName + '/api-web/manage/ddic/page?access_token=' + accessToken + "&ddicCategory=syncAddr", 264 + url: domainName + '/api-web/manage/ddic/page?ddicCategory=syncAddr',
277 }).done(function (response) { 265 }).done(function (response) {
278 $('#url-prefix').empty(); 266 $('#url-prefix').empty();
279 var html = '<option value="http://127.0.0.1:8414">http://127.0.0.1:8414</option>' 267 var html = '<option value="http://127.0.0.1:8414">http://127.0.0.1:8414</option>'
@@ -305,19 +293,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -305,19 +293,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
305 layer.close(confirmIndex); 293 layer.close(confirmIndex);
306 layer.load(2); 294 layer.load(2);
307 admin.req({ 295 admin.req({
308 - url: domainName + '/api-web/manage/sync/initInstallRelationInfo',  
309 - success: function (response) {  
310 - layer.closeAll('loading');  
311 - if (response.success) {  
312 - layer.confirm(response.str, {icon: 1});  
313 - } else {  
314 - layer.confirm('初始化失败!', {icon: 2});  
315 - }  
316 - },  
317 - error: function (e) {  
318 - layer.closeAll('loading'); 296 + url: domainName + '/api-web/manage/sync/initInstallRelationInfo'
  297 + }).done(function (response) {
  298 + layer.closeAll('loading');
  299 + if (response.success) {
  300 + layer.confirm(response.str, {icon: 1});
  301 + } else {
319 layer.confirm('初始化失败!', {icon: 2}); 302 layer.confirm('初始化失败!', {icon: 2});
320 } 303 }
  304 + }).error(function (e) {
  305 + layer.closeAll('loading');
  306 + layer.confirm('初始化失败!', {icon: 2});
321 }); 307 });
322 }); 308 });
323 }); 309 });
@@ -363,22 +349,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -363,22 +349,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
363 url: domainName + '/api-web/manage/kpi/list', 349 url: domainName + '/api-web/manage/kpi/list',
364 data: { 350 data: {
365 restype: '' 351 restype: ''
366 - },  
367 - success(response) {  
368 - if (response && response.success) {  
369 - var options = '<option value="">=指标Id=</option>';  
370 - response.data.forEach(item => {  
371 - options += `<option value="${item.kpiId}###${item.kpiName}">${item.kpiId}&emsp;${item.kpiName}&emsp;${item.kpiIdent}</option>`;  
372 - });  
373 - $form.find('select[name="kpiId"]').html(options);  
374 - form.render('select', 'form-input-collector');  
375 - } else {  
376 - this.error();  
377 - }  
378 - },  
379 - error() {  
380 - layer.msg('获取指标信息失败!', {icon: 2});  
381 } 352 }
  353 + }).done(function (response) {
  354 + if (response && response.success) {
  355 + var options = '<option value="">=指标Id=</option>';
  356 + response.data.forEach(item => {
  357 + options += `<option value="${item.kpiId}###${item.kpiName}">${item.kpiId}&emsp;${item.kpiName}&emsp;${item.kpiIdent}</option>`;
  358 + });
  359 + $form.find('select[name="kpiId"]').html(options);
  360 + form.render('select', 'form-input-collector');
  361 + } else {
  362 + this.error();
  363 + }
  364 + }).error(function () {
  365 + layer.msg('获取指标信息失败!', {icon: 2});
382 }); 366 });
383 // 选择kpi 367 // 选择kpi
384 form.on('select(slt-input-collector-kpiId)', function (data) { 368 form.on('select(slt-input-collector-kpiId)', function (data) {
@@ -403,24 +387,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -403,24 +387,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
403 collectorData.kpiId = kpiInfos[0]; 387 collectorData.kpiId = kpiInfos[0];
404 collectorData.kpiName = kpiInfos[1]; 388 collectorData.kpiName = kpiInfos[1];
405 layer.load(2); 389 layer.load(2);
406 - $.ajax({  
407 - url: domainName + '/api-web/manage/sync/crtDataReal?access_token=' + accessToken, 390 + admin.req({
  391 + url: domainName + '/api-web/manage/sync/crtDataReal',
408 type: 'POST', 392 type: 'POST',
409 data: JSON.stringify(collectorData), 393 data: JSON.stringify(collectorData),
410 - contentType: 'application/json',  
411 - success(response) {  
412 - layer.closeAll('loading');  
413 - if (response && response.code === 'success') {  
414 - layer.closeAll('page');  
415 - layer.msg(response.message, {icon: 1});  
416 - } else {  
417 - layer.msg(response.message, {icon: 2});  
418 - }  
419 - },  
420 - error() {  
421 - layer.closeAll('loading');  
422 - layer.msg('录入失败!', {icon: 2}); 394 + contentType: 'application/json'
  395 + }).done(function (response) {
  396 + layer.closeAll('loading');
  397 + if (response && response.code === 'success') {
  398 + layer.closeAll('page');
  399 + layer.msg(response.message, {icon: 1});
  400 + } else {
  401 + layer.msg(response.message, {icon: 2});
423 } 402 }
  403 + }).error(function () {
  404 + layer.closeAll('loading');
  405 + layer.msg('录入失败!', {icon: 2});
424 }) 406 })
425 }); 407 });
426 }, 408 },
@@ -468,21 +450,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -468,21 +450,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
468 layer.load(2); 450 layer.load(2);
469 admin.req({ 451 admin.req({
470 url: domainName + '/api-web/manage/sync/sendMsg', 452 url: domainName + '/api-web/manage/sync/sendMsg',
471 - data: msgData,  
472 - success(response) {  
473 - layer.closeAll('loading');  
474 - if (response && response.success) {  
475 - layer.msg('发送成功!', {icon: 1});  
476 - layer.closeAll('page');  
477 - } else {  
478 - layer.msg('发送失败!', {icon: 2});  
479 - }  
480 - },  
481 - error() {  
482 - layer.closeAll('loading'); 453 + data: msgData
  454 + }).done(function (response) {
  455 + layer.closeAll('loading');
  456 + if (response && response.success) {
  457 + layer.msg('发送成功!', {icon: 1});
  458 + layer.closeAll('page');
  459 + } else {
483 layer.msg('发送失败!', {icon: 2}); 460 layer.msg('发送失败!', {icon: 2});
484 } 461 }
485 - }); 462 + }).error(function () {
  463 + layer.closeAll('loading');
  464 + layer.msg('发送失败!', {icon: 2});
  465 + })
486 }); 466 });
487 }, 467 },
488 yes() { 468 yes() {
@@ -527,45 +507,41 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -527,45 +507,41 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
527 url: domainName + '/api-web/manage/kpi/list', 507 url: domainName + '/api-web/manage/kpi/list',
528 data: { 508 data: {
529 restype: '' 509 restype: ''
530 - },  
531 - success(response) {  
532 - if (response && response.success) {  
533 - var options = '<option value="">=指标Id=</option>';  
534 - response.data.forEach(item => {  
535 - options += `<option value="${item.kpiId}">${item.kpiId}&emsp;${item.kpiName}&emsp;${item.kpiIdent}</option>`;  
536 - });  
537 - $form.find('select[name="kpiId"]').html(options);  
538 - form.render('select', 'form-es-export');  
539 - } else {  
540 - this.error();  
541 - }  
542 - },  
543 - error() {  
544 - layer.msg('获取指标信息失败!', {icon: 2});  
545 } 510 }
  511 + }).done(function (response) {
  512 + if (response && response.success) {
  513 + var options = '<option value="">=指标Id=</option>';
  514 + response.data.forEach(item => {
  515 + options += `<option value="${item.kpiId}">${item.kpiId}&emsp;${item.kpiName}&emsp;${item.kpiIdent}</option>`;
  516 + });
  517 + $form.find('select[name="kpiId"]').html(options);
  518 + form.render('select', 'form-es-export');
  519 + } else {
  520 + this.error();
  521 + }
  522 + }).error(function () {
  523 + layer.msg('获取指标信息失败!', {icon: 2});
546 }); 524 });
547 525
548 // 表单提交 526 // 表单提交
549 form.on('submit(form-es-export)', function (data) { 527 form.on('submit(form-es-export)', function (data) {
550 var formData = form.val('form-es-export'); 528 var formData = form.val('form-es-export');
551 layer.load(2); 529 layer.load(2);
552 - $.ajax({  
553 - url: domainName + '/api-web/manage/sync/esExport?access_token=' + accessToken, 530 + admin.req({
  531 + url: domainName + '/api-web/manage/sync/esExport',
554 type: 'GET', 532 type: 'GET',
555 - data: formData,  
556 - success(response) {  
557 - layer.closeAll('loading');  
558 - if (response && response.success) {  
559 - layer.closeAll('page');  
560 - layer.msg(response.msg, {icon: 1});  
561 - } else {  
562 - layer.msg(response.msg, {icon: 2});  
563 - }  
564 - },  
565 - error() {  
566 - layer.closeAll('loading');  
567 - layer.msg('导出失败!', {icon: 2}); 533 + data: formData
  534 + }).done(function (response) {
  535 + layer.closeAll('loading');
  536 + if (response && response.success) {
  537 + layer.closeAll('page');
  538 + layer.msg(response.msg, {icon: 1});
  539 + } else {
  540 + layer.msg(response.msg, {icon: 2});
568 } 541 }
  542 + }).error(function () {
  543 + layer.closeAll('loading');
  544 + layer.msg('导出失败!', {icon: 2});
569 }) 545 })
570 }); 546 });
571 }, 547 },
@@ -580,24 +556,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -580,24 +556,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
580 $('#btn-es-import').unbind('click').on('click', function () { 556 $('#btn-es-import').unbind('click').on('click', function () {
581 557
582 layer.prompt({title: '文件路径', formType: 2}, function (text, index) { 558 layer.prompt({title: '文件路径', formType: 2}, function (text, index) {
583 - $.ajax({  
584 - url: domainName + '/api-web/manage/sync/esImport?access_token=' + accessToken, 559 + admin.req({
  560 + url: domainName + '/api-web/manage/sync/esImport',
585 data: { 561 data: {
586 filePath: text 562 filePath: text
587 - },  
588 - success(response) {  
589 - layer.closeAll('loading');  
590 - if (response && response.success) {  
591 - layer.close(index);  
592 - layer.msg(response.msg, {icon: 1});  
593 - } else {  
594 - layer.msg(response.msg, {icon: 2});  
595 - }  
596 - },  
597 - error() {  
598 - layer.closeAll('loading');  
599 - layer.msg('导出失败!', {icon: 2});  
600 } 563 }
  564 + }).done(function (response) {
  565 + layer.closeAll('loading');
  566 + if (response && response.success) {
  567 + layer.close(index);
  568 + layer.msg(response.msg, {icon: 1});
  569 + } else {
  570 + layer.msg(response.msg, {icon: 2});
  571 + }
  572 + }).error(function () {
  573 + layer.closeAll('loading');
  574 + layer.msg('导出失败!', {icon: 2});
601 }); 575 });
602 }) 576 })
603 }); 577 });
@@ -612,20 +586,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -612,20 +586,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
612 data: { 586 data: {
613 resTypeCode, 587 resTypeCode,
614 clusterResTypeCode 588 clusterResTypeCode
615 - },  
616 - success(response) {  
617 - layer.closeAll('loading');  
618 - if (response.success) {  
619 - layer.confirm(response.msg, {icon: 1});  
620 - } else {  
621 - layer.confirm(response.msg, {icon: 2});  
622 - }  
623 - },  
624 - error(e) {  
625 - layer.closeAll('loading');  
626 - layer.confirm('生成失败!', {icon: 2});  
627 } 589 }
628 - }); 590 + }).done(function (response) {
  591 + layer.closeAll('loading');
  592 + if (response.success) {
  593 + layer.confirm(response.msg, {icon: 1});
  594 + } else {
  595 + layer.confirm(response.msg, {icon: 2});
  596 + }
  597 + }).error(function () {
  598 + layer.closeAll('loading');
  599 + layer.confirm('生成失败!', {icon: 2});
  600 + })
629 }); 601 });
630 }; 602 };
631 603
@@ -649,22 +621,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -649,22 +621,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
649 layer.load(2); 621 layer.load(2);
650 admin.req({ 622 admin.req({
651 url: domainName + '/api-web/bChecktemplate/gatherExport', 623 url: domainName + '/api-web/bChecktemplate/gatherExport',
652 -  
653 data: { 624 data: {
654 tempName: tempName.tempName 625 tempName: tempName.tempName
655 - },  
656 -  
657 - success: function (response) {  
658 - layer.closeAll('loading');  
659 - if (response.success) {  
660 - layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});  
661 - } else {  
662 - layer.confirm('请求失败!' + response.msg, {icon: 2});  
663 - }  
664 - },  
665 - error: function (e) {  
666 - layer.closeAll('loading');  
667 } 626 }
  627 + }).done(function (response) {
  628 + layer.closeAll('loading');
  629 + if (response.success) {
  630 + layer.confirm('请求成功!<br/>' + response.msg, {icon: 1});
  631 + } else {
  632 + layer.confirm('请求失败!' + response.msg, {icon: 2});
  633 + }
  634 + }).error(function (e) {
  635 + layer.closeAll('loading');
668 }); 636 });
669 return true 637 return true
670 }); 638 });
@@ -674,24 +642,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -674,24 +642,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
674 $('#btn-gather-import').unbind('click').on('click', function () { 642 $('#btn-gather-import').unbind('click').on('click', function () {
675 643
676 layer.prompt({title: '文件路径', formType: 2}, function (text, index) { 644 layer.prompt({title: '文件路径', formType: 2}, function (text, index) {
677 - $.ajax({  
678 - url: domainName + '/api-web/manage/sync/gatherImport?access_token=' + accessToken, 645 + admin.req({
  646 + url: domainName + '/api-web/manage/sync/gatherImport',
679 data: { 647 data: {
680 filePath: text 648 filePath: text
681 - },  
682 - success(response) {  
683 - layer.closeAll('loading');  
684 - if (response && response.success) {  
685 - layer.close(index);  
686 - layer.msg(response.msg, {icon: 1});  
687 - } else {  
688 - layer.msg(response.msg, {icon: 2});  
689 - }  
690 - },  
691 - error() {  
692 - layer.closeAll('loading');  
693 - layer.msg('导入失败!', {icon: 2});  
694 } 649 }
  650 + }).done(function (response) {
  651 + layer.closeAll('loading');
  652 + if (response && response.success) {
  653 + layer.close(index);
  654 + layer.msg(response.msg, {icon: 1});
  655 + } else {
  656 + layer.msg(response.msg, {icon: 2});
  657 + }
  658 + }).error(function () {
  659 + layer.closeAll('loading');
  660 + layer.msg('导入失败!', {icon: 2});
695 }); 661 });
696 }) 662 })
697 }); 663 });
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </button> 66 </button>
67 </div> 67 </div>
68 <div class="layui-col-md3"> 68 <div class="layui-col-md3">
69 - <button class="layui-btn btn-general" data-prefix="api-url-workstation-config" 69 + <button disabled="disabled" class="layui-btn btn-general" data-prefix="api-url-workstation-config"
70 data-url="/workstation/refresh/logType" 70 data-url="/workstation/refresh/logType"
71 lay-tips="刷新redis中日志配置信息">刷新日志配置信息 71 lay-tips="刷新redis中日志配置信息">刷新日志配置信息
72 </button> 72 </button>
@@ -110,10 +110,10 @@ @@ -110,10 +110,10 @@
110 <button class="layui-btn" id="btn-send-msg" lay-tips="手动发送短信">手动发送短信</button> 110 <button class="layui-btn" id="btn-send-msg" lay-tips="手动发送短信">手动发送短信</button>
111 </div> 111 </div>
112 <div class="layui-col-md3"> 112 <div class="layui-col-md3">
113 - <button class="layui-btn" lay-tips="手动录入告警信息">手动录入告警信息</button> 113 + <button disabled="disabled" class="layui-btn" lay-tips="手动录入告警信息">手动录入告警信息</button>
114 </div> 114 </div>
115 <div class="layui-col-md3"> 115 <div class="layui-col-md3">
116 - <button class="layui-btn" id="btn-input-collector-result" lay-tips="手动录入采集结果"> 116 + <button disabled="disabled" class="layui-btn" id="btn-input-collector-result" lay-tips="手动录入采集结果">
117 手动录入采集结果 117 手动录入采集结果
118 </button> 118 </button>
119 </div> 119 </div>
@@ -176,7 +176,7 @@ @@ -176,7 +176,7 @@
176 </button> 176 </button>
177 </div> 177 </div>
178 <div class="layui-col-md3"> 178 <div class="layui-col-md3">
179 - <button class="layui-btn" id="btn-gather-import" lay-tips="导入">导入</button> 179 + <button disabled="disabled" class="layui-btn" id="btn-gather-import" lay-tips="导入">导入</button>
180 </div> 180 </div>
181 </div> 181 </div>
182 </div> 182 </div>
@@ -38,18 +38,18 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -38,18 +38,18 @@ layui.define(['xmSelect', 'md5'], function (exports) {
38 * 获取墨镜平台的token 38 * 获取墨镜平台的token
39 * @returns {string} 39 * @returns {string}
40 */ 40 */
41 - getMjToken : () =>{ 41 + getMjToken: () => {
42 return localStorage.getItem("AuthVal") 42 return localStorage.getItem("AuthVal")
43 }, 43 },
44 - getMjTokenKey : () =>{ 44 + getMjTokenKey: () => {
45 return localStorage.getItem("AuthKey") 45 return localStorage.getItem("AuthKey")
46 }, 46 },
47 /** 47 /**
48 * 加载皮肤样式表 48 * 加载皮肤样式表
49 */ 49 */
50 - loadTheme : () =>{ 50 + loadTheme: () => {
51 let theme = localStorage.getItem("theme"); 51 let theme = localStorage.getItem("theme");
52 - if(!theme){ 52 + if (!theme) {
53 theme = 'simplicity'; 53 theme = 'simplicity';
54 } 54 }
55 let url = obj.domainName + `/mj/public/css/sub-sys/monitor-${theme}.css`; 55 let url = obj.domainName + `/mj/public/css/sub-sys/monitor-${theme}.css`;
@@ -288,15 +288,14 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -288,15 +288,14 @@ layui.define(['xmSelect', 'md5'], function (exports) {
288 }); 288 });
289 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&access_token=' + accessToken; 289 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&access_token=' + accessToken;
290 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 290 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
291 - $.ajax({ 291 + admin.req({
292 type: "get", 292 type: "get",
293 url: url, 293 url: url,
294 - async: true,  
295 - success: function (data) {  
296 - if (data.code == 0) {  
297 - layer.close(loadIndex);  
298 - window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.pdfPath));  
299 - } 294 + async: true
  295 + }).done(function (data) {
  296 + if (data.code == 0) {
  297 + layer.close(loadIndex);
  298 + window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.pdfPath));
300 } 299 }
301 }); 300 });
302 }, 301 },
@@ -309,15 +308,14 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -309,15 +308,14 @@ layui.define(['xmSelect', 'md5'], function (exports) {
309 }); 308 });
310 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&access_token=' + accessToken; 309 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&access_token=' + accessToken;
311 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 310 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
312 - $.ajax({ 311 + admin.req({
313 type: "get", 312 type: "get",
314 url: url, 313 url: url,
315 - async: true,  
316 - success: function (data) {  
317 - if (data.code == 0) {  
318 - layer.close(loadIndex);  
319 - window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));  
320 - } 314 + async: true
  315 + }).done(function (data) {
  316 + if (data.code == 0) {
  317 + layer.close(loadIndex);
  318 + window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
321 } 319 }
322 }); 320 });
323 }, 321 },
@@ -362,39 +360,38 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -362,39 +360,38 @@ layui.define(['xmSelect', 'md5'], function (exports) {
362 resTypeXmSelect: function (xmSelectParams) { 360 resTypeXmSelect: function (xmSelectParams) {
363 admin.req({ 361 admin.req({
364 url: `${obj.domainName}/api-web/manage/restype/list`, 362 url: `${obj.domainName}/api-web/manage/restype/list`,
365 - async: false,  
366 - success: function (res) {  
367 - // 资源类型下拉框  
368 - var resTypeList = res.data;  
369 - var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");  
370 - xmSelect.render(Object.assign({  
371 - el: '#',  
372 - tips: '=资源类型=',  
373 - filterable: true,  
374 - radio: false,  
375 - clickClose: false,  
376 - initValue: [],  
377 - prop: {  
378 - name: 'resTypeName',  
379 - value: 'resTypeCode'  
380 - },  
381 - toolbar: {  
382 - show: true,  
383 - list: ['CLEAR']  
384 - },  
385 - tree: {  
386 - show: true,  
387 - showFolderIcon: true,  
388 - showLine: true,  
389 - strict: false,  
390 - indent: 20  
391 - },  
392 - data: resTypeTree,  
393 - on: function (data) { 363 + async: false
  364 + }).done(function (res) {
  365 + // 资源类型下拉框
  366 + var resTypeList = res.data;
  367 + var resTypeTree = obj.pidToChildren(resTypeList, "resTypeCode", "parentId");
  368 + xmSelect.render(Object.assign({
  369 + el: '#',
  370 + tips: '=资源类型=',
  371 + filterable: true,
  372 + radio: false,
  373 + clickClose: false,
  374 + initValue: [],
  375 + prop: {
  376 + name: 'resTypeName',
  377 + value: 'resTypeCode'
  378 + },
  379 + toolbar: {
  380 + show: true,
  381 + list: ['CLEAR']
  382 + },
  383 + tree: {
  384 + show: true,
  385 + showFolderIcon: true,
  386 + showLine: true,
  387 + strict: false,
  388 + indent: 20
  389 + },
  390 + data: resTypeTree,
  391 + on: function (data) {
394 392
395 - }  
396 - }, xmSelectParams));  
397 - } 393 + }
  394 + }, xmSelectParams));
398 }); 395 });
399 }, 396 },
400 /** 397 /**
@@ -502,45 +499,44 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -502,45 +499,44 @@ layui.define(['xmSelect', 'md5'], function (exports) {
502 var roleId = roleId_ ? roleId_ : ''; 499 var roleId = roleId_ ? roleId_ : '';
503 admin.req({ 500 admin.req({
504 url: `${obj.domainName}/api-user/menus/findMenus?username=` + username + '&roleIds=' + roleId, 501 url: `${obj.domainName}/api-user/menus/findMenus?username=` + username + '&roleIds=' + roleId,
505 - success: function (res) {  
506 - // 菜单下拉框  
507 - var menuList = res.data;  
508 - // menuList.forEach(item => {  
509 - // item.disabled = item.isLeaf !== 'Y';  
510 - // });  
511 - var menuTree = obj.pidToChildren(menuList, "id", "parentId");  
512 - //XuHaoJie 2021/10/21 添加是否是父节点  
513 - addProperty(menuTree);  
514 - var menuSelect = xmSelect.render(Object.assign({  
515 - el: '#',  
516 - tips: '=菜单=',  
517 - filterable: true,  
518 - radio: false,  
519 - clickClose: false,  
520 - initValue: [],  
521 - prop: {  
522 - name: 'name',  
523 - value: 'id'  
524 - },  
525 - toolbar: {  
526 - show: true,  
527 - list: ['CLEAR']  
528 - },  
529 - tree: {  
530 - show: true,  
531 - showFolderIcon: true,  
532 - showLine: true,  
533 - strict: false,  
534 - indent: 20  
535 - },  
536 - data: menuTree,  
537 - on: function (data) { 502 + }).done(function (res) {
  503 + // 菜单下拉框
  504 + var menuList = res.data;
  505 + // menuList.forEach(item => {
  506 + // item.disabled = item.isLeaf !== 'Y';
  507 + // });
  508 + var menuTree = obj.pidToChildren(menuList, "id", "parentId");
  509 + //XuHaoJie 2021/10/21 添加是否是父节点
  510 + addProperty(menuTree);
  511 + var menuSelect = xmSelect.render(Object.assign({
  512 + el: '#',
  513 + tips: '=菜单=',
  514 + filterable: true,
  515 + radio: false,
  516 + clickClose: false,
  517 + initValue: [],
  518 + prop: {
  519 + name: 'name',
  520 + value: 'id'
  521 + },
  522 + toolbar: {
  523 + show: true,
  524 + list: ['CLEAR']
  525 + },
  526 + tree: {
  527 + show: true,
  528 + showFolderIcon: true,
  529 + showLine: true,
  530 + strict: false,
  531 + indent: 20
  532 + },
  533 + data: menuTree,
  534 + on: function (data) {
538 535
539 - }  
540 - }, xmSelectParams));  
541 - if (done) {  
542 - done(menuSelect);  
543 } 536 }
  537 + }, xmSelectParams));
  538 + if (done) {
  539 + done(menuSelect);
544 } 540 }
545 }); 541 });
546 542
@@ -559,32 +555,31 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -559,32 +555,31 @@ layui.define(['xmSelect', 'md5'], function (exports) {
559 }, 555 },
560 relationTypeXmSelect: function (xmSelectParams, done) { 556 relationTypeXmSelect: function (xmSelectParams, done) {
561 admin.req({ 557 admin.req({
562 - url: `${obj.domainName}/api-web/relationType/getAll`,  
563 - success: function (res) {  
564 - var relationTypeList = res.data;  
565 - var relationTypeSelect = xmSelect.render(Object.assign({  
566 - el: '#',  
567 - tips: '=关系=',  
568 - filterable: true,  
569 - radio: false,  
570 - clickClose: false,  
571 - initValue: [],  
572 - prop: {  
573 - name: 'typeName',  
574 - value: 'reType'  
575 - },  
576 - toolbar: {  
577 - show: true,  
578 - list: ['ALL', 'CLEAR']  
579 - },  
580 - data: relationTypeList,  
581 - on: function (data) { 558 + url: `${obj.domainName}/api-web/relationType/getAll`
  559 + }).done(function (res) {
  560 + var relationTypeList = res.data;
  561 + var relationTypeSelect = xmSelect.render(Object.assign({
  562 + el: '#',
  563 + tips: '=关系=',
  564 + filterable: true,
  565 + radio: false,
  566 + clickClose: false,
  567 + initValue: [],
  568 + prop: {
  569 + name: 'typeName',
  570 + value: 'reType'
  571 + },
  572 + toolbar: {
  573 + show: true,
  574 + list: ['ALL', 'CLEAR']
  575 + },
  576 + data: relationTypeList,
  577 + on: function (data) {
582 578
583 - }  
584 - }, xmSelectParams));  
585 - if (done) {  
586 - done(relationTypeSelect);  
587 } 579 }
  580 + }, xmSelectParams));
  581 + if (done) {
  582 + done(relationTypeSelect);
588 } 583 }
589 }); 584 });
590 }, 585 },
@@ -638,52 +633,49 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -638,52 +633,49 @@ layui.define(['xmSelect', 'md5'], function (exports) {
638 accessToken = sessions.getToken()['access_token']; 633 accessToken = sessions.getToken()['access_token'];
639 }); 634 });
640 var options = "<option value=''>=请选择=</option>"; 635 var options = "<option value=''>=请选择=</option>";
641 - $.ajax({ 636 + admin.req({
642 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}` 637 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
643 , method: 'get' 638 , method: 'get'
644 - , success: function (res) {  
645 - if (res && res.data) {  
646 - var ddiclist = res.data;  
647 - $.each(ddiclist, function (i, v) {  
648 - options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';  
649 - });  
650 - $('#' + targtetId).html($(options));  
651 - if (callback) {  
652 - callback(ddiclist);  
653 - } 639 + }).done(function (res) {
  640 + if (res && res.data) {
  641 + var ddiclist = res.data;
  642 + $.each(ddiclist, function (i, v) {
  643 + options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
  644 + });
  645 + $('#' + targtetId).html($(options));
  646 + if (callback) {
  647 + callback(ddiclist);
654 } 648 }
655 } 649 }
656 - , error(error) {  
657 - console.error(error);  
658 - } 650 + }).error(function (error) {
  651 + console.error(error);
659 }); 652 });
660 }, 653 },
661 // 用户下拉框 654 // 用户下拉框
662 userXmSelect: function (xmSelectParams) { 655 userXmSelect: function (xmSelectParams) {
663 var userSelect; 656 var userSelect;
664 - $.ajax({  
665 - url: this.domainName + '/api-user/users/getAll?access_token=' + localStorage.getItem("access_token"),  
666 - async: false,  
667 - success: function (response) {  
668 - userSelect = xmSelect.render(Object.assign({  
669 - el: '#',  
670 - tips: '=选择用户=',  
671 - prop: {  
672 - name: 'nickname',  
673 - value: 'username'  
674 - },  
675 - autoRow: true,  
676 - filterable: true,  
677 - toolbar: {  
678 - show: true,  
679 - list: ['ALL', 'REVERSE', 'CLEAR']  
680 - },  
681 - data: response,  
682 - on: function (data) { 657 + admin.req({
  658 + url: this.domainName + '/mj/user/getAll',
  659 + async: false
  660 + }).done(function (response) {
  661 + userSelect = xmSelect.render(Object.assign({
  662 + el: '#',
  663 + tips: '=选择用户=',
  664 + prop: {
  665 + name: 'nickname',
  666 + value: 'username'
  667 + },
  668 + autoRow: true,
  669 + filterable: true,
  670 + toolbar: {
  671 + show: true,
  672 + list: ['ALL', 'REVERSE', 'CLEAR']
  673 + },
  674 + data: response,
  675 + on: function (data) {
683 676
684 - }  
685 - }, xmSelectParams));  
686 - } 677 + }
  678 + }, xmSelectParams));
687 }); 679 });
688 return userSelect; 680 return userSelect;
689 }, 681 },
@@ -817,7 +809,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -817,7 +809,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
817 }); 809 });
818 }, 810 },
819 //详细页地址 811 //详细页地址
820 - detailPath: function (resType, resId, protocol,resDetal) { 812 + detailPath: function (resType, resId, protocol, resDetal) {
821 //供从详细页配置策略时使用 813 //供从详细页配置策略时使用
822 localStorage.setItem("currentResType", resType); 814 localStorage.setItem("currentResType", resType);
823 //网络设备 815 //网络设备
@@ -865,25 +857,24 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -865,25 +857,24 @@ layui.define(['xmSelect', 'md5'], function (exports) {
865 } 857 }
866 858
867 // 20220828 宁夏详情页迁移 859 // 20220828 宁夏详情页迁移
868 - if(resDetal && resDetal.resType =='MIDDLEWARE_MQ' && resDetal.os == 'windows'){ 860 + if (resDetal && resDetal.resType == 'MIDDLEWARE_MQ' && resDetal.os == 'windows') {
869 resType = "MIDDLEWARE_MQ_WINDOWS"; 861 resType = "MIDDLEWARE_MQ_WINDOWS";
870 } 862 }
871 return "template/detail/" + resType.toLowerCase(); 863 return "template/detail/" + resType.toLowerCase();
872 }, 864 },
873 checkHasCluster: function (resType, resId) { 865 checkHasCluster: function (resType, resId) {
874 - $.ajax({ 866 + admin.req({
875 url: this.domainName + '/api-web/detail/block?access_token=' + layui.sessions.getToken()['access_token'], 867 url: this.domainName + '/api-web/detail/block?access_token=' + layui.sessions.getToken()['access_token'],
876 data: { 868 data: {
877 resId: resId, 869 resId: resId,
878 kpiId: 'KPI096EB5BA' 870 kpiId: 'KPI096EB5BA'
879 }, 871 },
880 - async: false,  
881 - success: function (res) { 872 + async: false
  873 + }).done(function (res) {
882 874
883 - if (res && res.data && res.data.length > 0) {  
884 - if (res.data[0].value == '是') {  
885 - resType = 'ORACLE_RAC';  
886 - } 875 + if (res && res.data && res.data.length > 0) {
  876 + if (res.data[0].value == '是') {
  877 + resType = 'ORACLE_RAC';
887 } 878 }
888 } 879 }
889 }); 880 });
@@ -891,58 +882,57 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -891,58 +882,57 @@ layui.define(['xmSelect', 'md5'], function (exports) {
891 }, 882 },
892 //BMC服务器和共享存储根据厂商和型号跳转不同的详情页 883 //BMC服务器和共享存储根据厂商和型号跳转不同的详情页
893 detailPathByProviderAndModel: function (resType, resId) { 884 detailPathByProviderAndModel: function (resType, resId) {
894 - $.ajax({ 885 + admin.req({
895 url: this.domainName + '/api-web/manage/resource/findById?access_token=' + layui.sessions.getToken()['access_token'], 886 url: this.domainName + '/api-web/manage/resource/findById?access_token=' + layui.sessions.getToken()['access_token'],
896 data: {resId: resId}, 887 data: {resId: resId},
897 - async: false,  
898 - success: function (res) {  
899 - var res = res.obj;  
900 - var bean = res['bean'];  
901 -  
902 - //存放BMC服务器厂商和详情页关系的map  
903 - var BMCMap = new Map();  
904 - BMCMap.set('DELL', 'HOST_BMC_DELL');  
905 - BMCMap.set('H3C', 'HOST_BMC_H3C');  
906 - BMCMap.set('HUAWEI', 'HOST_BMC_HUAWEI');  
907 - BMCMap.set('LENOVO', 'HOST_BMC_LENOVO');  
908 - BMCMap.set("IBM", "HOST_BMC_IBM");  
909 - BMCMap.set('Inspur', 'HOST_BMC_INSPUR');  
910 - BMCMap.set('sugon', 'HOST_BMC_SUGON');  
911 - BMCMap.set('HP', 'HOST_BMC_HP');  
912 - BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX');  
913 - BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX');  
914 - BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE');  
915 -  
916 - //存放共享存储厂商和详情页关系的map  
917 - var shareMap = new Map();  
918 - shareMap.set('HUAWEI', 'STORAGE_SHARE');  
919 - shareMap.set('Inspur', 'STORAGE_SHARE_INSPUR');  
920 - //lsq 增加hongshan厂商对应详情页关系 2022-08-28  
921 - shareMap.set('macrosan', 'STORAGE_SHARE_HS');  
922 -  
923 - if (resType.indexOf('HOST_X86SERVER') != -1) {  
924 - if (bean.provider == 'HP' && bean.model.split('-')[0] == 'C7000') {  
925 - resType = BMCMap.get('HP_knifeBox');  
926 - } else if (bean.provider == 'H3C' && bean.model.split('-')[1] == 'R690') {  
927 - resType = BMCMap.get('HP');  
928 - } else if (bean.provider === 'HUAWEI' && bean.model === 'E9000') {  
929 - resType = BMCMap.get('HUAWEI_KNIFEBOX');  
930 - } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) {  
931 - resType = BMCMap.get('HUAWEI_BLADE');  
932 - } else {  
933 - if (BMCMap.get(bean.provider)) {  
934 - resType = BMCMap.get(bean.provider)  
935 - } 888 + async: false
  889 + }).done(function (res) {
  890 + var res = res.obj;
  891 + var bean = res['bean'];
  892 +
  893 + //存放BMC服务器厂商和详情页关系的map
  894 + var BMCMap = new Map();
  895 + BMCMap.set('DELL', 'HOST_BMC_DELL');
  896 + BMCMap.set('H3C', 'HOST_BMC_H3C');
  897 + BMCMap.set('HUAWEI', 'HOST_BMC_HUAWEI');
  898 + BMCMap.set('LENOVO', 'HOST_BMC_LENOVO');
  899 + BMCMap.set("IBM", "HOST_BMC_IBM");
  900 + BMCMap.set('Inspur', 'HOST_BMC_INSPUR');
  901 + BMCMap.set('sugon', 'HOST_BMC_SUGON');
  902 + BMCMap.set('HP', 'HOST_BMC_HP');
  903 + BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX');
  904 + BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX');
  905 + BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE');
  906 +
  907 + //存放共享存储厂商和详情页关系的map
  908 + var shareMap = new Map();
  909 + shareMap.set('HUAWEI', 'STORAGE_SHARE');
  910 + shareMap.set('Inspur', 'STORAGE_SHARE_INSPUR');
  911 + //lsq 增加hongshan厂商对应详情页关系 2022-08-28
  912 + shareMap.set('macrosan', 'STORAGE_SHARE_HS');
  913 +
  914 + if (resType.indexOf('HOST_X86SERVER') != -1) {
  915 + if (bean.provider == 'HP' && bean.model.split('-')[0] == 'C7000') {
  916 + resType = BMCMap.get('HP_knifeBox');
  917 + } else if (bean.provider == 'H3C' && bean.model.split('-')[1] == 'R690') {
  918 + resType = BMCMap.get('HP');
  919 + } else if (bean.provider === 'HUAWEI' && bean.model === 'E9000') {
  920 + resType = BMCMap.get('HUAWEI_KNIFEBOX');
  921 + } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) {
  922 + resType = BMCMap.get('HUAWEI_BLADE');
  923 + } else {
  924 + if (BMCMap.get(bean.provider)) {
  925 + resType = BMCMap.get(bean.provider)
936 } 926 }
937 } 927 }
938 - if (resType.indexOf('STORAGE_SHARE') != -1) {  
939 - resType = shareMap.get(bean.provider)  
940 - } 928 + }
  929 + if (resType.indexOf('STORAGE_SHARE') != -1) {
  930 + resType = shareMap.get(bean.provider)
  931 + }
941 932
942 - // 中间件MQ  
943 - if (resType.indexOf('MIDDLEWARE_MQ') != -1 && bean.os == 'windows') {  
944 - resType = 'MIDDLEWARE_MQ_WINDOWS';  
945 - } 933 + // 中间件MQ
  934 + if (resType.indexOf('MIDDLEWARE_MQ') != -1 && bean.os == 'windows') {
  935 + resType = 'MIDDLEWARE_MQ_WINDOWS';
946 } 936 }
947 }) 937 })
948 return resType; 938 return resType;
@@ -1414,8 +1404,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1414,8 +1404,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1414 } 1404 }
1415 alink.setAttribute("lay-href", layHref.split('=')[0] + param); 1405 alink.setAttribute("lay-href", layHref.split('=')[0] + param);
1416 admin.req({ 1406 admin.req({
1417 - url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/' + layHref.split('=')[2],  
1418 - success(response) { 1407 + url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/' + layHref.split('=')[2]
  1408 + }).done(
  1409 + function (response) {
1419 //LH 修改 弹框展示子拓扑 1410 //LH 修改 弹框展示子拓扑
1420 layer.open({ 1411 layer.open({
1421 title: response.object.topoName, 1412 title: response.object.topoName,
@@ -1423,11 +1414,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1423,11 +1414,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1423 area: ['90%', '90%'], 1414 area: ['90%', '90%'],
1424 content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + layHref.split('=')[2],//+ "&layout=organic", 1415 content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + layHref.split('=')[2],//+ "&layout=organic",
1425 }) 1416 })
1426 - },  
1427 - error() {  
1428 - layer.closeAll('loading');  
1429 - layer.msg('生成资源拓扑失败...', {icon: 2});  
1430 - } 1417 + }).error(function () {
  1418 + layer.closeAll('loading');
  1419 + layer.msg('生成资源拓扑失败...', {icon: 2});
1431 }); 1420 });
1432 1421
1433 // document.body.appendChild(alink); 1422 // document.body.appendChild(alink);
@@ -1444,66 +1433,65 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1444,66 +1433,65 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1444 admin.req({ 1433 admin.req({
1445 url: obj.domainName + "/api-web/home/resource/findById?resId=" + resId 1434 url: obj.domainName + "/api-web/home/resource/findById?resId=" + resId
1446 , type: "get" 1435 , type: "get"
1447 - , done: function (res) {  
1448 - if (res.str === 'false') {  
1449 - layer.msg('暂无该资源权限!', {icon: 0});  
1450 - return; 1436 + }).done(function (res) {
  1437 + if (res.str === 'false') {
  1438 + layer.msg('暂无该资源权限!', {icon: 0});
  1439 + return;
  1440 + }
  1441 + var data = res.object;
  1442 + if (data) {
  1443 + // var resTypeName = data.resTypeName ? data.resTypeName + " | " : "";
  1444 + // var resName = data.resName ? data.resName + " | " : "";
  1445 + // var resIp = data.ip ? data.ip + " | " : "";
  1446 + // var resPositon = data.resPositon ? data.resPositon + " | " : "";
  1447 + // var resLabel = data.resLabel ? data.resLabel + " | " : "";
  1448 + // var admin = data.admin ? data.admin : "";
  1449 + // var title = resTypeName + resName + resIp + resPositon + resLabel + admin;
  1450 + var resId = data.resId;
  1451 + var resType = data.resType;
  1452 + var resName = data.resName;
  1453 + var ip = data.ip;
  1454 + var resTypeName = data.resTypeName;
  1455 + var adminName = data.adminName;
  1456 + var manageIp = data.manageIp;
  1457 + var collProtocol = data.collProtocol;
  1458 + var title = resName;
  1459 + if (title && title != '') {
  1460 + title += '|';
1451 } 1461 }
1452 - var data = res.object;  
1453 - if (data) {  
1454 - // var resTypeName = data.resTypeName ? data.resTypeName + " | " : "";  
1455 - // var resName = data.resName ? data.resName + " | " : "";  
1456 - // var resIp = data.ip ? data.ip + " | " : "";  
1457 - // var resPositon = data.resPositon ? data.resPositon + " | " : "";  
1458 - // var resLabel = data.resLabel ? data.resLabel + " | " : "";  
1459 - // var admin = data.admin ? data.admin : "";  
1460 - // var title = resTypeName + resName + resIp + resPositon + resLabel + admin;  
1461 - var resId = data.resId;  
1462 - var resType = data.resType;  
1463 - var resName = data.resName;  
1464 - var ip = data.ip;  
1465 - var resTypeName = data.resTypeName;  
1466 - var adminName = data.adminName;  
1467 - var manageIp = data.manageIp;  
1468 - var collProtocol = data.collProtocol;  
1469 - var title = resName;  
1470 - if (title && title != '') {  
1471 - title += '|';  
1472 - }  
1473 - if (resTypeName && resType !== 'HOST_X86SERVER') {  
1474 - title += resTypeName + '|';  
1475 - }  
1476 - if (ip) {  
1477 - if (resType === 'HOST_X86SERVER') {  
1478 - if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {  
1479 - title += '应用IP-' + ip + '|';  
1480 - }  
1481 - } else {  
1482 - title += ip + '|';  
1483 - }  
1484 - }  
1485 - if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {  
1486 - if (manageIp) {  
1487 - title += '管理IP-' + manageIp + '|'; 1462 + if (resTypeName && resType !== 'HOST_X86SERVER') {
  1463 + title += resTypeName + '|';
  1464 + }
  1465 + if (ip) {
  1466 + if (resType === 'HOST_X86SERVER') {
  1467 + if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
  1468 + title += '应用IP-' + ip + '|';
1488 } 1469 }
  1470 + } else {
  1471 + title += ip + '|';
1489 } 1472 }
1490 - if (adminName) {  
1491 - title += adminName + '|';  
1492 - }  
1493 - if (title.length > 0) {  
1494 - title = title.substr(0, title.length - 1);  
1495 - }  
1496 - if (!commonDetail) {  
1497 - commonDetail = layui.commonDetail;  
1498 - }  
1499 - if (data.pingEnable == '2') { //如果pingEnable为2，则进入ping状态详情页面  
1500 - commonDetail.openNewWin('template/detail/pingIndex', title, {'resId': data.resId}, false);  
1501 - } else { //否则进入监控详情页面  
1502 - commonDetail.openDetail(data.resId, data.resType, title); 1473 + }
  1474 + if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
  1475 + if (manageIp) {
  1476 + title += '管理IP-' + manageIp + '|';
1503 } 1477 }
1504 - } else {  
1505 - layer.msg("获取资源详细信息失败，请稍后再试！", {offset: '15px', icon: 7, time: 2000});  
1506 } 1478 }
  1479 + if (adminName) {
  1480 + title += adminName + '|';
  1481 + }
  1482 + if (title.length > 0) {
  1483 + title = title.substr(0, title.length - 1);
  1484 + }
  1485 + if (!commonDetail) {
  1486 + commonDetail = layui.commonDetail;
  1487 + }
  1488 + if (data.pingEnable == '2') { //如果pingEnable为2，则进入ping状态详情页面
  1489 + commonDetail.openNewWin('template/detail/pingIndex', title, {'resId': data.resId}, false);
  1490 + } else { //否则进入监控详情页面
  1491 + commonDetail.openDetail(data.resId, data.resType, title);
  1492 + }
  1493 + } else {
  1494 + layer.msg("获取资源详细信息失败，请稍后再试！", {offset: '15px', icon: 7, time: 2000});
1507 } 1495 }
1508 }); 1496 });
1509 }, 1497 },
@@ -1511,25 +1499,24 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1511,25 +1499,24 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1511 layer.load(2); 1499 layer.load(2);
1512 admin.req({ 1500 admin.req({
1513 url: obj.domainName + '/api-web/ajConfig/findOneById', 1501 url: obj.domainName + '/api-web/ajConfig/findOneById',
1514 - data: {id: reportCode},  
1515 - success(response) { 1502 + data: {id: reportCode}
  1503 + }).done(function (response) {
  1504 + layer.closeAll('loading');
  1505 + if (response && response.success) {
  1506 + layer.open({
  1507 + type: 2,
  1508 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + response.object.designPage + response.object.param + "&access_token=" + localStorage.getItem('access_token'),
  1509 + area: [height, width],
  1510 + title: response.object.title
  1511 + });
  1512 + } else {
  1513 + layer.open({
  1514 + type: 2,
  1515 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode + "&access_token=" + localStorage.getItem('access_token'),
  1516 + area: [height, width],
  1517 + title: ''
  1518 + });
1516 layer.closeAll('loading'); 1519 layer.closeAll('loading');
1517 - if (response && response.success) {  
1518 - layer.open({  
1519 - type: 2,  
1520 - content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + response.object.designPage + response.object.param + "&access_token=" + localStorage.getItem('access_token'),  
1521 - area: [height, width],  
1522 - title: response.object.title  
1523 - });  
1524 - } else {  
1525 - layer.open({  
1526 - type: 2,  
1527 - content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode + "&access_token=" + localStorage.getItem('access_token'),  
1528 - area: [height, width],  
1529 - title: ''  
1530 - });  
1531 - layer.closeAll('loading');  
1532 - }  
1533 } 1520 }
1534 }); 1521 });
1535 }, 1522 },
@@ -1561,7 +1548,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1561,7 +1548,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1561 if (win) { 1548 if (win) {
1562 window.parent.postMessage({ 1549 window.parent.postMessage({
1563 type: 'dialog', 1550 type: 'dialog',
1564 - message: {'params':{},'type':'openResTopo','title':'业务拓扑','params':{'resId':resId}} 1551 + message: {'params': {}, 'type': 'openResTopo', 'title': '业务拓扑', 'params': {'resId': resId}}
1565 }, '*') 1552 }, '*')
1566 } 1553 }
1567 }, 1554 },
@@ -1594,7 +1581,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1594,7 +1581,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1594 if (win) { 1581 if (win) {
1595 window.parent.postMessage({ 1582 window.parent.postMessage({
1596 type: 'dialog', 1583 type: 'dialog',
1597 - message: {'params':{},'type':'openBizTopo','title':'业务拓扑','params':{'busId':busId}} 1584 + message: {'params': {}, 'type': 'openBizTopo', 'title': '业务拓扑', 'params': {'busId': busId}}
1598 }, '*') 1585 }, '*')
1599 } 1586 }
1600 }, 1587 },
@@ -1630,54 +1617,52 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1630,54 +1617,52 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1630 //绑定业务下拉选择数据 1617 //绑定业务下拉选择数据
1631 admin.req({ 1618 admin.req({
1632 url: this.domainName + '/api-web/home/business/findAllBusType', 1619 url: this.domainName + '/api-web/home/business/findAllBusType',
1633 - async: false,  
1634 - success: function (response) {  
1635 - if (response && response.success) {  
1636 - var bizList = response.data.map(item => {  
1637 - return {  
1638 - name: item.busTypeName,  
1639 - value: item.busId,  
1640 - parentId: item.parentId  
1641 - }  
1642 - });  
1643 - var bizTree = obj.pidToChildren(bizList, 'value', 'parentId', canNotCheckPranet);  
1644 - // 影响业务下拉框  
1645 - xmSelect.render(Object.assign({  
1646 - el: '#',  
1647 - name: '',  
1648 - tips: '=所属业务=',  
1649 - //默认开启多选、选完不关闭下拉  
1650 - radio: false,  
1651 - clickClose: false,  
1652 - //开启搜索  
1653 - filterable: true,  
1654 - direction: 'down',  
1655 - initValue: [],  
1656 - toolbar: {  
1657 - show: true,  
1658 - list: ['ALL', 'REVERSE', 'CLEAR']  
1659 - },  
1660 - height: '400px',  
1661 - tree: {  
1662 - show: true,  
1663 - showFolderIcon: true,  
1664 - showLine: true,  
1665 - strict: true,  
1666 - //间距  
1667 - indent: 20,  
1668 - },  
1669 - data: bizTree,  
1670 - on: function (data) {  
1671 - }  
1672 - }, xmSelectParams));  
1673 - } else {  
1674 - layer.msg('获取业务失败', {icon: 2});  
1675 - }  
1676 - },  
1677 - error: function () { 1620 + async: false
  1621 + }).done(function (response) {
  1622 + if (response && response.success) {
  1623 + var bizList = response.data.map(item => {
  1624 + return {
  1625 + name: item.busTypeName,
  1626 + value: item.busId,
  1627 + parentId: item.parentId
  1628 + }
  1629 + });
  1630 + var bizTree = obj.pidToChildren(bizList, 'value', 'parentId', canNotCheckPranet);
  1631 + // 影响业务下拉框
  1632 + xmSelect.render(Object.assign({
  1633 + el: '#',
  1634 + name: '',
  1635 + tips: '=所属业务=',
  1636 + //默认开启多选、选完不关闭下拉
  1637 + radio: false,
  1638 + clickClose: false,
  1639 + //开启搜索
  1640 + filterable: true,
  1641 + direction: 'down',
  1642 + initValue: [],
  1643 + toolbar: {
  1644 + show: true,
  1645 + list: ['ALL', 'REVERSE', 'CLEAR']
  1646 + },
  1647 + height: '400px',
  1648 + tree: {
  1649 + show: true,
  1650 + showFolderIcon: true,
  1651 + showLine: true,
  1652 + strict: true,
  1653 + //间距
  1654 + indent: 20,
  1655 + },
  1656 + data: bizTree,
  1657 + on: function (data) {
  1658 + }
  1659 + }, xmSelectParams));
  1660 + } else {
1678 layer.msg('获取业务失败', {icon: 2}); 1661 layer.msg('获取业务失败', {icon: 2});
1679 } 1662 }
1680 - },); 1663 + }).error(function () {
  1664 + layer.msg('获取业务失败', {icon: 2});
  1665 + })
1681 }, 1666 },
1682 getTingyunToken: function () { 1667 getTingyunToken: function () {
1683 var token = ''; 1668 var token = '';
@@ -1698,6 +1683,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1698,6 +1683,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1698 let resp = layer.loadConfig('config.tingyun'); 1683 let resp = layer.loadConfig('config.tingyun');
1699 var api_key = resp.api_key; 1684 var api_key = resp.api_key;
1700 var secret_key = resp.secret_key; 1685 var secret_key = resp.secret_key;
  1686 +
1701 var timestamp = Date.now(); 1687 var timestamp = Date.now();
1702 var auth = md5(`api_key=${api_key}&secret_key=${secret_key}&timestamp=${timestamp}`); 1688 var auth = md5(`api_key=${api_key}&secret_key=${secret_key}&timestamp=${timestamp}`);
1703 1689
@@ -1747,23 +1733,21 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1747,23 +1733,21 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1747 var err = null; 1733 var err = null;
1748 do { 1734 do {
1749 try { 1735 try {
1750 - $.ajax(Object.assign({ 1736 + admin.req(Object.assign({
1751 url: '', 1737 url: '',
1752 headers: { 1738 headers: {
1753 Authorization: token 1739 Authorization: token
1754 }, 1740 },
1755 - async: false,  
1756 - success(response) {  
1757 - res = response;  
1758 - if (response && response.code.toString().startsWith('401')) {  
1759 - throw new Error();  
1760 - }  
1761 - },  
1762 - error(error) {  
1763 - err = error; 1741 + async: false
  1742 + }, ajaxParams)).done(function (response) {
  1743 + res = response;
  1744 + if (response && response.code.toString().startsWith('401')) {
1764 throw new Error(); 1745 throw new Error();
1765 } 1746 }
1766 - }, ajaxParams)); 1747 + }).error(function (error) {
  1748 + err = error;
  1749 + throw new Error();
  1750 + });
1767 } catch (e) { 1751 } catch (e) {
1768 failCount--; 1752 failCount--;
1769 if (failCount) { 1753 if (failCount) {
@@ -1827,14 +1811,12 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1827,14 +1811,12 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1827 admin.req({ 1811 admin.req({
1828 url: this.domainName + '/api-web/manage/resource/getShowType?resId=' + resId + '&username=' + username, 1812 url: this.domainName + '/api-web/manage/resource/getShowType?resId=' + resId + '&username=' + username,
1829 async: false, 1813 async: false,
1830 - success: function (response) {  
1831 - if (response && response.success) {  
1832 - value = response.str;  
1833 - }  
1834 - },  
1835 - error: function () {  
1836 - layer.msg('获取用户权限失败', {icon: 2}); 1814 + }).done(function (response) {
  1815 + if (response && response.success) {
  1816 + value = response.str;
1837 } 1817 }
  1818 + }).error(function () {
  1819 + layer.msg('获取用户权限失败', {icon: 2});
1838 }); 1820 });
1839 return value; 1821 return value;
1840 }, 1822 },
@@ -2126,7 +2108,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -2126,7 +2108,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
2126 } 2108 }
2127 2109
2128 // 表单验证 2110 // 表单验证
2129 - if(form){ 2111 + if (form) {
2130 form.verify({ 2112 form.verify({
2131 json: function (d) { 2113 json: function (d) {
2132 try { 2114 try {
@@ -2139,6 +2121,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -2139,6 +2121,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
2139 } 2121 }
2140 }); 2122 });
2141 } 2123 }
  2124 +
2142 //对外暴露的接口 2125 //对外暴露的接口
2143 exports('common', obj); 2126 exports('common', obj);
2144 }); 2127 });