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

1、陕西建龙打包版本

Browse Source 
2、drawio导入SFC
3、多系统并存修改
This commit is contained in:
dell
2025-02-19 16:06:08 +08:00
parent 4071d8f337
commit fbc097d131
73 changed files with 3874 additions and 13074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
View File

@ -31,6 +31,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -44,17 +49,17 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var data = await _historyChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
[HttpPost]
public async Task<ActionResult> GetAllSubsystemTag(string[] systemName)
{
var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
var data = await _historyChartsService.GetAllSubsystemTag(systemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
public async Task<ActionResult> GetSubsystemAllTag(SubSystemName_params SubSystemName_params)
{
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
var data = await _historyChartsService.GetSubsystemAllTag(SubSystemName_params.SubSystemName, SubSystemName_params.SystemName);
return Content(data);
}
@ -65,8 +70,9 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var Interval =int.Parse(charts_Params.Interval);
var SystemName = charts_Params.SystemName;
var data = await _historyChartsService.GetChartsTagValue(TagID, StartTime, EndTime, Interval);
var data = await _historyChartsService.GetChartsTagValue(TagID, StartTime, EndTime, Interval, SystemName);
return Content(data);
}
@ -121,6 +127,13 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
public class SubSystemName_params
{
public string SystemName { get; set; }
public string SubSystemName { get; set; }
}
}

15
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
View File

@ -11,6 +11,7 @@ using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using Serenity.Services;
using HT.Cloud.Domain.DevicesManage;
using Quartz;
namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
{
@ -29,11 +30,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpPost]
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
var data = await _historyTechChartsService.GetAllTagList(chartTagType.SystemName, chartTagType.ChartTagTypeName);
return Content(data);
}
@ -73,8 +79,9 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var Interval =int.Parse(charts_Params.Interval);
var SystemName = charts_Params.SystemName;
var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval);
var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval, SystemName);
return Content(data);
}
@ -88,6 +95,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class ChartTagType
{
public string SystemName { get; set; }
public string ChartTagTypeName { get;set; }
}
@ -136,6 +144,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
}

16
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
View File

@ -29,11 +29,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var data = await _rtTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
var data = await _rtTechChartsService.GetAllTagList(chartTagType.SystemName, chartTagType.ChartTagTypeName);
return Content(data);
}
@ -66,16 +71,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables)
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables, string[] SystemName)
{
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemDescription);
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, SystemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames)
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames, string[] SystemName)
{
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemDescription);
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, SystemName[0]);
return Content(data);
}
@ -90,6 +95,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class ChartTagType
{
public string ChartTagTypeName { get;set; }
public string SystemName { get;set; }
}

31
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
View File

@ -8,6 +8,7 @@ using HT.Cloud.Domain.ChartsManage;
using HT.Cloud.Service;
using Microsoft.AspNetCore.Authorization;
using HT.Cloud.Service.ChartsManage;
using static HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryChartsController;
namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
{
@ -24,6 +25,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -31,31 +37,31 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
[HttpPost]
public async Task<ActionResult> GetAllSubsystemTag(string[] systemName)
{
var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
var data = await _rtchartsService.GetAllSubsystemTag(systemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
public async Task<ActionResult> GetSubsystemAllTag(SubSystemName_params SubSystemName_params)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
var data = await _rtchartsService.GetSubsystemAllTag(SubSystemName_params.SubSystemName, SubSystemName_params.SystemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs, string[] SystemName)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, SystemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs, string[] SystemName)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, SystemName[0]);
return Content(data);
}
@ -98,5 +104,10 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string EndTime { get; set; }
public string Interval { get; set; }
}
}
public class SubSystemName_params
{
public string SystemName { get; set; }
public string SubSystemName { get; set; }
}
}
}

19
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryCharts/Index.cshtml
View File

