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