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

新兴铸管

Browse Source
This commit is contained in:
dell
2024-09-03 14:16:18 +08:00
parent aee89ebeb1
commit aa742f0036
18 changed files with 18658 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,7 +541,7 @@
showchart = async function () {
//(document.getElementById('echarts-records'), 'walden');
var myChart = echarts.init(document.getElementById('result'),'walden');
var myChart = echarts.init(document.getElementById('result'));
myChart.hideLoading();
myChart.showLoading();
@ -867,6 +867,7 @@
}
var option = {
theme: 'shine',
xAxis: {
name: '时间',
type: 'category',
@ -966,6 +967,7 @@
<body style="height:100%">
<script type="text/javascript" src="~/lib/echarts-5.3.0/dist/echarts.js"></script>
@* <script type="text/javascript" src="~/lib/theme/shine.js"></script> *@
@*<ul class="layui-tab-title">
<li class="layui-this" lay-id="TechCharts">重要数据趋势</li>
<li lay-id="MoreCharts">其他数据趋势</li>

2
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs
View File

@ -88,7 +88,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
{
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
var data = _realTimeIOState.GetRtData(systemDescription);
return Content(data.Result);
}
}

2
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs
View File

@ -88,7 +88,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
{
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
var data = _realTimeIOState.GetRtData(systemDescription);
return Content(data.Result);
}
}

2
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs
View File

@ -88,7 +88,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
{
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
var data = _realTimeIOState.GetRtData(systemDescription);
return Content(data.Result);
}
}

56
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs
View File

