Merge branch 'master-500-dev-xwx' into 'master-500-dev'

网卡上行速率弹框名称存在null优化



See merge request !449

@@ -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);
                 });
                 });
             });
             });
         },
         },

@@ -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;
                 }
                 }