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

…eb into master-500-dev

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/index.js

@@ -1315,7 +1315,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         trend: true,
                         trend: true,
                         name: (kpiNames&&kpiNames.length>0)?kpiNames[v.componentIndex]:kpiName + ' ' + data.series[v.componentIndex].name  //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
                         name: (kpiNames&&kpiNames.length>0)?kpiNames[v.componentIndex]:kpiName + ' ' + data.series[v.componentIndex].name  //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
                     };
                     };
-                    common.openLineChart(kpiName + ' ' + data.series[v.componentIndex].name, params);
+                    var seriesName= data.series[v.componentIndex].name;
+                    if (data.series[v.componentIndex].name == null ||data.series[v.componentIndex].name == undefined){
+                        seriesName = '';
+                    }
+                    common.openLineChart(kpiName + ' ' + seriesName, params);
                 });
                 });
             });
             });
         },
         },

@@ -245,7 +245,7 @@ layui.extend({
         let path = router.path.join('/')
         let path = router.path.join('/')
         if(pathURL.indexOf('/user/login') != -1){
         if(pathURL.indexOf('/user/login') != -1){
             var loginIndex = 'default';
             var loginIndex = 'default';
-
+            debugger
             let loginSkin = sessionStorage.getItem("loginSkin");
             let loginSkin = sessionStorage.getItem("loginSkin");
             if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
             if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
                 loginIndex = loginSkin;
                 loginIndex = loginSkin;

@@ -185,7 +185,7 @@
     {{#  layui.each(d.list, function(index, item){ }}
     {{#  layui.each(d.list, function(index, item){ }}
     <div class="layui-col-md4" data-restype="{{item.resType}}">
     <div class="layui-col-md4" data-restype="{{item.resType}}">
         <div class="layui-cols-items">
         <div class="layui-cols-items">
-            <div class="layui-card-header">{{ item.resTypeName }}</div>
+            <div class="layui-card-header" style="height: 460px;height: 50px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" lay-tips="{{ item.resTypeName }}">{{ item.resTypeName }}</div>
             <div class="layui-card-body card-main">
             <div class="layui-card-body card-main">
                 <ul>
                 <ul>
                     <li>
                     <li>

@@ -550,7 +550,7 @@ export default {
                         params.docNo = "user";
                         params.docNo = "user";
                         params.type = "user";
                         params.type = "user";
                     }
                     }
-                    if (params.name.length>15){
+                    if (params.name.length>50){
                         proxy.$global.showMsg("文件名称超长！", "warning");
                         proxy.$global.showMsg("文件名称超长！", "warning");
                         return;
                         return;
                     }
                     }
@@ -784,7 +784,7 @@ export default {
                     proxy.$global.showMsg("文件名称不能为空！", "warning");
                     proxy.$global.showMsg("文件名称不能为空！", "warning");
                     return;
                     return;
                 }
                 }
-                if(item.fileName.length>15){
+                if(item.fileName.length>50){
                     proxy.$global.showMsg("文件名称超长！", "warning");
                     proxy.$global.showMsg("文件名称超长！", "warning");
                     return;
                     return;
                 }
                 }