فهرست منبع

Add 添加实时负荷电压电流导出

Yue 2 سال پیش
والد
کامیت
448bebfafa

+ 84 - 92
VbdsmUI_V2.1.1/src/pc/powerservice/electricstatistics/electric_statistics.html

@@ -1,104 +1,96 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+		<meta content="webkit" name="renderer" />
+		<title>电量统计 - 铂沅能源管理平台 - Powered by ZKSF</title>
+		<link href="/images/favicon.ico" rel="Shortcut Icon" />
+		<link href="http://static.vbdsm.com/js/lib/easyui/themes/vber/easyui.css" rel="stylesheet" type="text/css" />
+		<link href="http://static.vbdsm.com/js/lib/easyui/themes/icon.css" rel="stylesheet" type="text/css" />
+		<link href="http://static.vbdsm.com/js/lib/loadmask/jquery.loadmask.css" rel="stylesheet" type="text/css" />
+		<script src="http://static.vbdsm.com/js/lib/jquery-1.8.0.min.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/lib/jquery.ba-resize.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/highcharts.exporting.support.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/lib/easyui/jquery.easyui.min.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/lib/easyui/locale/easyui-lang-zh_CN.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/lib/loadmask/jquery.loadmask.min.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/static.support.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/easyui.support.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/common.tools.js" type="text/javascript"></script>
+		<script src="http://static.vbdsm.com/js/util.js" type="text/javascript"></script>
 
-<head>
-	<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-	<meta content="webkit" name="renderer" />
-	<title>电量统计 - 铂沅能源管理平台 - Powered by ZKSF</title>
-	<link href="/images/favicon.ico" rel="Shortcut Icon" />
-	<link href="http://static.vbdsm.com/js/lib/easyui/themes/vber/easyui.css" rel="stylesheet" type="text/css" />
-	<link href="http://static.vbdsm.com/js/lib/easyui/themes/icon.css" rel="stylesheet" type="text/css" />
-	<link href="http://static.vbdsm.com/js/lib/loadmask/jquery.loadmask.css" rel="stylesheet" type="text/css" />
-	<script src="http://static.vbdsm.com/js/lib/jquery-1.8.0.min.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/lib/jquery.ba-resize.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/lib/highcharts/highcharts.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/highcharts.exporting.support.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/lib/easyui/jquery.easyui.min.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/lib/easyui/locale/easyui-lang-zh_CN.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/lib/loadmask/jquery.loadmask.min.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/static.support.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/easyui.support.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/common.tools.js" type="text/javascript"></script>
-	<script src="http://static.vbdsm.com/js/util.js" type="text/javascript"></script>
+		<script charset="UTF-8" type="text/javascript"></script>
+	</head>
 
-	<script charset="UTF-8" type="text/javascript"></script>
-</head>
-
-<body style="margin: 0">
-	<div class="easyui-layout" data-options="fit:true,border:false,plain:true">
-		<!--- 左边树 -->
-		<div data-options="region:'west',split:true,maxWidth:300,minWidth:180"
-			style="width: 230px; border-left: none; border-top: none; border-bottom: none">
-			<div style="overflow: auto" title="监控点">
-				<div
-					style="padding: 2px; padding-top: 5px; height: 25px; background-color: #eee; border-bottom: solid 1px #ddd; border-top: solid 1px #ffddff; vertical-align: left; text-align: 29px; color: #444444">
-					<input id="cascade" onchange="$('#monitorTree').tree({cascadeCheck:$(this).is(':checked')})"
-						type="checkbox" />
-					<label for="cascade">级联选择</label>
+	<body style="margin: 0">
+		<div class="easyui-layout" data-options="fit:true,border:false,plain:true">
+			<!--- 左边树 -->
+			<div data-options="region:'west',split:true,maxWidth:300,minWidth:180" style="width: 230px; border-left: none; border-top: none; border-bottom: none">
+				<div style="overflow: auto" title="监控点">
+					<div style="padding: 2px; padding-top: 5px; height: 25px; background-color: #eee; border-bottom: solid 1px #ddd; border-top: solid 1px #ffddff; vertical-align: left; text-align: 29px; color: #444444">
+						<input id="cascade" onchange="$('#monitorTree').tree({cascadeCheck:$(this).is(':checked')})" type="checkbox" />
+						<label for="cascade">级联选择</label>
+					</div>
+					<ul id="monitorTree" style="overflow: hidden"></ul>
 				</div>
-				<ul id="monitorTree" style="overflow: hidden"></ul>
 			</div>
