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

喷煤趋势报警，趋势轴样式修改完成

Browse Source
This commit is contained in:
dell
2023-08-22 17:24:56 +08:00
parent 2587fe7fa3
commit a83653655b
13 changed files with 2120 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
View File

@ -33,24 +33,27 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetGroupSubsystemTag(ChartGroupDescription chartGroupDescription)
public async Task<ActionResult> GetGroupSubsystemTag(string systemName)
{
var data = await _historyChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription);
var data = await _historyChartsService.GetGroupSubsystemTag(systemName);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _historyChartsService.GetAllSubsystemTag();
string systemName = "制粉系统";
var data = await _historyChartsService.GetAllSubsystemTag(systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _historyChartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, chartSubsysytemName.GroupDescription);
public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
{
string systemName = "制粉系统";
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
return Content(data);
}

102
HT.Cloud.Web/Areas/ChartsManage/Views/HistoryCharts/Index.cshtml
View File

@ -312,9 +312,9 @@
} else { }
});
GetDriverGroupList();
//GetDriverGroupList();
//GetAllSubsystemTag();
GetAllSubsystemTag();
var starttime = new Date(new Date().setHours(0, 0, 0, 0));
var starttimeString = starttime.getFullYear() + "-" + parseInt(starttime.getMonth() + 1) + "-" + starttime.getDate() + " " + (starttime.getHours()) + ":" + starttime.getMinutes() + ":" + starttime.getSeconds();
@ -388,55 +388,55 @@
var StaticSelectTagList = new Array();
//获取所有变量组
async function GetDriverGroupList() {
debugger;
$.ajax({
url: "/ChartsManage/HistoryCharts/GetDriverGroupList",
type: "Get",
success: function (redata) {
debugger;
var listsubsysname = JSON.parse(redata);
$('#groupselect').combobox({
data: listsubsysname,
valueField: 'Lable',
textField: 'Value',
value :'请选择系统',
checkOnSelect: true,
selectOnCheck: true
});
$('#subsystemselect').combobox({
//async function GetDriverGroupList() {
// debugger;
// $.ajax({
// url: "/ChartsManage/HistoryCharts/GetDriverGroupList",
// type: "Get",
// success: function (redata) {
// debugger;
// var listsubsysname = JSON.parse(redata);
// $('#groupselect').combobox({
// data: listsubsysname,
// valueField: 'Lable',
// textField: 'Value',
// value :'请选择系统',
// checkOnSelect: true,
// selectOnCheck: true
// });
// $('#subsystemselect').combobox({
value: '请先选择系统',
});
}
});
}
var StaticGroupDescription = "";
updateGroupSelect = async function (data) {
StaticGroupDescription = data.Value;
var para = { "GroupDescription": data.Value }
//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
debugger;
$.ajax({
url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag",
type: "Post",
//dataType: "json",
data: para,
success: function (redata) {
var listsubsysname = JSON.parse(redata);
$('#subsystemselect').combobox({
data: listsubsysname,
valueField: 'Lable',
textField: 'Value',
value: '请选择子系统',
checkOnSelect: true,
selectOnCheck: true
});
}
});
// value: '请先选择系统',
// });
// }
// });
//}
//var StaticGroupDescription = "";
//updateGroupSelect = async function (data) {
// StaticGroupDescription = data.Value;
// var para = { "GroupDescription": data.Value }
// //var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
// debugger;
// $.ajax({
// url: "/ChartsManage/HistoryCharts/GetGroupSubsystemTag",
// type: "Post",
// //dataType: "json",
// data: para,
// success: function (redata) {
// var listsubsysname = JSON.parse(redata);
// $('#subsystemselect').combobox({
// data: listsubsysname,
// valueField: 'Lable',
// textField: 'Value',
// value: '请选择子系统',
// checkOnSelect: true,
// selectOnCheck: true
// });
// }
// });
}
//}
//获取所有子系统列表ok 废弃
async function GetAllSubsystemTag() {
debugger;
@ -463,7 +463,7 @@
//获取选中子系统tag
updateSelect = async function (data) {
//var groupDescription = ('#groupselect').combobox().getValue();
var para = { "GroupDescription": StaticGroupDescription, "SubsysytemName": data.Value }
var para = { /*"GroupDescription": StaticGroupDescription,*/ "SubsysytemName": data.Value }
//var subsystemAllTag = await Call(api.DataHistoryCharts.GetSubsystemAllTag, para);
debugger;
myajax = $.ajax({
@ -825,8 +825,8 @@
@*<ul id="dataTree" class="dtree" data-id="0"></ul>*@
<div id="aleft" style="float:left;width:100%;height:100%">
<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateGroupSelect(rec)}" style="width:100%;height:40px">
</div>
@*<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateGroupSelect(rec)}" style="width:100%;height:40px">
</div>*@
<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>
<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="