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-11-06 21:26:55 +08:00
parent b94dc66092
commit 17b4e899ff
36 changed files with 3491 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
View File

@ -103,21 +103,66 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
return (dt.ToString("yyyy/MM/dd HH:mm:ss"));
}
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
// public short TagID { get; set; }
// public string Description { get; set; }
// public string Units { get; set; }
//}
public string Gettime_(string longtime)
{
long jsTimeStamp = long.Parse(longtime);
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
DateTime dt = startTime.AddMilliseconds(jsTimeStamp);
return (dt.ToString("yyyy-MM-dd HH:mm:ss"));
}
//public class SubsysytemNameList
//{
// public string Lable { get; set; }
// public string Value { get; set; }
//}
public class ChartSubsysytemName
[HttpPost]
public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_ACC_Params.StartTime);
var EndTime = Gettime(alarm_ACC_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_Pie_Params.StartTime);
var EndTime = Gettime(alarm_Pie_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
return Content(data);
}
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
// public short TagID { get; set; }
// public string Description { get; set; }
// public string Units { get; set; }
//}
//public class SubsysytemNameList
//{
// public string Lable { get; set; }
// public string Value { get; set; }
//}
public class ChartSubsysytemName
{
public string SubsysytemName { get; set; }
}
@ -153,5 +198,22 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public string Hhour { get; set; }
}
public class Alarm_ACC_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Histogram_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Pie_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
}
}

236
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs Normal file
View File

