monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8de25ca3a67677c4cef98f1d3e950c30c0c5686f 2 parents 6233b60a 1927cc56

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
@@ -3864,7 +3864,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3864,7 +3864,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3864 if ($.inArray('back:details:trend', checkList) == -1) { 3864 if ($.inArray('back:details:trend', checkList) == -1) {
3865 layer.msg('暂无权限!', {icon: 7, time: 3000}); 3865 layer.msg('暂无权限!', {icon: 7, time: 3000});
3866 }else{ 3866 }else{
3867 - common.openLineChart(kpiName + " " + name, params); 3867 + // Start Wang 2022/2/8 14:28 BUG#273 【性能曲线】测试名称重复
  3868 + // common.openLineChart(kpiName + " " + name, params);
  3869 + common.openLineChart(kpiName, params);
  3870 + // End Wang 2022/2/8 14:29
3868 } 3871 }
3869 break; 3872 break;
3870 case 'n': 3873 case 'n':
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 <!--<module>hg-monitor-web-new</module>--> 20 <!--<module>hg-monitor-web-new</module>-->
21 <module>hg-monitor-web-tj</module> 21 <module>hg-monitor-web-tj</module>
22 <module>hg-monitor-web-zj</module> 22 <module>hg-monitor-web-zj</module>
23 - <module>hg-monitor-web-demo</module>  
24 <module>hg-monitor-web-nx</module> 23 <module>hg-monitor-web-nx</module>
25 </modules> 24 </modules>
26 <properties> 25 <properties>