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

…eb into master-500-dev

@@ -61,24 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
                     {type: 'numbers', title: '序号', align: 'center'}
                     {type: 'numbers', title: '序号', align: 'center'}
                     , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
                     , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
                     , {
                     , {
-                        field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '20%',
+                        field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%',
                         templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
                         templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
                     }
                     }
                     // , {field: 'kpiName', title: '指标', align: 'left'}
                     // , {field: 'kpiName', title: '指标', align: 'left'}
-                    , {field: 'flag', title: '标识', align: 'center', width: '10%'}
+                    , {field: 'flag', title: '标识', align: 'center', width: '15%'}
                     , {
                     , {
-                        field: 'typeName', title: '说明', align: 'left',
-                        templet: function (d) {
-                            var str = '单指标过滤：';
-                            if (d.kpiId == '') {
-                                str = '多指标过滤：';
-                            }
-                            if (d.subFlag.indexOf('--') != -1) {
-                                return '<div><span style="color: grey;">' + str + '</span><span>' + d.kpiName + '</span></div>'
-                            } else {
-                                return '<div><span style="color: grey;">' + str + '</span><span>' + d.kpiName + '：' + d.subFlag + '</span></div>'
-                            }
-                        }
+                        field: 'typeName', title: '说明', align: 'left'
                     }
                     }
                     , {
                     , {
                         title: '操作', align: 'center', width: '5%',
                         title: '操作', align: 'center', width: '5%',

@@ -199,7 +199,12 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
                     if(type==1 || type==2 ||type==3 ||type==4 ||type==5 ||type==6){
                     if(type==1 || type==2 ||type==3 ||type==4 ||type==5 ||type==6){
                         $('.layui-layer-btn0').show();
                         $('.layui-layer-btn0').show();
                     }else{
                     }else{
-                        $('.layui-layer-btn0').hide();
+                        //lsq 新增时有保存按钮 2022-08-28
+                        if(id){
+                            $('.layui-layer-btn0').hide();
+                        }else{
+                            $('.layui-layer-btn0').show();
+                        }
                     }
                     }
                     var selectdata = menuTable.options.data;
                     var selectdata = menuTable.options.data;
                     parentSelect = xmSelect.render({
                     parentSelect = xmSelect.render({

@@ -493,6 +493,9 @@ layui.define(['common', 'sessions', 'commonDetail', 'mxClient', 'cascader'], fun
             admin.req({
             admin.req({
                 url: common.domainName + '/api-web/mxgraph/getPage'
                 url: common.domainName + '/api-web/mxgraph/getPage'
                 , type: "get"
                 , type: "get"
+                , data: {
+                    isDefault:1
+                }
                 , done: function (data) {
                 , done: function (data) {
                     var topolist = data.data;
                     var topolist = data.data;
                     if (topolist != null && topolist.length > 0) {
                     if (topolist != null && topolist.length > 0) {
@@ -714,7 +717,7 @@ layui.define(['common', 'sessions', 'commonDetail', 'mxClient', 'cascader'], fun
 
 
         //拓扑树组件渲染
         //拓扑树组件渲染
         $.ajax({
         $.ajax({
-            url: common.domainName + '/api-web/mxgraph/getPageByTree?access_token=' + accessToken,
+            url: common.domainName + '/api-web/mxgraph/getPageByTree?isDefault=1&access_token=' + accessToken,
             type: 'get',
             type: 'get',
             success: function (res) {
             success: function (res) {
                 if (res && res.data) {
                 if (res && res.data) {

@@ -651,7 +651,8 @@ layui.extend({
                     console.log(`（${tryIndex}）链接失败，重试中....`)
                     console.log(`（${tryIndex}）链接失败，重试中....`)
                     connectFlg = false;
                     connectFlg = false;
                     if (location.hash.indexOf('#/user/login') == -1) {
                     if (location.hash.indexOf('#/user/login') == -1) {
-                        // 调用测试接口，出现过期则会跳转到登录页面
+                        //lsq 注释掉多无提示框 2022-08-28
+                       /* // 调用测试接口，出现过期则会跳转到登录页面
                         try {
                         try {
 
 
                             $.ajax({
                             $.ajax({
@@ -675,7 +676,7 @@ layui.extend({
                             tryIndex = 1;
                             tryIndex = 1;
                             // 服务异常：服务重启，网络问题等不可访问等因素
                             // 服务异常：服务重启，网络问题等不可访问等因素
                             tryFunc();
                             tryFunc();
-                        }
+                        }*/
                     } else {
                     } else {
                         tryIndex = 1;
                         tryIndex = 1;
                         tryFunc();
                         tryFunc();