diff --git a/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs b/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs index aacd768..f511350 100644 --- a/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs +++ b/HT.Cloud.Service/ChartsManage/RtTechChartsService.cs @@ -120,7 +120,7 @@ namespace HT.Cloud.Service.ChartsManage tagName_list.Add(tagNameTxt); result_list.Add(new List()); } - var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver + $"?groupName={groupName}"; + var remoteRtDataServer = _context.AsTenant().QueryableWithAttr().First().remotertdataserver + $"?groupName={groupName}"; for (int i = 0; i < 3; i++) { var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer); diff --git a/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs index 53ff0a5..3b52dc8 100644 --- a/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs +++ b/HT.Cloud.Service/ReportManage/HistoryAlarmService.cs @@ -138,13 +138,13 @@ namespace HT.Cloud.Service.ReportManage public async Task GetAlarmRecordQuick(string HATYPE, string startdt, string enddt, string systemName) { - + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; SugarParameter[] sqlParameters = { new SugarParameter("@HATYPE",HATYPE), new SugarParameter("@Hstartdt",startdt), - new SugarParameter("@Henddt",enddt) - + new SugarParameter("@Henddt",enddt), + new SugarParameter("@HGROUPNAME",groupName) }; var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_Count", sqlParameters); @@ -156,8 +156,10 @@ namespace HT.Cloud.Service.ReportManage public async Task GetAlarmRecordQuickDesc(string hhour, string systemName) { int Hhour = int.Parse(hhour); + var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; SugarParameter[] sqlParameters = { + new SugarParameter("@HGROUPNAME",groupName), new SugarParameter("@Hhour",Hhour) }; var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_History", sqlParameters); diff --git a/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml b/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml index 8bfab0a..9ef5ce3 100644 --- a/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml +++ b/HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml @@ -386,6 +386,9 @@ return arr; } + const CHARTSRGB = ["#8B2252", "#C65911", "#0000EE", "#00F5FF", "#00E5EE", "#27408B", "#FFD700", "#7FFFD4", "#B22222", "#EE7621", "#00C5CD", "#A0522D", "#1E90FF", "#00868B", "#8B4513", "#8B3A3A", "#CD6600", "#CD853F", "#EE7942" + , "#D2691E", "#8B008B", "#FFEC8B", "#8B4513", "#CDC673", "#EEEE00", "#FFA500", "#FFD966"]; + var StaticSelectTagList = new Array(); //获取所有变量组 //async function GetDriverGroupList() { @@ -608,7 +611,7 @@ //var lightwhite = (chardatalist.length) * 100; var color = new Array(); for (var colori = 0; colori < StaticSelectTagList.length; colori++) { - color.push(roundrgb()) + color.push(CHARTSRGB[colori]) } @@ -636,7 +639,7 @@ axisLine: { show: true, lineStyle: { - color: color[ci], + color: CHARTSRGB[ci], width: 3 } }, @@ -667,7 +670,7 @@ axisLine: { show: true, lineStyle: { - color: color[ci], + color: CHARTSRGB[ci], width: 3 } }, diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml index 9b974f4..bcefc28 100644 --- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml @@ -386,6 +386,9 @@ return arr; } + const CHARTSRGB = ["#8B2252", "#C65911", "#0000EE", "#00F5FF", "#00E5EE", "#27408B", "#FFD700", "#7FFFD4", "#B22222", "#EE7621", "#00C5CD", "#A0522D", "#1E90FF", "#00868B", "#8B4513", "#8B3A3A", "#CD6600", "#CD853F", "#EE7942" + , "#D2691E", "#8B008B", "#FFEC8B", "#8B4513", "#CDC673", "#EEEE00", "#FFA500", "#FFD966"]; + var StaticSelectTagList = new Array(); //获取所有变量组 //async function GetDriverGroupList() { @@ -608,7 +611,7 @@ //var lightwhite = (chardatalist.length) * 100; var color = new Array(); for (var colori = 0; colori < StaticSelectTagList.length; colori++) { - color.push(roundrgb()) + color.push(CHARTSRGB[colori]) } @@ -636,7 +639,7 @@ axisLine: { show: true, lineStyle: { - color: color[ci], + color: CHARTSRGB[ci], width: 3 } }, @@ -667,7 +670,7 @@ axisLine: { show: true, lineStyle: { - color: color[ci], + color: CHARTSRGB[ci], width: 3 } }, diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml index 19d8626..2fe734c 100644 --- a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml @@ -548,6 +548,10 @@ var chardatalist = await GetChartsTagValue(); + var maxArr = new Array(); + var minArr = new Array(); + var intervalArr = new Array(); + var unitsrc = new Array(); var unitnames = new Array(); var unitcolor = new Array(); @@ -558,7 +562,22 @@ unitsrc.push(unit_now); unitnames.push(StaticSelectTagList[ddi].UnitType + "(" + StaticSelectTagList[ddi].Units + ")"); unitcolor.push(StaticSelectTagList[ddi].HTRGB); + + + let ydata = chardatalist[ddi].map(x => { return x.value }); + let xdata = chardatalist[ddi].map(x => { return x.name }); + + let maxSrc = Math.max.apply(null, ydata); + let newMax = Math.ceil(maxSrc / 5) * 5; + maxArr.push(newMax); + let minSrc = Math.min.apply(null, ydata); + let newMin = Math.floor(minSrc / 5) * 5 + minArr.push(newMin); + let interval = (newMax - newMin) / 5 + intervalArr.push(interval); + } + else{} } @@ -574,14 +593,14 @@ let ydata = chardatalist[listindex].map(x => { return x.value }); let xdata = chardatalist[listindex].map(x => { return x.name }); debugger; - let maxSrc = Math.max.apply(null, ydata); - let newMax = Math.ceil(maxSrc / 5) * 5; - maxArr.push(newMax); - let minSrc = Math.min.apply(null, ydata); - let newMin = Math.floor(minSrc / 5) * 5 - minArr.push(newMin); - let interval = (newMax - newMin) / 5 - intervalArr.push(interval); + //let maxSrc = Math.max.apply(null, ydata); + //let newMax = Math.ceil(maxSrc / 5) * 5; + //maxArr.push(newMax); + //let minSrc = Math.min.apply(null, ydata); + //let newMin = Math.floor(minSrc / 5) * 5 + //minArr.push(newMin); + //let interval = (newMax - newMin) / 5 + //intervalArr.push(interval); xDataArr.push(xdata); yDataArr.push(ydata); } @@ -946,14 +965,14 @@ -
    + @*
    • 重要数据趋势
    • 其他数据趋势
    -
    + *@
    diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json index 1b9ba17..99849f4 100644 --- a/HT.Cloud.Web/appsettings.json +++ b/HT.Cloud.Web/appsettings.json @@ -33,7 +33,7 @@ { "DBNumber": "1", "DBProvider": "SqlServer", //MySql //Oracle - "DBConnectionString": "Data Source=192.168.110.32;Initial Catalog=HTSCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;" + "DBConnectionString": "Data Source=192.168.110.32;Initial Catalog=HTSCADA202308;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;" } ], "RabbitMq": {