@ -32,24 +32,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
{
return await Task.Run(() =>
{
/*
* 一
* 1、安装java集成开发环境，根据示例重构jimu报表的代码。
* 2、jimu报表的java环境继承到.Net中过于繁琐和前端功能较简单放弃使用jumu报表，使用另一款.Net作为服务端的cell报表。
* 二
* 1、下载cell报表前端源码，安装前端Vue3源码环境，通过反编译补全功能代码和与后端的Api请求。
* 2、去除无用功能和界面，只保留报表功能，将所有原项目logo和名称标记替换为恒拓相关。
* 三
* 1、获取cellreport后端源码，编辑源码库的静态资源，下载补全项目引用的开源类库。
* 2、修改水印函数库文件，将唯一不可修改的导出pdf水印替换为空或恒拓环保科技。
* 四
* 1、将前端和后端源码编译打包，重构项目运行结构，前后端集成为一个服务实力，部署测试。
* 2、报表软件交给曲工进行报表编辑和运行测试，同时进行debug调试。
* 五
* 1、将曲工编辑好的报表集成至管理平台。
* 2、比较JS自动绘图组件，选择适合自动生成的组件进行io模块自动构建。
*/
//windows环境
var computer = ComputerHelper.GetComputerInfo();
var arm = computer.RAMRate;
var cpu = computer.CPURate;
@ -75,6 +58,13 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
return Content(listgroup.ToJson());
}
[HttpPost]
public async Task<ActionResult> GetRealIOGroupForId(string[] IOGroupid)
{
var listgroup = _realTimeIOState.GetIOGroup(systemDescription, IOGroupid[0]);
return Content(listgroup.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOInfo()
{
@ -83,12 +73,36 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
return Content(listinfo.ToJson());
}
[HttpPost]
public async Task<ActionResult> GetRealIOInfoForId(string[] IOGroupid)
{
var listinfo = _realTimeIOState.GetIOInfo(systemDescription, IOGroupid[0]);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealDevNetWork()
{
var listinfo = _realTimeIOState.GetRealDevNetWork(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetDevNetWork()
{
var listinfo = _realTimeIOState.GetDevNetWork(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOState()
{
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
//var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
//var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData(systemDescription);
return Content(data.Result);
}
}

0
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 副本.cshtml → HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - xxback.cshtml
View File

3226
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 复制.cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

2818
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index - xxback.cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

4242
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index - xxback2.cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

4482
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index - 复制.cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

5438
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml
View File

File diff suppressed because it is too large Load Diff

16
HT.Cloud.Web/DataProtection/key-dd8eb8fc-f638-45a4-a044-c3402c318748.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<key id="dd8eb8fc-f638-45a4-a044-c3402c318748" version="1">
<creationDate>2024-08-13T06:29:44.369466Z</creationDate>
<activationDate>2024-08-13T06:29:44.1402872Z</activationDate>
<expirationDate>2024-11-11T06:29:44.1402872Z</expirationDate>
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<descriptor>
<encryption algorithm="AES_256_CBC" />
<validation algorithm="HMACSHA256" />
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
<!-- Warning: the key below is in an unencrypted form. -->
<value>KsRf49m4rQvK4WjUzfReQqrnpmA5UnP4zmAn7Vp0oH774U+MBUCNOC6B3Wlo/JD+jBH1lU1WSL2HWy36OTygyw==</value>
</masterKey>
</descriptor>
</descriptor>
</key>

50
HT.Cloud.Web/WaterCloud.Web.xml
View File

@ -11,7 +11,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.HistoryChartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.HistoryChartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -23,7 +23,7 @@
描 述：实时趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.RtchartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.RtchartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -35,7 +35,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryChartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryChartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -47,7 +47,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryTechChartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryTechChartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -59,7 +59,7 @@
描 述：实时趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiRtchartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiRtchartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -71,7 +71,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiRtTechChartsController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiRtTechChartsController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -160,7 +160,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -172,7 +172,7 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmNewController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmNewController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -184,17 +184,17 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmNewNewController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.PenMeiHistoryAlarmNewNewController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.HistoryReportController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.HistoryReportController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.MainPageController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.MainPageController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
@ -206,22 +206,42 @@
描 述：历史趋势控制器类
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.MetaTagAlarmController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.MetaTagAlarmController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.RtReportController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.ReportManage.Controllers.RtReportController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.PenMeiReportManage.Controllers.PenMeiHistoryReportController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.PenMeiReportManage.Controllers.PenMeiHistoryReportController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.PenMeiReportManage.Controllers.RtReportController.groupDescription">
<member name="F:HT.Cloud.Web.Areas.PenMeiReportManage.Controllers.RtReportController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.SystemSecurity.Controllers.PenMeiJMReportController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.SystemSecurity.Controllers.PenMeiJMReportNewController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.SystemSecurity.Controllers.PenMeiNetWorkStateController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>
</member>
<member name="F:HT.Cloud.Web.Areas.SystemSecurity.Controllers.PenMeiNetWorkStateNewController.systemDescription">
<summary>
绑定数据仓库的数据库ID
</summary>

BIN
HT.Cloud.Web/wwwroot.rar Normal file
View File

Binary file not shown.

6
HT.Cloud.Web/wwwroot/js/lay-module/layuimini/miniTheme.js
View File

@ -430,9 +430,9 @@ layui.define(["jquery", "layer"], function (exports) {
'<ul>\n' + bgColorHtml + '</ul>\n' +
'</div>\n' +
'<div class="more-menu-list">\n' +
'<a class="more-menu-item" href="https://gitee.com/qian_wei_hong/WaterCloud/wikis/pages" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
'<a class="more-menu-item" href="https://gitee.com/qian_wei_hong/WaterCloud" target="_blank"><i class="layui-icon layui-icon-tabs" style="font-size: 16px;"></i> 开源地址</a>\n' +
'<a class="more-menu-item" href="http://www.watercloud.vip/" target="_blank"><i class="layui-icon layui-icon-theme"></i> 演示地址</a>\n' +
//'<a class="more-menu-item" href="https://gitee.com/qian_wei_hong/WaterCloud/wikis/pages" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
//'<a class="more-menu-item" href="https://gitee.com/qian_wei_hong/WaterCloud" target="_blank"><i class="layui-icon layui-icon-tabs" style="font-size: 16px;"></i> 开源地址</a>\n' +
//'<a class="more-menu-item" href="http://www.watercloud.vip/" target="_blank"><i class="layui-icon layui-icon-theme"></i> 演示地址</a>\n' +
'</div>' +
'</div>';
layer.open({