Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -651,17 +651,17 @@ layui.extend({
                     connectFlg = false;
                     connectFlg = false;
                     if (location.hash.indexOf('#/user/login') == -1) {
                     if (location.hash.indexOf('#/user/login') == -1) {
                         //lsq 注释掉多无提示框 2022-08-28
                         //lsq 注释掉多无提示框 2022-08-28
-                       /* // 调用测试接口，出现过期则会跳转到登录页面
+                        // 调用测试接口，出现过期则会跳转到登录页面
                         try {
                         try {
-
                             $.ajax({
                             $.ajax({
                                 url: domainName + "/api-web/common/test",
                                 url: domainName + "/api-web/common/test",
                                 type: "get",
                                 type: "get",
                                 async: false,
                                 async: false,
                                 success: function (res) {
                                 success: function (res) {
-                                    $('head').append('<style id="ew-tree-table-css">' + res + '</style>');
+                                     console.log("检查登录状态：",'正常')
                                 },
                                 },
                                 error:(error)=>{
                                 error:(error)=>{
+                                    console.error("检查登录状态：",error)
                                     if(error.status === 401){
                                     if(error.status === 401){
                                         window.top.location.reload();
                                         window.top.location.reload();
                                         return;
                                         return;
@@ -675,7 +675,7 @@ layui.extend({
                             tryIndex = 1;
                             tryIndex = 1;
                             // 服务异常：服务重启，网络问题等不可访问等因素
                             // 服务异常：服务重启，网络问题等不可访问等因素
                             tryFunc();
                             tryFunc();
-                        }*/
+                        }
                     } else {
                     } else {
                         tryIndex = 1;
                         tryIndex = 1;
                         tryFunc();
                         tryFunc();

@@ -778,8 +778,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                             <span lay-tips="{{ d.resName }}" style="margin:0 5px;max-width: 160px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" data-isBus="{{d.isBus}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
                             <span lay-tips="{{ d.resName }}" style="margin:0 5px;max-width: 160px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" data-isBus="{{d.isBus}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
                             data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}" >{{d.resName}}</span>
                             data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}" >{{d.resName}}</span>
                          {{# }  }}
                          {{# }  }}
-                        <a class="layui-icon  reslist-view-topo hide" data-resid="{{d.resId}}" lay-tips="查看资源拓扑"><i class="iconfont" style="font-size: 20px;
-    color: #FEB61E;"></i></a>
+                        <a class="layui-icon  reslist-view-topo hide" data-resid="{{d.resId}}" lay-tips="查看资源拓扑"></a>
                         </div>
                         </div>
                     </div>
                     </div>
                     `
                     `