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

38
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryAlarmNewNew/Index.cshtml
View File

@ -69,23 +69,7 @@
//});
});
@*
一
1、部署2D测试环境，开放变量数据写入接口。
2、编写API读取与写入小程序，供API连通性测试和2D数据测试使用。
二
1、绘制新版报警统计原型图，按照报警次数和频率划分。
2、报警统计后端数据接口修改为曲工新版本，按次数和频率分别请求。
三
参加公司周年庆活动。
四
1、整理管理平台与市场部们的交流资料，截取旧版本源码进行部署演示。
2、报警统计前端修改为分类统计，更新相应的js功能代码。
五
1、将采集服务的平台框架从短期7.0版本升级为.Net最新的长期生产环境8.0版本，可获得微软长期的稳定性支持。
2、优化实时数据API接口在处理json数据时的流程，降低服务器负载，提高3D，2D多种系统同时请求的效率。
3、查找适用于新版远程IO监控的Web组态画布。
*@
//var argumentFormSiemens = document.getElementById('recentMd');
//argumentFormSiemens.style.display = 'block';
@ -1145,11 +1129,11 @@
debugger;
$.ajax({
url: "/PenMeiReportManage/PenMeiHistoryAlarm/GetAllSubsystemTag",
type: "Get",
url: "/PenMeiReportManage/PenMeiHistoryAlarmNewNew/GetAllSubsystemTag",
type: "Post",
//dataType: "json",
//async: false,
//data: datapa,
data: { SystemName: '@ViewData["SystemName"]' },
success: function (redata) {
debugger;
var listsubsysname = JSON.parse(redata);
@ -1410,7 +1394,7 @@
let datetimeend = $('#dateReEndTime1')[0].value;
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) ,"SystemName":'@ViewData["SystemName"]'};
let result;
debugger;
@ -1436,7 +1420,7 @@
let datetimeend = $('#dateReEndTime2')[0].value;
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) ,"SystemName":'@ViewData["SystemName"]'};
let result;
debugger;
@ -1487,7 +1471,7 @@
}
showTable2 = async function (des) {
showLoading();
var showdata = await GetAlarmRecordValue(des);
var showdata = await GetAlarmRecordValue2(des);
table.render({
elem: '#result2',
height: 'full-150',
@ -1584,7 +1568,7 @@
let datapa = { "Description": des, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "Description": des, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)),"SystemName":'@ViewData["SystemName"]' };
let result;
debugger;
@ -1616,7 +1600,7 @@
let datapa = { "Description": des, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "Description": des, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)),"SystemName":'@ViewData["SystemName"]' };
let result;
debugger;
@ -1652,7 +1636,7 @@
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "SystemName":'@ViewData["SystemName"]' };
let result;
debugger;
@ -1795,7 +1779,7 @@
//getChecked
//var checkRow = $('#subsystemTagList').datalist("getChecked");
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)) };
let datapa = { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "SystemName":'@ViewData["SystemName"]' };
let result;
debugger;

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

@ -226,6 +226,7 @@
iconPicker = layui.iconPicker,
cron = layui.cron,
labelGeneration = layui.labelGeneration;
form.on('select(quickTime)', function (data) {
var selectValue = data.value;
@ -604,7 +605,7 @@
}
//loadinghelper
var SystemName = '@ViewData["SystemName"]';
var filepath = "";
// 文件普通操作
var handler = {};
@ -863,7 +864,7 @@
debugger;
//showLoading();
var datapa = {
"StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval
"StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "SystemName": SystemName,
};
DownLaodPara = datapa;
//var datapa = { "StartTime": datetimestart, "EndTime": datetimeend, "Interval": timeInterval };
@ -893,7 +894,7 @@
type: "GET",
//dataType: "json",
//async: false,
//data: datapa,
data: { SystemName: SystemName },
success: function (refirst) {
first = JSON.parse(refirst);
debugger;
@ -905,7 +906,7 @@
type: "GET",
//dataType: "json",
//async: false,
//data: datapa,
data: { SystemName: SystemName },
success: function (resecond) {
second = JSON.parse(resecond);
debugger;
@ -955,7 +956,7 @@
id: 'result',
height: 'full-140',
url: '/PenMeiReportManage/PenMeiHistoryReport/GetReportNewPage',
where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval/*, "GroupName": groupname */},
where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "SystemName": '@ViewData["SystemName"]' },
page: true,
limit: 13,
//even: true,