-		</div>
-		<!--- 右边内容 -->
-		<div data-options="region:'center'" style="border-bottom: none; border-top: none; border-right: none">
-			<div id="toolber"
-				style="width: 100%; height: 32px; background-color: #eee; border-bottom: solid 1px #ddd; border-top: solid 1px #ddd; vertical-align: left;overflow: hidden;">
-				<div style="padding-left: 5px; line-height: 32px; float: left; vertical-align: middle">
-					报表类型:
-					<select class="easyui-combobox" id="charType" panelHeight="auto" style="width: 120px">
-						<option selected value="1">峰平谷尖电量统计</option>
-						<option value="2">日电量明细</option>
-						<option value="3">月峰平谷尖明细</option>
-						<option value="4">时刻电量统计</option>
-						<option value="5">月电量明细</option>
-						<option value="6">自定义日统计</option>
-					</select>
-				</div>
-				<div class="choose_options_block" style="padding-left: 5px; float: left; line-height: 32px">
-					<div id="charType_1" style="display: none">
-						<label>开始时间:</label>
-						<input class="easyui-datebox" id="fgpStartDate" style="width: 100px" />
-						<label>结束时间:</label>
-						<input class="easyui-datebox" id="fgpEndDate" style="width: 100px" />
+			<!--- 右边内容 -->
+			<div data-options="region:'center'" style="border-bottom: none; border-top: none; border-right: none">
+				<div id="toolber" style="width: 100%; height: 32px; background-color: #eee; border-bottom: solid 1px #ddd; border-top: solid 1px #ddd; vertical-align: left; overflow: hidden">
+					<div style="padding-left: 5px; line-height: 32px; float: left; vertical-align: middle">
+						报表类型:
+						<select class="easyui-combobox" id="charType" panelHeight="auto" style="width: 120px">
+							<option selected value="7">日实时负荷</option>
+							<option value="8">日实时电流</option>
+							<option value="9">日实时电压</option>
+							<option value="1">峰平谷尖电量统计</option>
+							<option value="2">日电量明细</option>
+							<option value="3">月峰平谷尖明细</option>
+							<option value="4">时刻电量统计</option>
+							<option value="5">月电量明细</option>
+							<option value="6">自定义日统计</option>
+						</select>
 					</div>
-					<div id="charType_2" style="display: none"><label>日期:</label><input class="easyui-datebox"
-							data-options="editable:false" id="date" style="width: 100px" /></div>
-					<div id="charType_3" style="display: none"><label>年:</label><input id="year" /> <label>月:</label><input
-							id="month" /></div>
-					<div id="charType_4" style="display: none">
-						<label>开始时间: </label><input class="easyui-datetimebox" data-options="showSeconds:false" id="startDate"
-							panelHeight="auto" style="width: 140px" /> <label>结束时间: </label><input class="easyui-datetimebox"
-							data-options="showSeconds:false" id="endDate" panelHeight="auto" style="width: 140px" />
+					<div class="choose_options_block" style="padding-left: 5px; float: left; line-height: 32px">
+						<div id="charType_1" style="display: none">
+							<label>开始时间:</label>
+							<input class="easyui-datebox" id="fgpStartDate" style="width: 100px" />
+							<label>结束时间:</label>
+							<input class="easyui-datebox" id="fgpEndDate" style="width: 100px" />
+						</div>
+						<div id="charType_2" style="display: none"><label>日期:</label><input class="easyui-datebox" data-options="editable:false" id="date" style="width: 100px" /></div>
+						<div id="charType_3" style="display: none"><label>年:</label><input id="year" /> <label>月:</label><input id="month" /></div>
+						<div id="charType_4" style="display: none">
+							<label>开始时间: </label><input class="easyui-datetimebox" data-options="showSeconds:false" id="startDate" panelHeight="auto" style="width: 140px" /> <label>结束时间: </label
+							><input class="easyui-datetimebox" data-options="showSeconds:false" id="endDate" panelHeight="auto" style="width: 140px" />
+						</div>
+						<div id="charType_5" style="display: none">
+							<label>日期:</label><input class="easyui-datebox" data-options="editable:false" id="setDate" style="width: 100px" /> <label>开始时间:</label><input id="setTime" />
+							<label>时间间隔:</label>
+							<select class="easyui-combobox" id="splitHour" panelHeight="80px" style="width: 100px">
+								<option value="1">1小时</option>
+								<option value="2">2小时</option>
+								<option value="3">3小时</option>
+							</select>
+						</div>
 					</div>
-					<div id="charType_5" style="display: none">
-						<label>日期:</label><input class="easyui-datebox" data-options="editable:false" id="setDate"
-							style="width: 100px" /> <label>开始时间:</label><input id="setTime" />
-						<label>时间间隔:</label>
-						<select class="easyui-combobox" id="splitHour" panelHeight="80px" style="width: 100px">
-							<option value="1">1小时</option>
-							<option value="2">2小时</option>
-							<option value="3">3小时</option>
-						</select>
+					<div style="padding-left: 5px; float: left; line-height: 32px">
+						<a id="btnOK">确定</a>
+						<a id="btnExport">导出Excel</a>
 					</div>
 				</div>
-				<div style="padding-left: 5px; float: left; line-height: 32px">
-					<a id="btnOK">确定</a>
-					<a id="btnExport">导出Excel</a>
+				<div id="tab-container" style="width: 100%; height: 90%">
+					<table id="monitorDetail"></table>
 				</div>
 			</div>
-			<div id="tab-container" style="width: 100%; height: 90%">
-				<table id="monitorDetail"></table>
-			</div>
 		</div>
-	</div>
-	<form action="" id="mainForm">
-		<input id="formstartDate" name="startDate" type="hidden" />
-		<input id="formendDate" name="endDate" type="hidden" />
-		<input id="formdata" name="gridData" type="hidden" />
-		<input id="columnName" name="columnName" style="display: none" />
-	</form>
-	<script src="/electricstatistics/electric_statistics.js" type="text/javascript"></script>
-</body>
-
-</html>
+		<form action="" id="mainForm">
+			<input id="formstartDate" name="startDate" type="hidden" />
+			<input id="formendDate" name="endDate" type="hidden" />
+			<input id="formdata" name="gridData" type="hidden" />
+			<input id="columnName" name="columnName" style="display: none" />
+		</form>
+		<script src="/electricstatistics/electric_statistics.js" type="text/javascript"></script>
+	</body>
+</html>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 460 - 371
VbdsmUI_V2.1.1/src/pc/powerservice/electricstatistics/electric_statistics.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است