cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史趋势添加色彩数组，工艺参数趋势轴修改

Browse Source
This commit is contained in:
dell
2023-08-25 17:30:45 +08:00
parent 8b307e203b
commit 28b59aa70e
6 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HT.Cloud.Service/ChartsManage/RtTechChartsService.cs
View File

@ -120,7 +120,7 @@ namespace HT.Cloud.Service.ChartsManage
tagName_list.Add(tagNameTxt);
result_list.Add(new List<ChartData>());
}
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtchartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
for (int i = 0; i < 3; i++)
{
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);

8
HT.Cloud.Service/ReportManage/HistoryAlarmService.cs
View File

@ -138,13 +138,13 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetAlarmRecordQuick(string HATYPE, string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().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<string> GetAlarmRecordQuickDesc(string hhour, string systemName)
{
int Hhour = int.Parse(hhour);
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().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);

9
HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml
View File

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

9
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml
View File

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

39
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index.cshtml
View File

@ -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 @@
<body style="height:100%">
<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>
<ul class="layui-tab-title">
@*<ul class="layui-tab-title">
<li class="layui-this" lay-id="TechCharts">重要数据趋势</li>
<li lay-id="MoreCharts">其他数据趋势</li>
</ul>
<div class="layui-tab-content" style="height:90%">
<div class="layui-tab-item layui-show" style="height:100%"></div>
<div class="layui-tab-item" style="height:100%"></div>
</div>
</div>*@
<div class="layui-fluid" style="padding:0 0px;height:100%">
<div class="layui-row layui-col-space5" style="height:100%">
<div class="layui-col-md2 layui-col-xs3" style="height:100%;padding-right:12px;">

2
HT.Cloud.Web/appsettings.json
View File

@ -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": {