From ac6eeb09ffdec8cc6eb671ee85dd3a8f3b62e39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Sun, 8 Dec 2024 21:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=9B=BE=E8=A1=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AppDayStatController.cs | 10 ++--- .../Controllers/AppMinuteStatController.cs | 11 ++---- .../Controllers/TraceDayStatController.cs | 39 ++++++++++++------- .../Controllers/TraceHourStatController.cs | 38 +++++++++++------- .../Controllers/TraceMinuteStatController.cs | 38 +++++++++++------- .../Views/TraceDayStat/_List_Search.cshtml | 2 +- .../Views/TraceHourStat/_List_Search.cshtml | 7 ++++ .../Views/TraceMinuteStat/_List_Search.cshtml | 7 ++++ 8 files changed, 95 insertions(+), 57 deletions(-) diff --git a/Stardust.Web/Areas/Monitors/Controllers/AppDayStatController.cs b/Stardust.Web/Areas/Monitors/Controllers/AppDayStatController.cs index 5f5a37a3..d0d07356 100644 --- a/Stardust.Web/Areas/Monitors/Controllers/AppDayStatController.cs +++ b/Stardust.Web/Areas/Monitors/Controllers/AppDayStatController.cs @@ -73,12 +73,10 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatDate); - //chart.SetY("调用次数"); - chart.YAxis = new[] { - new { name = "调用次数", type = "value" }, - new { name = "错误数", type = "value" } - }; + chart.SetY(["调用次数", "错误数"], "value"); chart.AddDataZoom(); + chart.Grid.Left = -5; + chart.Grid.Right = -5; chart.AddLine(list2, _.Total, null, true); chart.Add(list2, _.Apis); @@ -89,7 +87,7 @@ protected override IEnumerable Search(Pager p) chart.Add(list2, _.Others); var line = chart.Add(list2, _.Errors); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; chart.SetTooltip(); diff --git a/Stardust.Web/Areas/Monitors/Controllers/AppMinuteStatController.cs b/Stardust.Web/Areas/Monitors/Controllers/AppMinuteStatController.cs index 8c7e0f36..e4bc66b6 100644 --- a/Stardust.Web/Areas/Monitors/Controllers/AppMinuteStatController.cs +++ b/Stardust.Web/Areas/Monitors/Controllers/AppMinuteStatController.cs @@ -69,15 +69,11 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatTime); - //chart.SetY("调用次数"); - chart.YAxis = new[] { - new { name = "调用次数", type = "value" }, - new { name = "错误数", type = "value" } - }; + chart.SetY(["调用次数", "错误数"], "value"); chart.AddLine(list2, _.Total, null, true); var line = chart.Add(list2, _.Errors); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; chart.SetTooltip(); @@ -99,7 +95,7 @@ protected override IEnumerable Search(Pager p) chart.Add(list2, _.MinCost); var line = chart.Add(list2, _.MaxCost); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; chart.SetTooltip(); ViewBag.Charts2 = new[] { chart }; @@ -144,6 +140,7 @@ protected override IEnumerable Search(Pager p) Type = "bar", ["stack"] = "总量", ["label"] = new { show = true, position = "left" }, + ["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }, Data = list2.Select(e => -e.Errors).ToArray(), }); chart.Add(new Series diff --git a/Stardust.Web/Areas/Monitors/Controllers/TraceDayStatController.cs b/Stardust.Web/Areas/Monitors/Controllers/TraceDayStatController.cs index f2598ee9..9eda4653 100644 --- a/Stardust.Web/Areas/Monitors/Controllers/TraceDayStatController.cs +++ b/Stardust.Web/Areas/Monitors/Controllers/TraceDayStatController.cs @@ -56,19 +56,28 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatDate); - //chart.SetY("调用次数"); - chart.YAxis = new[] { - new { name = "调用次数", type = "value" }, - new { name = "错误数", type = "value" } - }; chart.AddDataZoom(); chart.AddLine(list2, _.Total, null, true); - var line = chart.Add(list2, _.Errors); - line["yAxisIndex"] = 1; - //line["lineStyle"] = new { color = "rgba(255, 0, 0, 1)", }; - line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + var idx = 1; + var ys = new List { "调用次数" }; + if (list2.Any(e => e.Errors > 0)) + { + ys.Add("错误数"); + var line = chart.Add(list2, _.Errors); + line.YAxisIndex = idx++; + line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + } + if (list2.Any(e => e.TotalValue > 0)) + { + ys.Add("数值"); + var line = chart.Add(list2, _.TotalValue); + line.YAxisIndex = idx++; + } + + chart.SetY(ys.ToArray(), "value"); + if (ys.Count == 1) chart.Grid.Right = -3; chart.SetTooltip(); ViewBag.Charts = new[] { chart }; } @@ -79,17 +88,17 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatDate); - //chart.SetY("耗时"); - chart.YAxis = new[] { - new { name = "耗时（ms）", type = "value" }, - new { name = "最大耗时（ms）", type = "value" } - }; + chart.SetY(["耗时（ms）", "最大耗时（ms）"], "value", ["{value}ms", "{value}ms"]); + //chart.YAxis = new[] { + // new { name = "耗时（ms）", type = "value" }, + // new { name = "最大耗时（ms）", type = "value" } + //}; chart.AddDataZoom(); chart.AddLine(list2, _.Cost, null, true); chart.Add(list2, _.MinCost); var line = chart.Add(list2, _.MaxCost); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; chart.SetTooltip(); ViewBag.Charts2 = new[] { chart }; diff --git a/Stardust.Web/Areas/Monitors/Controllers/TraceHourStatController.cs b/Stardust.Web/Areas/Monitors/Controllers/TraceHourStatController.cs index 939665c2..58b88f58 100644 --- a/Stardust.Web/Areas/Monitors/Controllers/TraceHourStatController.cs +++ b/Stardust.Web/Areas/Monitors/Controllers/TraceHourStatController.cs @@ -55,18 +55,28 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatTime); - //chart.SetY("调用次数"); - chart.YAxis = new[] { - new { name = "调用次数", type = "value" }, - new { name = "错误数", type = "value" } - }; chart.AddDataZoom(); chart.AddLine(list2, _.Total, null, true); - var line = chart.Add(list2, _.Errors); - line["yAxisIndex"] = 1; - line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + var idx = 1; + var ys = new List { "调用次数" }; + if (list2.Any(e => e.Errors > 0)) + { + ys.Add("错误数"); + var line = chart.Add(list2, _.Errors); + line.YAxisIndex = idx++; + line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + } + if (list2.Any(e => e.TotalValue > 0)) + { + ys.Add("数值"); + var line = chart.Add(list2, _.TotalValue); + line.YAxisIndex = idx++; + } + + chart.SetY(ys.ToArray(), "value"); + if (ys.Count == 1) chart.Grid.Right = -3; chart.SetTooltip(); ViewBag.Charts = new[] { chart }; } @@ -77,17 +87,17 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatTime); - //chart.SetY("耗时"); - chart.YAxis = new[] { - new { name = "耗时（ms）", type = "value" }, - new { name = "最大耗时（ms）", type = "value" } - }; + chart.SetY(["耗时（ms）", "最大耗时（ms）"], "value", ["{value}ms", "{value}ms"]); + //chart.YAxis = new[] { + // new { name = "耗时（ms）", type = "value" }, + // new { name = "最大耗时（ms）", type = "value" } + //}; chart.AddDataZoom(); chart.AddLine(list2, _.Cost, null, true); chart.Add(list2, _.MinCost); var line = chart.Add(list2, _.MaxCost); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; chart.SetTooltip(); ViewBag.Charts2 = new[] { chart }; diff --git a/Stardust.Web/Areas/Monitors/Controllers/TraceMinuteStatController.cs b/Stardust.Web/Areas/Monitors/Controllers/TraceMinuteStatController.cs index 1c52cf39..43f81593 100644 --- a/Stardust.Web/Areas/Monitors/Controllers/TraceMinuteStatController.cs +++ b/Stardust.Web/Areas/Monitors/Controllers/TraceMinuteStatController.cs @@ -56,18 +56,28 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatTime); - //chart.SetY("调用次数"); - chart.YAxis = new[] { - new { name = "调用次数", type = "value" }, - new { name = "错误数", type = "value" } - }; chart.AddDataZoom(); chart.AddLine(list2, _.Total, null, true); - var line = chart.Add(list2, _.Errors); - line["yAxisIndex"] = 1; - line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + var idx = 1; + var ys = new List { "调用次数" }; + if (list2.Any(e => e.Errors > 0)) + { + ys.Add("错误数"); + var line = chart.Add(list2, _.Errors); + line.YAxisIndex = idx++; + line["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", }; + } + if (list2.Any(e => e.TotalValue > 0)) + { + ys.Add("数值"); + var line = chart.Add(list2, _.TotalValue); + line.YAxisIndex = idx++; + } + + chart.SetY(ys.ToArray(), "value"); + if (ys.Count == 1) chart.Grid.Right = -3; chart.SetTooltip(); ViewBag.Charts = new[] { chart }; } @@ -78,17 +88,17 @@ protected override IEnumerable Search(Pager p) Height = 400, }; chart.SetX(list2, _.StatTime); - //chart.SetY("耗时"); - chart.YAxis = new[] { - new { name = "耗时（ms）", type = "value" }, - new { name = "最大耗时（ms）", type = "value" } - }; + chart.SetY(["耗时（ms）", "最大耗时（ms）"], "value", ["{value}ms", "{value}ms"]); + //chart.YAxis = new[] { + // new { name = "耗时（ms）", type = "value" }, + // new { name = "最大耗时（ms）", type = "value" } + //}; chart.AddDataZoom(); chart.AddLine(list2, _.Cost, null, true); chart.Add(list2, _.MinCost); var line = chart.Add(list2, _.MaxCost); - line["yAxisIndex"] = 1; + line.YAxisIndex = 1; chart.SetTooltip(); ViewBag.Charts2 = new[] { chart }; diff --git a/Stardust.Web/Areas/Monitors/Views/TraceDayStat/_List_Search.cshtml b/Stardust.Web/Areas/Monitors/Views/TraceDayStat/_List_Search.cshtml index d105c7e3..7e28638b 100644 --- a/Stardust.Web/Areas/Monitors/Views/TraceDayStat/_List_Search.cshtml +++ b/Stardust.Web/Areas/Monitors/Views/TraceDayStat/_List_Search.cshtml @@ -16,7 +16,7 @@ { var ti = TraceItem.FindById(itemId);
- @ti + @ti
} @if (appId > 0) diff --git a/Stardust.Web/Areas/Monitors/Views/TraceHourStat/_List_Search.cshtml b/Stardust.Web/Areas/Monitors/Views/TraceHourStat/_List_Search.cshtml index 432f719e..663e7a22 100644 --- a/Stardust.Web/Areas/Monitors/Views/TraceHourStat/_List_Search.cshtml +++ b/Stardust.Web/Areas/Monitors/Views/TraceHourStat/_List_Search.cshtml @@ -11,6 +11,13 @@ var appId = page["appId"].ToInt(-1); var itemId = page["itemId"].ToInt(-1); } +@if (itemId > 0) +{ + var ti = TraceItem.FindById(itemId); +
+ @ti +
+} @if (appId > 0) { var app = AppTracer.FindByID(appId); diff --git a/Stardust.Web/Areas/Monitors/Views/TraceMinuteStat/_List_Search.cshtml b/Stardust.Web/Areas/Monitors/Views/TraceMinuteStat/_List_Search.cshtml index 432f719e..663e7a22 100644 --- a/Stardust.Web/Areas/Monitors/Views/TraceMinuteStat/_List_Search.cshtml +++ b/Stardust.Web/Areas/Monitors/Views/TraceMinuteStat/_List_Search.cshtml @@ -11,6 +11,13 @@ var appId = page["appId"].ToInt(-1); var itemId = page["itemId"].ToInt(-1); } +@if (itemId > 0) +{ + var ti = TraceItem.FindById(itemId); +
+ @ti +
+} @if (appId > 0) { var app = AppTracer.FindByID(appId);