monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ab6f9ca950118e3f42bdf09b11b956a1aaa28333 2 parents 6ceda672 9ee7b79d

Merge branch 'master-V32-XuHaoJie' into 'master' 

通用-华为云，阿里云详情页暂时不能点、收藏夹暂时解决报错问题



See merge request !8
Inline Side-by-side
Showing 3 changed files with 42 additions and 25 deletions
@@ -2610,6 +2610,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2610,6 +2610,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2610 if(resType == 'STORAGE_SHARE' && (provider == 'H3C' || provider == 'HDS')){ 2610 if(resType == 'STORAGE_SHARE' && (provider == 'H3C' || provider == 'HDS')){
2611 return; 2611 return;
2612 } 2612 }
  2613 + // 阿里云，华为云不能点击
  2614 + if(resType == 'ALI_CLOUD_PLAT' || resType == 'HUAWEI_CLOUD_PLAT'){
  2615 + return ;
  2616 + }
2613 var nameClickLoading = layer.load(2); 2617 var nameClickLoading = layer.load(2);
2614 var resId = $(this).data("zymc"); 2618 var resId = $(this).data("zymc");
2615 var name = $(this).data("name"); 2619 var name = $(this).data("name");
@@ -69,21 +69,23 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -69,21 +69,23 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
69 var favoriteId = $("#favorites_parentId").val(); 69 var favoriteId = $("#favorites_parentId").val();
70 var resIds = []; 70 var resIds = [];
71 71
  72 + var param={
  73 + favId: favoriteId,
  74 + resName: $("#keyword_id").val(),
  75 + resType: $("#fav_reslist_restype").val(),
  76 + busId: $("#fav_reslist_resListBizTypes").val(),
  77 + resHealth: $("#fav_reslist_resStatus").val(),
  78 + page: -1,
  79 + limit: 20
  80 + }
72 //获取所有资源id 81 //获取所有资源id
73 var oldResIdList = []; 82 var oldResIdList = [];
74 admin.req({ 83 admin.req({
75 - url: common.domainName + '/api-web/favorites/res/list', 84 + url: common.domainName + '/api-web/favorites/res/list?access_token='+accessToken,
76 async: false, 85 async: false,
77 - data: {  
78 - access_token: accessToken,  
79 - favId: favoriteId,  
80 - resName: $("#keyword_id").val(),  
81 - resType: $("#fav_reslist_restype").val(),  
82 - busId: $("#fav_reslist_resListBizTypes").val(),  
83 - resHealth: $("#fav_reslist_resStatus").val(),  
84 - page: -1,  
85 - limit: 20  
86 - }, 86 + type:'post',
  87 + data: JSON.stringify(param),
  88 + contentType: "application/json;charset=UTF-8",
87 error: function () { 89 error: function () {
88 layer.close(loading); 90 layer.close(loading);
89 } 91 }
@@ -337,10 +339,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -337,10 +339,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
337 templet: '<div><span data-fav-zymc="{{ d.resId }}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>' 339 templet: '<div><span data-fav-zymc="{{ d.resId }}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
338 } 340 }
339 , {field: 'ip', title: 'IP地址', minWidth: 150, align: 'center', sort: true} 341 , {field: 'ip', title: 'IP地址', minWidth: 150, align: 'center', sort: true}
340 - , {field: 'adminName', title: '负责人', minWidth: 100, align: 'center', sort: true} 342 + , {field: 'resAdminMaster', title: '负责人', minWidth: 100, align: 'center', sort: true}
341 , {field: 'resTypeName', title: '资源类型', minWidth: 150, align: 'center', sort: true} 343 , {field: 'resTypeName', title: '资源类型', minWidth: 150, align: 'center', sort: true}
342 , {field: 'health', title: '健康状态', minWidth: 100, align: 'center', sort: true, templet: '#reshealthTpl'} 344 , {field: 'health', title: '健康状态', minWidth: 100, align: 'center', sort: true, templet: '#reshealthTpl'}
343 - , {field: 'state', title: '连接状态', minWidth: 100, align: 'center', templet: '#ljztresListTpl'} 345 + , {field: 'linkState', title: '连接状态', minWidth: 100, align: 'center', templet: '#ljztresListTpl'}
344 ]; 346 ];
345 } 347 }
346 favoriteResourceListTable = table.render({ 348 favoriteResourceListTable = table.render({
@@ -348,7 +350,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -348,7 +350,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
348 id: 'favoriteListTable' 350 id: 'favoriteListTable'
349 ,toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板 351 ,toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板
350 , defaultToolbar: ['filter'] 352 , defaultToolbar: ['filter']
351 - , url: common.domainName + '/api-web/favorites/res/list' 353 + , url: common.domainName + '/api-web/favorites/res/noList'
352 , where: { 354 , where: {
353 access_token: accessToken, 355 access_token: accessToken,
354 favId: favId, 356 favId: favId,
@@ -915,19 +915,30 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -915,19 +915,30 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
915 , limits: [150, 200, 300] 915 , limits: [150, 200, 300]
916 , cols: [cols] 916 , cols: [cols]
917 , done: function (res, curr, count) { 917 , done: function (res, curr, count) {
918 - // 共享设备，厂商是H3C、HDS的设备不让点击并且提示暂无监控信息  
919 - var $hsc_=$('span[data-restype="STORAGE_SHARE"][data-provider="H3C"]');  
920 - $.each($hsc_,function (i,v) {  
921 - $(this).css("color","#666");  
922 - $(this).css("text-decoration","none");  
923 - $(this).attr("lay-tips","未监控到数据"); 918 + //更改样式
  919 + function noClick($that) {
  920 + $that.css("color", "#666");
  921 + $that.css("text-decoration", "none");
  922 + $that.attr("lay-tips", "未监控到数据");
  923 + }
924 924
  925 + // 共享设备，厂商是H3C、HDS的设备不让点击并且提示暂无监控信息
  926 + var $hsc_ = $('span[data-restype="STORAGE_SHARE"][data-provider="H3C"]');
  927 + $.each($hsc_, function (i, v) {
  928 + noClick($(this));
  929 + });
  930 + var $hds = $('span[data-restype="STORAGE_SHARE"][data-provider="HDS"]');
  931 + $.each($hds, function (i, v) {
  932 + noClick($(this));
  933 + });
  934 + //华为云，阿里云不让点击，并且提示暂无监控信息
  935 + var $hds = $('span[data-restype="HUAWEI_CLOUD_PLAT"]');
  936 + $.each($hds, function (i, v) {
  937 + noClick($(this));
925 }); 938 });
926 - var $hds=$('span[data-restype="STORAGE_SHARE"][data-provider="HDS"]');  
927 - $.each($hds,function (i,v) {  
928 - $(this).css("color","#666");  
929 - $(this).css("text-decoration","none");  
930 - $(this).attr("lay-tips","未监控到数据"); 939 + var $hds = $('span[data-restype="ALI_CLOUD_PLAT"]');
  940 + $.each($hds, function (i, v) {
  941 + noClick($(this));
931 }); 942 });
932 943
933 soulTable.render(this) 944 soulTable.render(this)