拆分多库模式
This commit is contained in:
@ -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,60 +388,60 @@
|
||||
|
||||
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;
|
||||
$.ajax({
|
||||
url: "/ChartsManage/HistoryCharts/GetAllSubsystemTag",
|
||||
url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetAllSubsystemTag",
|
||||
type: "Get",
|
||||
//dataType: "json",
|
||||
//async: false,
|
||||
@ -463,11 +463,11 @@
|
||||
//获取选中子系统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({
|
||||
url: "/ChartsManage/HistoryCharts/GetSubsystemAllTag",
|
||||
url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetSubsystemAllTag",
|
||||
type: "Post",
|
||||
//dataType: "json",
|
||||
data: para,
|
||||
@ -559,7 +559,7 @@
|
||||
let datapa = { "TagID": StaticSelectTagList[si].TagID, "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval };
|
||||
let result;
|
||||
myajax = await $.ajax({
|
||||
url: "/ChartsManage/HistoryCharts/GetChartsTagValue",
|
||||
url: "/PenMeiChartsManage/PenMeiHistoryCharts/GetChartsTagValue",
|
||||
type: "Post",
|
||||
//dataType: "json",
|
||||
data: datapa,
|
||||
@ -625,10 +625,10 @@
|
||||
// min: 0,
|
||||
// 让表格的刻度向靠里侧显示
|
||||
axisTick: {
|
||||
inside: false
|
||||
inside: true
|
||||
},
|
||||
axisLabel: {
|
||||
inside: false,
|
||||
inside: true,
|
||||
align: 'left',
|
||||
verticalAlign: 'bottom',
|
||||
},
|
||||
@ -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="
|
||||
|
Reference in New Issue
Block a user