@ -313,7 +313,7 @@
});
//GetDriverGroupList();
var SystemName = '@ViewData["SystemName"]';
GetAllSubsystemTag();
var starttime = new Date(new Date().setHours(0, 0, 0, 0));
@ -375,6 +375,8 @@
return currentDate;
}
function json_array(data) {
var len = eval(data).length;
var arr = [];
@ -445,7 +447,8 @@
debugger;
$.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetAllSubsystemTag",
type: "Get",
type: "Post",
data: { SystemName: '@ViewData["SystemName"]'},
//dataType: "json",
//async: false,
//data: datapa,
@ -466,7 +469,7 @@
//获取选中子系统tag
updateSelect = async function (data) {
//var groupDescription = ('#groupselect').combobox().getValue();
var para = { /*"GroupDescription": StaticGroupDescription,*/ "SubsysytemName": data.Value }
var para = { /*"GroupDescription": StaticGroupDescription,*/SystemName: '@ViewData["SystemName"]' , SubSystemName: data.Value }
//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
debugger;
myajax = $.ajax({
@ -559,7 +562,7 @@
default:
timeInterval = 3600
};
let datapa = { "TagID": StaticSelectTagList[si].TagID, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval };
let datapa = { "TagID": StaticSelectTagList[si].TagID, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval,"SystemName": '@ViewData["SystemName"]' };
let result;
myajax = await $.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetChartsTagValue",
@ -585,11 +588,11 @@
//第一条Y轴是否显示轴线
const oneAxisLineShow = true;
//其他Y轴是否显示轴线
const otherAxisLineShow = false;
const otherAxisLineShow = true;
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();
@ -666,7 +669,7 @@
nameRotate: 270,
max: maxArr[ci],
min: minArr[ci],
interval: intervalArr[ci],
interval: 0,//intervalArr[ci],
type: 'value',
//坐标轴两边留白策略，设置max、min后失效
boundaryGap: ['5%', '2%'],
@ -720,7 +723,7 @@
nameRotate: 270,
max: maxArr[ci],
min: minArr[ci],
interval: intervalArr[ci],
interval: 0,//intervalArr[ci],
type: 'value',
position: 'left',
//坐标轴两边留白策略，设置max、min后失效

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

@ -375,6 +375,8 @@
return currentDate;
}
var SystemName = '@ViewData["SystemName"]';
function json_array(data) {
var len = eval(data).length;
var arr = [];
@ -395,7 +397,7 @@
$.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryTechCharts/GetAllTagList",
type: "Post",
data: {ChartTagTypeName:"Rate"},
data: { SystemName: '@ViewData["SystemName"]', ChartTagTypeName: "Rate" },
success: function (redata) {
debugger;
@ -418,7 +420,7 @@
$.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryTechCharts/GetAllTagList",
type: "Post",
data: { ChartTagTypeName: "Process" },
data: { SystemName: '@ViewData["SystemName"]', ChartTagTypeName: "Process" },
success: function (redata) {
debugger;
@ -509,7 +511,7 @@
default:
timeInterval = 3600
};
let datapa = { "Table": StaticSelectTagList[si].Table, "TagName": StaticSelectTagList[si].TagName, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval };
let datapa = { "Table": StaticSelectTagList[si].Table, "TagName": StaticSelectTagList[si].TagName, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "SystemName": '@ViewData["SystemName"]' };
let result;
myajax = await $.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryTechCharts/GetChartsTagValue",

52
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index.cshtml
View File

@ -375,6 +375,8 @@
return currentDate;
}
var SystemName = '@ViewData["SystemName"]';
function json_array(data) {
var len = eval(data).length;
var arr = [];
@ -396,7 +398,7 @@
$.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryTechCharts/GetAllTagList",
type: "Post",
data: {ChartTagTypeName:"Rate"},
data: { SystemName: '@ViewData["SystemName"]', ChartTagTypeName: "Rate" },
success: function (redata) {
debugger;
@ -419,7 +421,7 @@
$.ajax({
url: "/PenMeiChartsManage/PenMeiHistoryTechCharts/GetAllTagList",
type: "Post",
data: { ChartTagTypeName: "Process" },
data: { SystemName: '@ViewData["SystemName"]', ChartTagTypeName: "Process" },
success: function (redata) {
debugger;
@ -493,7 +495,7 @@
type: "Post",
dataType: "json",
traditional: true,//这里设置为true
data: { charts_TagNames: SelectTagNamelist, Tables: tablesArr },
data: { charts_TagNames: SelectTagNamelist, Tables: tablesArr, SystemName: '@ViewData["SystemName"]' },
success: function (redata) { }
});
debugger;
@ -660,47 +662,7 @@
yAxis.push(yAxisdata);
}
}
/*
*一
1、复用制粉趋势界面源码建立喷煤趋势界面。
2、改进趋势图的曲线颜色设定，按照单位分类，相同单位变量绑定同一色系。
3、曲线对应Y轴数量合并，根据单词选择变量中单位类型数量，生成对应单位的轴。
4、修改补充冀南钢铁喷煤制粉技术方案。
*二
1、增加顶部趋势图列显示，对应变量和曲线颜色，点击可显示和隐藏曲线。
2、增加趋势鼠标滚轮放大功能，在趋势上滚动滚轮对应缩短和增加时间跨度。
3、增加拖拽功能，在缩小时间跨度后，左键拖拽左右平移时间轴。
4、喷煤趋势后台控制器和数据服务重新构建，按照多系统方式，可查配置变量模板和多系统部署时不同数据。
5、协助水分仪上位机微波趋势显示修改，加大Y轴水分值量程，增加X轴时间跨度。
*三
1、根据曲工的喷煤趋势模板表，自动生成历史趋势界面变量选择项，拆分速率相关变量和重要参数变量。
2、调用曲工查询过程，构建选择变量列表依次查询数据，绑定至对应曲线和对应坐标轴。
3、构建趋势chart的容器、X轴、Y轴、变量曲线实例、图例、颜色数组、鼠标提示框，组合生成趋势。
*四
1、套用实时趋势的界面、前端JS、后端控制器、服务等实现代码，复用至喷煤实时趋势并制作该界面。
2、接入采集服务的实时数据库，设置实时趋势初始化时记录三秒钟实时数据来进行实时趋势初始化。
*五
1、生成喷煤趋势变量随机数通过采集服务Api写入300cpu中，用来模拟实时趋势。
2、添加趋势刷新方法，按周期刷新趋势数据。
3、构建实时趋势，设置曲线数据从采集服务中的实时数据中每秒增加数据，最大数据量50个。
*/
/*
*一
1、调整报警记录统计界面样式，将报警明细汇总表格和图表显示集中在同一界面。
2、修改报警图表数据查询函数为新的存储过程，调用曲工新的仿真数据。
*二
1、柱状图JS绘制方法加载新的返回数据格式，绘制为按照报警次数显示。
2、L2管理平台ppt制作。
*三
L2管理平台ppt制作。
*四
1、部署modbus驱动测试程序，测试读取效率。
2、实时趋势开启后台异步加载，初始化后异步加载12小时的历史数据。
*五
实时趋势添加缩放区域拖拽条，在鼠标滚动的基础上可自由拖动显示的时间跨度。
*/
//for (var ci = 0; ci < StaticSelectTagList.length; ci++) {
// if (ci == 0) {
@ -940,7 +902,7 @@
type: "Post",
dataType: "json",
traditional: true,//这里设置为true
data: { charts_TagNames: SelectTagNamelist },
data: { charts_TagNames: SelectTagNamelist, SystemName: '@ViewData["SystemName"]' },
success: function (redata) { }
});
$.when(myajax).done(function (redata) {

11
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtcharts/Index.cshtml
View File

@ -23,6 +23,8 @@
//权限控制(js是值传递)
//toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
var SystemName = '@ViewData["SystemName"]';
GetAllSubsystemTag();
var starttime = new Date(new Date().setHours(0, 0, 0, 0));
@ -61,7 +63,8 @@
debugger;
$.ajax({
url: "/PenMeiChartsManage/PenMeiRtcharts/GetAllSubsystemTag",
type: "Get",
type: "Post",
data: { SystemName: '@ViewData["SystemName"]'},
//dataType: "json",
//async: false,
//data: datapa,
@ -81,7 +84,7 @@
}
//获取选中子系统tag
updateSelect = async function (data) {
var para = { "SubsysytemName": data.Value }
var para = {SystemName: '@ViewData["SystemName"]' , SubSystemName: data.Value }
//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
debugger;
myajax = $.ajax({
@ -158,7 +161,7 @@
type: "Post",
dataType: "json",
traditional: true,//这里设置为true
data: { charts_TagIDs: SelectTagIDlist },
data: { charts_TagIDs: SelectTagIDlist,SystemName: '@ViewData["SystemName"]' },
success: function (redata) { }
});
debugger;
@ -475,7 +478,7 @@
type: "Post",
dataType: "json",
traditional: true,//这里设置为true
data: { charts_TagIDs:SelectTagIDlist},
data: { charts_TagIDs:SelectTagIDlist,SystemName: '@ViewData["SystemName"]'},
success: function (redata) { }
});
$.when(myajax).done(function (redata) {