新兴上传

This commit is contained in:
dell
2024-10-12 11:15:47 +08:00
parent aa742f0036
commit 86cbb1d54a
20 changed files with 4643 additions and 15 deletions

View File

@ -0,0 +1,142 @@
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;
using HT.Cloud.Domain.DevicesManage;
namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
{
/// <summary>
/// 创 建cdl
/// 日 期2023-02-23 11:10
/// 描 述:历史趋势控制器类
/// </summary>
[Area("DataStatisticalManage")]
//[HandlerLogin(needLogin: false)]
//[HandlerAuthorize(needAuth: false)]
public class StatisticalSettingController : BaseController
{
public HistoryTechChartsService _historyTechChartsService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
var data = await _historyTechChartsService.GetDriverGroupList();
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetGroupSubsystemTag(ChartGroupDescription chartGroupDescription)
{
var data = await _historyTechChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _historyTechChartsService.GetAllSubsystemTag();
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _historyTechChartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, chartSubsysytemName.GroupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(Charts_Params charts_Params)
{
var Table = charts_Params.Table;
var TagName = charts_Params.TagName;
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var Interval =int.Parse(charts_Params.Interval);
var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval);
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 class ChartTagType
{
public string ChartTagTypeName { get;set; }
}
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 GroupDescription { get; set; }
public string SubsysytemName { get; set; }
}
public class ChartGroupDescription
{
public string GroupDescription { 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 Charts_Params
{
public string Table { get; set; }
public string TagName { get; set; }
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
}
}
}

View File

@ -0,0 +1,165 @@
@{
ViewBag.Title = "Index";
Layout = "~/Views/Shared/_Index.cshtml";
}
<style>
.layui-table-tool > .layui-table-tool-temp {
padding-right: 0px;
}
</style>
<script>
layui.use(['jquery', 'form', 'table', 'common', 'dtree', 'commonTable', 'optimizeSelectOption'], function () {
var $ = layui.jquery,
form = layui.form,
commonTable = layui.commonTable,
table = layui.table,
dtree = layui.dtree,
laydate = layui.laydate,
//echarts = layui.echarts,
common = layui.common;
//加载数据
wcLoading.close();
//权限控制(js是值传递)
//toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
// 时间范围
laydate.render({
elem: '#ID-laydate-range-time1',
type: 'time',
range: true
});
laydate.render({
elem: '#ID-laydate-range-time2',
type: 'time',
range: true
}); laydate.render({
elem: '#ID-laydate-range-time3',
type: 'time',
range: true
});
laydate.render({
elem: '#ID-laydate-range-time4',
type: 'time',
range: true
});
form.on('submit(demo2)', function (data) {
var field = data.field; // 获取表单全部字段值
debugger;
var elem = data.elem; // 获取当前触发事件的元素 DOM 对象,一般为 button 标签
var elemForm = data.form; // 获取当前表单域的 form 元素对象,若容器为 form 标签才会返回。
// 显示填写结果,仅作演示用
layer.alert(JSON.stringify(field), {
title: '当前填写的字段值'
});
// 此处可执行 Ajax 等操作
// …
return false; // 阻止默认 form 跳转
});
});
</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-collapse">
<div class="layui-colla-item">
<div class="layui-colla-title">生产统计参数</div>
<div class="layui-colla-content">
<form class="layui-form" action="">
<div class="layui-form-item">
<label class="layui-form-label">原煤水份(%)</label>
<div class="layui-input-block">
<input type="text" value="15" name="username" lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备损耗(%)</label>
<div class="layui-input-block">
<input type="text" value="1" name="username" lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button type="submit" class="layui-btn" lay-submit lay-filter="demo1">提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
</form>
</div>
</div>
<div class="layui-colla-item">
<div class="layui-colla-title">峰谷电时段设置</div>
<div class="layui-colla-content">
<form class="layui-form" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">平电区间</label>
<div class="layui-input-inline">
<input type="text" value="00:00:00 - 23:59:59" class="layui-input" id="ID-laydate-range-time1" placeholder=" - ">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">峰电区间</label>
<div class="layui-input-inline">
<input type="text" value="00:00:00 - 23:59:59" class="layui-input" id="ID-laydate-range-time2" placeholder=" - ">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">谷电区间</label>
<div class="layui-input-inline">
<input type="text" value="00:00:00 - 23:59:59" class="layui-input" id="ID-laydate-range-time3" placeholder=" - ">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">尖电区间</label>
<div class="layui-input-inline">
<input type="text" value="00:00:00 - 23:59:59" class="layui-input" id="ID-laydate-range-time4" placeholder=" - ">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button type="submit" class="layui-btn" lay-submit lay-filter="demo2">提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
</form>
</div>
</div>
<div class="layui-colla-item">
<div class="layui-colla-title">手自动参数设置</div>
<div class="layui-colla-content">
<ul>
<li>Content list</li>
<li>Content list</li>
</ul>
</div>
</div>
<div class="layui-colla-item">
<div class="layui-colla-title">折叠面板的标题</div>
<div class="layui-colla-content">
<p>折叠面板的内容</p>
</div>
</div>
</div>
</body>
</html>

File diff suppressed because it is too large Load Diff

View File

@ -19,6 +19,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// 描 述:历史趋势控制器类
/// </summary>
[Area("PenMeiReportManage")]
[HandlerLogin(needLogin: false)]
[HandlerAuthorize(needAuth: false)]
public class PenMeiHistoryAlarmNewController : BaseController
{
public HistoryAlarmService _historyAlarmService { get;set;}

View File

@ -21,6 +21,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// 描 述:历史趋势控制器类
/// </summary>
[Area("PenMeiReportManage")]
[HandlerLogin(needLogin: false)]
[HandlerAuthorize(needAuth: false)]
public class PenMeiHistoryAlarmNewNewController : BaseController
{
public HistoryAlarmService _historyAlarmService { get;set;}

View File

@ -1055,6 +1055,9 @@
//async: false,
data: DownLaodPara,
success:function (downRes) {
notify.success("导出报表数据完成,请查看浏览器或下载目录查看报表文件", "vcenter");
var ddfileName = JSON.parse(downRes);
var fileNewDownloadUrl = "/report/" + ddfileName;

File diff suppressed because it is too large Load Diff

View File

@ -691,8 +691,9 @@
// group.add(line13_name);
var dev0att = devlist.filter(item => item.DeviceName === "dev0")[0];
const image_exchange = new LeaferUI.Image({
id: "dev0",
x: 800,
y: 250 + 75,
url: '/imagesnet/交换机.png',
@ -705,7 +706,7 @@
y: 250 + 75 + 160 + 10,
width: 134,
fill: fill_top_name,
text: '交换机',
text: dev0att.DeviceDESCRIPTION,
textAlign: 'center',
verticalAlign: 'middle',
textWrap: 'none',
@ -718,7 +719,7 @@
y: 250 + 75 + 160 + 25,
width: 134,
fill: fill_top_name,
text: '192.168.100.1',
text: dev0att.DeviceIP,
textAlign: 'center',
verticalAlign: 'middle',
textWrap: 'none',