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-11 16:04:39 +08:00
parent 361c3db5f3
commit 2587fe7fa3
22 changed files with 6699 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
View File

@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Http;
using Microsoft.CodeAnalysis;
using HT.Cloud.Code;
using Quartz;
namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
@ -83,15 +84,16 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
return Content(con);
}
[IgnoreAntiforgeryToken]
public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval, string GroupName)
public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval)
{
//string page = Request.Query["page"].ToString();
//string limit = Request.Query["limit"].ToString();
//var page = Gettime(asyncparam.page.ToString());
//var limit = Gettime(asyncparam.limit.ToString());
var systemName = "制粉系统";
var startTime = Gettime(StartTime);
var endTime = Gettime(EndTime);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, GroupName);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemName);
//var con = JsonConvert.SerializeObject(data);
return Content(data);
}
@ -100,8 +102,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var data = await _historyReportService.GetReportFirstHead();
var systemName = "制粉系统";
var data = await _historyReportService.GetReportFirstHead(systemName);
return Content(data);
}
[HttpGet]
@ -109,8 +111,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var data = await _historyReportService.GetReportSecondHead();
var systemName = "制粉系统";
var data = await _historyReportService.GetReportSecondHead(systemName);
return Content(data);
}
[HttpPost]

12
HT.Cloud.Web/Areas/ReportManage/Views/HistoryReport/Index.cshtml
View File

@ -46,7 +46,7 @@
<form class="layui-form" style="height:30px;" id="formPreviewForm">
<div id="grid_2" class="layui-form-item layui-row grid active" data-id="grid_2"
data-tag="grid" data-index="0" style="height:100%">
<div class="layui-col-md2 widget-col-list column2" data-index="3" data-parentindex="0">
@* <div class="layui-col-md2 widget-col-list column2" data-index="3" data-parentindex="0">
<div id="select_Group" class="layui-form-item active" data-id="select_4" data-tag="select"
data-index="0">
<label class="layui-form-label layui-form-required" style="width: 100px;">
@ -58,8 +58,8 @@
</select>
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column0" data-index="0" data-parentindex="0">
</div>*@
<div class="layui-col-md3 widget-col-list column0" data-index="0" data-parentindex="0">
<div id="ReStartTime" class="layui-form-item active" data-id="ReStartTime"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
@ -71,7 +71,7 @@
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column1" data-index="1" data-parentindex="0">
<div class="layui-col-md3 widget-col-list column1" data-index="1" data-parentindex="0">
<div id="ReEndTime" class="layui-form-item active" data-id="ReEndTime"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
@ -830,7 +830,7 @@
showLoading();
var datetimestart = $('#dateReStartTime')[0].value;
var datetimeend = $('#dateReEndTime')[0].value;
var groupname = $('[name="selectGroup"]')[0].value;
//var groupname = $('[name="selectGroup"]')[0].value;
var timeInterval = 0;
switch ($('[name="selectint"]')[0].value) {
case "onesec":
@ -955,7 +955,7 @@
id: 'result',
height: 'full-140',
url: '/ReportManage/HistoryReport/GetReportNewPage',
where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "GroupName": groupname },
where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval/*, "GroupName": groupname */},
page: true,
limit: 13,
//even: true,