@ -0,0 +1,236 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using HT.Cloud.Code;
using HT.Cloud.Domain.ChartsManage;
using HT.Cloud.Service;
using Microsoft.AspNetCore.Authorization;
using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using Serenity.Services;
namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
/// <summary>
/// 创 建：cdl
/// 日 期：2023-02-23 11:10
/// 描 述：历史趋势控制器类
/// </summary>
[Area("PenMeiReportManage")]
public class PenMeiHistoryAlarmNewController : BaseController
{
public HistoryAlarmService _historyAlarmService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
var data = await _historyAlarmService.GetDriverGroupList();
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecord(Alarm_Params charts_Params)
{
string systemName = "喷煤系统";
short TagID = short.Parse(charts_Params.TagID);
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuick(Alarm_Quick_Params alarm_Quick_Params)
{
string systemName = "喷煤系统";
var Alarmtype = alarm_Quick_Params.Alarmtype;
var StartTime = Gettime(alarm_Quick_Params.StartTime);
var EndTime = Gettime(alarm_Quick_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuickDesc(Alarm_Quick_Desc_Params alarm_Quick_Desc_Params)
{
string systemName = "喷煤系统";
var hhour = alarm_Quick_Desc_Params.Hhour;
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmSubSystem(SubSystem_Params subSystem_Params)
{
string systemName = "喷煤系统";
var AlarmName = subSystem_Params.AlarmName;
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemName);
return Content(data);
}
public string Gettime(string longtime)
{
long jsTimeStamp = long.Parse(longtime);
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
DateTime dt = startTime.AddMilliseconds(jsTimeStamp);
return (dt.ToString("yyyy/MM/dd HH:mm:ss"));
}
public string Gettime_(string longtime)
{
long jsTimeStamp = long.Parse(longtime);
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
DateTime dt = startTime.AddMilliseconds(jsTimeStamp);
return (dt.ToString("yyyy-MM-dd HH:mm:ss"));
}
[HttpPost]
public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_ACC_Params.StartTime);
var EndTime = Gettime(alarm_ACC_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_Pie_Params.StartTime);
var EndTime = Gettime(alarm_Pie_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
return Content(data);
}
/*
* 一
* 1、重绘管理系统所有趋势曲线，曲线的数据点上不在绘制图形圆点。
* 2、实时趋势开放拖动和JS代码添加可向前加载数据集的动态方法。
* 二
* 1、后台服务在获取实时趋势初始化数据时进行向前的数据获取，为初始数据集添加一段历史数据。
* 2、参加公司组织的拍摄技术培训。
* 三
* 1、使用异步和函数回调来执行历史数据查询，在实时数据获取后进行时间戳对其，避免出现重复时间和漏掉时间。
* 2、报警分析柱图优化，单日柱状图从堆叠图修改为平铺柱状图。
* 四
* 1、柱状图添加工具条，可支持堆叠图、平铺图、折线图切换显示，并支持下载功能。
* 2、添加图表联动功能，增加柱状图和饼图的点击事件，在柱状区域或饼状区域内点击可跳转至该报警信息的详细查询。
* 五
* 1、
* 2、整理管理系统以前相关的设计、宣传素材，编写管理系统演示用ppt。
*/
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
// public short TagID { get; set; }
// public string Description { get; set; }
// public string Units { get; set; }
//}
//public class SubsysytemNameList
//{
// public string Lable { get; set; }
// public string Value { get; set; }
//}
public class ChartSubsysytemName
{
public string SubsysytemName { get; set; }
}
//public class HDATETIMEVALUE
//{
// public String HDATETIME { get; set; }
// public decimal VALUE { get; set; }
//}
//public class ChartData
//{
// public decimal value { get; set; }
// public String name { get; set; }
//}
public class SubSystem_Params
{
public string AlarmName { get; set; }
}
public class Alarm_Params
{
public string TagID { get; set; }
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Quick_Params
{
public string Alarmtype { get; set; }
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Quick_Desc_Params
{
public string Hhour { get; set; }
}
public class Alarm_ACC_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Histogram_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Pie_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
}
}

4
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
View File

@ -15,7 +15,9 @@ using HT.Cloud.Code;
namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
{
[Area("PenMeiReportManage")]
public class PenMeiHistoryReportController : BaseController
[HandlerLogin(needLogin: false)]
[HandlerAuthorize(needAuth: false)]
public class PenMeiHistoryReportController : BaseController
{
public HistoryReportService _historyReportService { get; set; }
/// <summary>

577
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarm/Index.cshtml
View File

@ -701,6 +701,60 @@
value: getFormatDateone(endtime),
});
});
lay('#dateReStartTimeSD').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(starttime),
});
});
lay('#dateReEndTimeSD').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(endtime),
});
});
lay('#dateReStartTimeZhu').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(starttime),
});
});
lay('#dateReEndTimeZhu').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(endtime),
});
});
lay('#dateReStartTimeBing').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(starttime),
});
});
lay('#dateReEndTimeBing').each(function () {
laydate.render({
elem: this,
trigger: 'click',
format: "yyyy-MM-dd HH:mm:ss",
//value: "2023-02-23 13:56:25",
value: getFormatDateone(endtime),
});
});
});
function getFormatDate(date) {
let year = date.getFullYear();
@ -1157,8 +1211,239 @@
return result;
}
ShowSDChart = async function() {
var alarmlist = new Array();
debugger;
let datetimestart = $('#dateReStartTimeSD')[0].value;
let datetimeend = $('#dateReEndTimeSD')[0].value;
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let result;
debugger;
myajax = await $.ajax({
url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmACC",
type: "Post",
//dataType: "json",
data: datapa,
success: function (redata) {
debugger;
result = JSON.parse(redata);
var myChart = echarts.init(document.getElementById('resultsandian'), 'walden');
myChart.dispose();
myChart = echarts.init(document.getElementById('resultsandian'), 'walden');
myChart.hideLoading();
myChart.showLoading();
var sdata = [];
var ldata = [];
// for (var i = 0; i < result.length; i++) {
for (var i = 0; i < 10; i++) {
sdata.push({
name: result[i].Description,
data:[result[i].hcount, result[i].hztime],
symbolSize: 50,
type:'scatter'
});
ldata.push(result[i].Description);
}
var option = {
xAxis: {
name: '报警次数',
nameGap: 16,
nameTextStyle: {
fontSize: 16
},
//max: 31,
splitLine: {
show: true
}
},
yAxis: {
name: '报警总时长',
nameLocation: 'end',
nameGap: 20,
nameTextStyle: {
fontSize: 16
},
splitLine: {
show: true
}
},
legend: {
data:ldata
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross'
}
},
series:sdata,
// series: [{
// SymbolSize:20,
// data:data,
// type:'scatter',
// },
//]
}
myChart.hideLoading();
myChart.setOption(JSON.parse(JSON.stringify(option)));
}
});
}
ShowZhuChart = async function () {
var alarmlist = new Array();
debugger;
let datetimestart = $('#dateReStartTimeZhu')[0].value;
let datetimeend = $('#dateReEndTimeZhu')[0].value;
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let result;
debugger;
myajax = await $.ajax({
url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmHistogram",
type: "Post",
//dataType: "json",
data: datapa,
success: function (redata) {
debugger;
var data = JSON.parse(redata);
var myChart = echarts.init(document.getElementById('resultzhu'));
myChart.dispose();
myChart = echarts.init(document.getElementById('resultzhu'));
myChart.hideLoading();
myChart.showLoading();
let date = []; //x轴日期
let lenged = []; //series的个数
let s = [];
data.map((item) => {
date.push(item['HDATE']);
lenged.push(item['Description']);
});
debugger;
date = [...new Set(date)]; //去重
lenged = [...new Set(lenged)];
console.log(date, lenged);
let series = [];
lenged.map((item) => {
//生成 series
let obj = {
name: item,
type: 'bar',
stack: 'As',
emphasis: {
focus: 'series'
},
data: []
};
series.push(obj);
});
data.map((item) => {
//对series 的data进行处理
series.map((item1) => {
if (item1.name == item['Description'] && date.indexOf(item['HDATE']) > -1) {
item1.data[date.indexOf(item['HDATE'])] = item['hztime'];
}
});
});
var option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
legend: {},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: [
{
type: 'category',
data: date
}
],
yAxis: [
{
type: 'value'
}
],
series: series
};
myChart.hideLoading();
option && myChart.setOption(option);
// myChart.setOption(JSON.parse(JSON.stringify(option)));
}
});
}
ShowBingChart = async function () {
var alarmlist = new Array();
debugger;
let datetimestart = $('#dateReStartTimeBing')[0].value;
let datetimeend = $('#dateReEndTimeBing')[0].value;
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let result;
debugger;
myajax = await $.ajax({
url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAlarmPie",
type: "Post",
//dataType: "json",
data: datapa,
success: function (redata) {
debugger;
result = JSON.parse(redata);
var myChart = echarts.init(document.getElementById('resultbing'), 'walden');
myChart.dispose();
myChart = echarts.init(document.getElementById('resultbing'), 'walden');
myChart.hideLoading();
myChart.showLoading();
var data = [];
for (var i = 0; i < result.length; i++) {
data.push({ value: result[i].Hpercent, name: result[i].Description + "\n" + result[i].Hpercent + "%" });
}
debugger;
var option = {
title: {
text: '报警时长占比统计',
// subtext: '纯属虚构',
left: 'center'
},
series:[
{
type: 'pie',
data:data
}
]
}
myChart.hideLoading();
myChart.setOption(JSON.parse(JSON.stringify(option)));
}
});
}
});
@ -1166,15 +1451,297 @@
</script>
<html style="height:100%">
<body style="height:100%">
<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>
<div class="layui-tab layui-tab-card" lay-filter="Chang" style="height:100%" id="tab1">
@*<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>*@
<ul class="layui-tab-title">
<li class="layui-this" lay-id ="11">报警汇总</li>
<li class="layui-this" lay-id="sanding">散点图</li>
<li lay-id="zhu">柱状图</li>
<li lay-id="bing">饼图图</li>
<li lay-id ="11">报警汇总</li>
<li lay-id ="22">报警查询</li>
</ul>
<div class="layui-tab-content" style="height:90%">
<div class="layui-tab-item layui-show" style="height:100%">
<div class="layui-fluid" style="padding:0 0px;height:100%">
<div class="layui-row layui-col-space5" style="height:100%">
<div class="layui-col-md12 layui-col-xs12" style="height:100%">
<form class="layui-form" style="height:auto;" id="formPreviewFormSD">
<div id="grid_31" class="layui-form-item layui-row grid active" data-id="grid_31"
data-tag="grid" data-index="0">
<div class="layui-col-md3 widget-col-list column1" data-index="0" data-parentindex="0">
<div id="ReStartTimeSD" class="layui-form-item active" data-id="ReStartTimeSD"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
开始时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReStartTimeSD" name="ndateReStartTimeSD" lay-verify="required"
class="layui-input icon-date widget-date " style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md3 widget-col-list column2" data-index="2" data-parentindex="0">
<div id="ReEndTimeSD" class="layui-form-item active" data-id="ReEndTimeSD"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReEndTimeSD" name="ndateReEndTimeSD" lay-verify="required" class="layui-input icon-date widget-date "
style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="2" data-parentindex="0" id="recentMdSD">
<div id="select_11SD" class="layui-form-item active" data-id="select_11SD" data-tag="select"
data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
速查范围:
</label>
<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
<select name="selectquick" lay-filter="quickTime" lay-verify="required" id="selectRecentQuickSD">
<option value="onlyOneHour" selected="">
一小时内
</option>
<option value="onlyThreeHour">
三小时内
</option>
<option value="onlyEightHour">
八小时内
</option>
<option value="onlyTwelveHour">
十二小时内
</option>
<option value="onlyOneDay">
一天内
</option>
</select>
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="4" data-parentindex="0">
<div id="bottom_51SD" class="layui-form-item active" data-id="bottom_51SD" data-tag="bottom"
data-index="0">
<div class="layui-input-block" style="margin-left: 30px;">
<button id="btn_searchSD" type="button" class="layui-btn custom-zc" ; onclick="ShowSDChart()">
<i class="layui-icon ">
</i>
确定
</button>
</div>
</div>
</div>
</div>
</form>
<form class="layui-form" style="height:calc(100% - 55px);width:100%" id="tablepanelsandian">
<div class="layui-panel" id="gridpanelsandian" style="width:100%;height: 100%;margin-bottom: 10px; ">
<div id="resultsandian" class="echart" style="width: 100%; height: 100% "></div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="layui-tab-item" style="height:100%">
<div class="layui-fluid" style="padding:0 0px;height:100%">
<div class="layui-row layui-col-space5" style="height:100%">
<div class="layui-col-md12 layui-col-xs12" style="height:100%">
<form class="layui-form" style="height:auto;" id="formPreviewFormZhu">
<div id="grid_21Zhu" class="layui-form-item layui-row grid active" data-id="grid_21Zhu"
data-tag="grid" data-index="0">
<div class="layui-col-md3 widget-col-list column1" data-index="1" data-parentindex="0">
<div id="ReStartTimeZhu" class="layui-form-item active" data-id="ReStartTimeZhu"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
开始时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReStartTimeZhu" name="ndateReStartTime" lay-verify="required"
class="layui-input icon-date widget-date " style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md3 widget-col-list column2" data-index="2" data-parentindex="0">
<div id="ReEndTimeZhu" class="layui-form-item active" data-id="ReEndTimeZhu"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReEndTimeZhu" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "
style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="2" data-parentindex="0" id="recentMdZhu">
<div id="select_11Zhu" class="layui-form-item active" data-id="select_11Zhu" data-tag="select"
data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
速查范围:
</label>
<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
<select name="selectquick" lay-filter="quickTime" lay-verify="required" id="selectRecentQuickZhu">
<option value="onlyOneHour" selected="">
一小时内
</option>
<option value="onlyThreeHour">
三小时内
</option>
<option value="onlyEightHour">
八小时内
</option>
<option value="onlyTwelveHour">
十二小时内
</option>
<option value="onlyOneDay">
一天内
</option>
</select>
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="4" data-parentindex="0">
<div id="bottom_51Zhu" class="layui-form-item active" data-id="bottom_51Zhu" data-tag="bottom"
data-index="0">
<div class="layui-input-block" style="margin-left: 30px;">
<button id="btn_searchZhu" type="button" class="layui-btn custom-zc" ; onclick="ShowZhuChart()">
<i class="layui-icon ">
</i>
确定
</button>
</div>
</div>
</div>
</div>
</form>
<form class="layui-form" style="height:calc(100% - 55px);width:100%" id="tablepanelZhu">
<div class="layui-panel" id="gridpanelzhu" style="width:100%;height: 100%;margin-bottom: 10px; ">
<div id="resultzhu" class="echart" style="width: 100%; height: 100% "></div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="layui-tab-item" style="height:100%">
<div class="layui-fluid" style="padding:0 0px;height:100%">
<div class="layui-row layui-col-space5" style="height:100%">
<div class="layui-col-md12 layui-col-xs12" style="height:100%">
<form class="layui-form" style="height:auto;" id="formPreviewFormBing">
<div id="grid_21Bing" class="layui-form-item layui-row grid active" data-id="grid_21Bing"
data-tag="grid" data-index="0">
<div class="layui-col-md3 widget-col-list column1" data-index="1" data-parentindex="0">
<div id="ReStartTimeBing" class="layui-form-item active" data-id="ReStartTimeBing"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
开始时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReStartTimeBing" name="ndateReStartTime" lay-verify="required"
class="layui-input icon-date widget-date " style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md3 widget-col-list column2" data-index="2" data-parentindex="0">
<div id="ReEndTimeBing" class="layui-form-item active" data-id="ReEndTimeBing"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReEndTimeBing" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "
style="line-height: 40px;">
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="2" data-parentindex="0" id="recentMdBing">
<div id="select_11Bing" class="layui-form-item active" data-id="select_11Bing" data-tag="select"
data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
速查范围:
</label>
<div class="layui-input-block layui-form" lay-filter="select_4" style="margin-left: 140px;">
<select name="selectquick" lay-filter="quickTime" lay-verify="required" id="selectRecentQuickBing">
<option value="onlyOneHour" selected="">
一小时内
</option>
<option value="onlyThreeHour">
三小时内
</option>
<option value="onlyEightHour">
八小时内
</option>
<option value="onlyTwelveHour">
十二小时内
</option>
<option value="onlyOneDay">
一天内
</option>
</select>
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column4" data-index="4" data-parentindex="0">
<div id="bottom_51Bing" class="layui-form-item active" data-id="bottom_51Bing" data-tag="bottom"
data-index="0">
<div class="layui-input-block" style="margin-left: 30px;">
<button id="btn_searchBing" type="button" class="layui-btn custom-zc" ; onclick="ShowBingChart()">
<i class="layui-icon ">
</i>
确定
</button>
</div>
</div>
</div>
</div>
</form>
<form class="layui-form" style="height:calc(100% - 55px);width:100%" id="tablepanelBing">
<div class="layui-panel" id="gridpanelbing" style="width:100%;height: 100%;margin-bottom: 10px; ">
<div id="resultbing" class="echart" style="width: 100%; height: 100% "></div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="layui-tab-item" style="height:100%">
<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;">
@ -1277,7 +1844,7 @@
<div id="ReEndTime1" class="layui-form-item active" data-id="ReEndTime1"
data-tag="date" data-index="0">
<label class="layui-form-label layui-form-required" style="width: 80px;">
结束世间:
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReEndTime1" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "
@ -1429,7 +1996,7 @@
<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: 80px;">
结束世间:
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 110px);margin-left: 110px;">
<input id="dateReEndTime" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "

1841
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarmNew/Index.cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

2
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml
View File

@ -75,7 +75,7 @@
<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;">
结束世间:
结束时间:
</label>
<div class="layui-input-block" style="width:calc(100% - 150px);margin-left: 110px;">
<input id="dateReEndTime" name="ndateReEndTime" lay-verify="required" class="layui-input icon-date widget-date "