Browse Source

classic切换desktop

klzhangweiya 2 years ago
parent
commit
e34faecc24

+ 104 - 96
VbdsmUI_V2.1.1/src/pc/manage/classic.html

@@ -1,118 +1,126 @@
-<!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" id="favicon" rel="Shortcut Icon" />
-		<link href="/css/mainvb.css" rel="stylesheet" />
-		<link href="http://static.shvber.com/css/font-awesome/css/font-awesome.css" rel="stylesheet" />
-		<!--[if IE 7]>
+
+<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" id="favicon" rel="Shortcut Icon" />
+	<link href="/css/mainvb.css" rel="stylesheet" />
+	<link href="http://static.shvber.com/css/font-awesome/css/font-awesome.css" rel="stylesheet" />
+	<!--[if IE 7]>
 			<link rel="stylesheet" href="http://static.shvber.com/css/font-awesome/css/font-awesome-ie7.css" />
 		<![endif]-->
-		<link href="http://static.shvber.com/js/lib/easyui/themes/bootstrap/easyui.css" rel="stylesheet" type="text/css" />
-		<link href="http://static.shvber.com/js/lib/easyui/themes/icon.css" rel="stylesheet" type="text/css" />
+	<link href="http://static.shvber.com/js/lib/easyui/themes/bootstrap/easyui.css" rel="stylesheet" type="text/css" />
+	<link href="http://static.shvber.com/js/lib/easyui/themes/icon.css" rel="stylesheet" type="text/css" />
+
+	<style>
+		.icon-empty {
+			background: none;
+			width: 0px;
+		}
 
-		<style>
-			.icon-empty {
-				background: none;
-				width: 0px;
-			}
-			#logo-title {
-			}
-		</style>
-		<script charset="UTF-8" type="text/javascript"></script>
-	</head>
+		#logo-title {}
+	</style>
+	<script charset="UTF-8" type="text/javascript"></script>
+</head>
 
-	<body oncontextmenu="return false;" style="overflow: hidden">
-		<span class="menu_minimalize"></span>
-		<div class="easyui-layout" fit="true" id="cc">
-			<div class="easyui-layout-north" data-options="region:'north'" id="head_div" oncontextmenu="return false;" onselectstart="return false;" style="height: 62px; overflow: hidden">
-				<div class="header" style="width: 100%; height: 100%">
-					<div class="right_navbar">
-						<!--<a id="toDesktopBtn" class="easyui-linkbutton">切换到桌面版</a>-->
-						<div class="weatherWX" id="weatherWX"></div>
-						<!-- <div class="portrait">
+<body oncontextmenu="return false;" style="overflow: hidden">
+	<span class="menu_minimalize"></span>
+	<div class="easyui-layout" fit="true" id="cc">
+		<div class="easyui-layout-north" data-options="region:'north'" id="head_div" oncontextmenu="return false;"
+			onselectstart="return false;" style="height: 62px; overflow: hidden">
+			<div class="header" style="width: 100%; height: 100%">
+				<div class="right_navbar">
+					<!--<a id="toDesktopBtn" class="easyui-linkbutton">切换到桌面版</a>-->
+					<div class="weatherWX" id="weatherWX"></div>
+					<!-- <div class="portrait">
 							<a><img src="css/img/head.png" /></a>
 							<ul>
 								<li data-target="#myModal" data-toggle="modal">关于我们</li>
 							</ul>
 						</div> -->
-						<a class="monitoringSite" href="#">
-							<span class="text">监测点运行情况</span>
-							<div class="message">
-								<h3>监测点运行情况</h3>
-								<div class="panel">
-									<div class="column"><label>总数(个)</label></div>
-									<div class="column"><label>离线(个)</label></div>
-									<div class="column"><span class="num total">0</span></div>
-									<div class="column">
-										<span class="num outline" data-target="#monitorModal" data-toggle="modal">0</span>
-									</div>
-									<div class="remark"></div>
+					<a class="monitoringSite" href="#">
+						<span class="text">监测点运行情况</span>
+						<div class="message">
+							<h3>监测点运行情况</h3>
+							<div class="panel">
+								<div class="column"><label>总数(个)</label></div>
+								<div class="column"><label>离线(个)</label></div>
+								<div class="column"><span class="num total">0</span></div>
+								<div class="column">
+									<span class="num outline" data-target="#monitorModal" data-toggle="modal">0</span>
 								</div>
+								<div class="remark"></div>
 							</div>
-						</a>
-						<!-- <a class="bigScreen" href="">适控观象台</a> -->
-						<div class="setting"><a id="basicBtn" src="setting.html?system">个人设置</a></div>
-						<a class="log-out" id="logoutBtn">退出登录</a>
-					</div>
-					<div id="logo-title" class="title" style="display: flex; align-items: center; height: 100%">
-						<img src="/images/shvber.com.logo.png" style="height: 40px; width: auto; margin-left: 20px" alt="" />
-						<h4></h4>
-					</div>
+						</div>
+					</a>
+					<a class="convertDesk" href="desktop.html" title="切换到桌面版">切换到桌面版</a>
+					<div class="setting"><a id="basicBtn" src="setting.html?system">个人设置</a></div>
+					<a class="log-out" id="logoutBtn">退出登录</a>
+				</div>
+				<div id="logo-title" class="title" style="display: flex; align-items: center; height: 100%">
+					<img src="/images/shvber.com.logo.png" style="height: 40px; width: auto; margin-left: 20px" alt="" />
+					<h4></h4>
 				</div>
 			</div>
-			<div class="easyui-layout-west left-menu" data-options="region:'west',split:false" id="layout-menu" oncontextmenu="return false;" onselectstart="return false;" style="width: 280px; height: 100%">
-				<div class="_panel-box">
-					<div class="search_kuang">
-						<input class="form-control" id="input-expand-node" placeholder="搜索" type="input" />
-					</div>
-					<div id="menu"></div>
+		</div>
+		<div class="easyui-layout-west left-menu" data-options="region:'west',split:false" id="layout-menu"
+			oncontextmenu="return false;" onselectstart="return false;" style="width: 280px; height: 100%">
+			<div class="_panel-box">
+				<div class="search_kuang">
+					<input class="form-control" id="input-expand-node" placeholder="搜索" type="input" />
 				</div>
+				<div id="menu"></div>
 			</div>
-			<div class="easyui-layout-center" data-options="region:'center'" id="layout-content">
-				<div class="easyui-tabs" fit="true" id="tab">
-					<!-- <div title="欢迎页" style="padding:10px;">
+		</div>
+		<div class="easyui-layout-center" data-options="region:'center'" id="layout-content">
+			<div class="easyui-tabs" fit="true" id="tab">
+				<!-- <div title="欢迎页" style="padding:10px;">
                        欢迎登录铂沅能源管理平台在线监测平台
                 </div> -->
-				</div>
 			</div>
 		</div>
-		<!--企业信息弹出框-->
-		<div aria-hidden="true" aria-labelledby="myModalLabel" class="popup fade" id="myModal" role="dialog" style="display: none" tabindex="-1">
-			<div class="modal-header">
-				<a aria-hidden="true" class="close" data-dismiss="modal"></a>
-				<h3 id="myModalLabel"></h3>
-			</div>
-			<div class="modal-body"></div>
+	</div>
+	<!--企业信息弹出框-->
+	<div aria-hidden="true" aria-labelledby="myModalLabel" class="popup fade" id="myModal" role="dialog"
+		style="display: none" tabindex="-1">
+		<div class="modal-header">
+			<a aria-hidden="true" class="close" data-dismiss="modal"></a>
+			<h3 id="myModalLabel"></h3>
 		</div>
-		<!--监测点离线列表-->
-		<div aria-hidden="true" aria-labelledby="myModalLabel" class="popup min-popup fade" id="monitorModal" role="dialog" style="display: none" tabindex="-1">
-			<div class="modal-header mini-header">
-				<a aria-hidden="true" class="close" data-dismiss="modal"></a>
-				<h3 id="monitorLabel"></h3>
-			</div>
-			<div class="modal-body">
-				<iframe frameborder="0" height="400px" scrolling="no" src="plugin/monitor_state/outline_list.html" width="100%"></iframe>
-			</div>
+		<div class="modal-body"></div>
+	</div>
+	<!--监测点离线列表-->
+	<div aria-hidden="true" aria-labelledby="myModalLabel" class="popup min-popup fade" id="monitorModal" role="dialog"
+		style="display: none" tabindex="-1">
+		<div class="modal-header mini-header">
+			<a aria-hidden="true" class="close" data-dismiss="modal"></a>
+			<h3 id="monitorLabel"></h3>
 		</div>
-		<script src="http://static.shvber.com/js/lib/jquery-1.8.0.min.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/lib/jquery.query-2.1.7.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/lib/easyui/jquery.easyui.min.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/lib/easyui/locale/easyui-lang-zh_CN.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/easyui.support.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/common.tools.js" type="text/javascript"></script>
-		<script src="http://static.shvber.com/js/util.js" type="text/javascript"></script>
-		<script>
-			var cid = $.query.get('auth_cid')
-			$('body').append('<script src="/system/lang/explorer/config.json?script=1&auth_cid=' + cid + '"><\/script>')
-		</script>
-		<script src="/js/bootstrap-treeview.min.js" type="text/javascript"></script>
-		<script src="/js/classic.util.js" type="text/javascript"></script>
-		<script src="/js/yi-scroll.js" type="text/javascript"></script>
-		<script src="/js/underscore.js" type="text/javascript"></script>
-		<script src="/js/bootstrap.min.js" type="text/javascript"></script>
-		<script src="./plugin/weather/index.js" type="text/javascript"></script>
-	</body>
-</html>
+		<div class="modal-body">
+			<iframe frameborder="0" height="400px" scrolling="no" src="plugin/monitor_state/outline_list.html"
+				width="100%"></iframe>
+		</div>
+	</div>
+	<script src="http://static.shvber.com/js/lib/jquery-1.8.0.min.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/lib/jquery.query-2.1.7.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/lib/easyui/jquery.easyui.min.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/lib/easyui/locale/easyui-lang-zh_CN.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/easyui.support.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/common.tools.js" type="text/javascript"></script>
+	<script src="http://static.shvber.com/js/util.js" type="text/javascript"></script>
+	<script>
+		var cid = $.query.get('auth_cid')
+		$('body').append('<script src="/system/lang/explorer/config.json?script=1&auth_cid=' + cid + '"><\/script>')
+	</script>
+	<script src="/js/bootstrap-treeview.min.js" type="text/javascript"></script>
+	<script src="/js/classic.util.js" type="text/javascript"></script>
+	<script src="/js/yi-scroll.js" type="text/javascript"></script>
+	<script src="/js/underscore.js" type="text/javascript"></script>
+	<script src="/js/bootstrap.min.js" type="text/javascript"></script>
+	<script src="./plugin/weather/index.js" type="text/javascript"></script>
+</body>
+
+</html>

BIN
VbdsmUI_V2.1.1/src/pc/manage/css/img/convert.png


+ 191 - 5
VbdsmUI_V2.1.1/src/pc/manage/css/mainvb.css

@@ -1,8 +1,10 @@
 @import 'bootstrap.min.css';
+
 body {
 	background-color: #e9ebee;
 	position: relative;
 }
+
 .menu_minimalize {
 	display: inline-block;
 	width: 20px;
@@ -19,25 +21,31 @@ body {
 	-webkit-transition: all 0.2s;
 	-o-transition: all 0.2s;
 }
+
 .menu-expand {
 	background: url(img/arrow-right.png) no-repeat left top;
 }
+
 .panel {
 	box-shadow: none !important;
 	background-color: transparent !important;
 }
+
 .panel-body-noheader {
 	border-top: none !important;
 }
+
 .window.messager-window {
 	border: 1px solid #1f449a;
 	padding: 0;
 }
+
 .window-shadow {
 	display: none !important;
 	background: transparent !important;
 	box-shadow: none;
 }
+
 .window.messager-window .panel-header {
 	background: #3399ff;
 	padding: 5px 10px;
@@ -47,12 +55,15 @@ body {
 .window.messager-window .panel-header .panel-title {
 	color: #fff;
 }
+
 .window.messager-window .messager-question {
 	background: url('./img/help.png');
 }
-.window.messager-window .messager-question + div {
+
+.window.messager-window .messager-question+div {
 	margin-top: 10px;
 }
+
 .window.messager-window .messager-button .l-btn {
 	color: #fff;
 	background: #1f449a;
@@ -60,36 +71,44 @@ body {
 	border: 1px solid #ddd;
 	outline: none;
 }
+
 .window.messager-window .messager-button .l-btn:hover {
 	background: #3399ff;
 	color: #fff;
 	border: 1px solid #ddd;
 	filter: none;
 }
+
 .layout-expand-west {
 	box-shadow: 2px 0 2px 0 rgba(194, 195, 197, 0.5) !important;
 	background-color: #f2f3f5 !important;
 }
+
 .layout-panel-north {
 	overflow: visible !important;
 }
+
 .layout-panel-north .easyui-layout-north {
 	overflow: visible !important;
 }
+
 .layout-panel-north .easyui-layout-north .header {
 	background-image: linear-gradient(41deg, #1f449a 0%, #1f449a 30%, #279099 70%, #27b484 100%);
 	color: #ffffff;
 	line-height: 62px;
 }
+
 .layout-panel-north .easyui-layout-north .header .title {
 	margin-right: 30px;
 	min-width: 265px;
 	float: left;
 }
+
 .layout-panel-north .easyui-layout-north .header .title h4 {
 	line-height: 42px;
 	margin-left: 16px;
 }
+
 .layout-panel-north .easyui-layout-north .header .navbar_minimalize {
 	display: inline-block;
 	width: 16px;
@@ -99,27 +118,32 @@ body {
 	margin-top: 24px;
 	margin-left: 5px;
 }
+
 .layout-panel-north .easyui-layout-north .header .logo {
 	float: left;
 	margin-top: 15px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar {
 	float: right;
 	padding-right: 30px;
 	vertical-align: middle;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait {
 	float: left;
 	margin-top: 13px;
 	overflow: hidden;
 	position: relative;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait a {
 	width: 36px;
 	display: block;
 	cursor: pointer;
 	margin-bottom: 6px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait ul {
 	width: 120px;
 	position: absolute;
@@ -131,6 +155,7 @@ body {
 	border-radius: 2px;
 	padding: 5px 0;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait ul li {
 	list-style: none;
 	line-height: 32px;
@@ -139,10 +164,12 @@ body {
 	font-size: 14px;
 	cursor: pointer;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait ul li:hover,
 .layout-panel-north .easyui-layout-north .header .right_navbar .portrait ul li.selected {
 	background-color: #e9ebee;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite {
 	display: none;
 	width: 22px;
@@ -154,12 +181,14 @@ body {
 	background: url(img/monitoring_site.png) no-repeat center top;
 	position: relative;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .text {
 	text-indent: -1000px;
 	display: block;
 	overflow: hidden;
 	height: 22px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message {
 	width: 158px;
 	position: absolute;
@@ -170,6 +199,7 @@ body {
 	box-shadow: 0 0 6px 0 rgba(194, 195, 197, 0.5);
 	border-radius: 4px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message h3 {
 	height: 39px;
 	font-size: 16px;
@@ -189,13 +219,16 @@ body {
 	background: linear-gradient(62deg, #f5576c 0%, #f093fb 100%);
 	/* 标准的语法 */
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel {
 	padding: 10px 16px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel .column {
 	width: 50px;
 	float: left;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel .column label {
 	font-size: 10px;
 	color: #666666;
@@ -203,6 +236,7 @@ body {
 	font-weight: normal;
 	margin-bottom: 0;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel .column .num {
 	font-size: 16px;
 	color: #ff5851;
@@ -211,35 +245,41 @@ body {
 	margin-bottom: 5px;
 	font-weight: bold;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel .column:nth-child(odd) {
 	width: 68px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite .message .panel .remark {
 	font-size: 10px;
 	color: #666666;
 	line-height: 20px;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .monitoringSite:hover {
 	height: 40px;
 	overflow: visible;
 }
-.layout-panel-north .easyui-layout-north .header .right_navbar .bigScreen {
+
+.layout-panel-north .easyui-layout-north .header .right_navbar .convertDesk {
 	width: 22px;
 	height: 22px;
-	display: none;
+	/* display: none; */
 	float: left;
 	text-indent: -20000px;
 	overflow: hidden;
 	margin-left: 30px;
 	margin-top: 20px;
-	background: url(img/bigScreen.png) no-repeat center center;
+	background: url(img/convert.png) no-repeat center center;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting {
 	margin-left: 30px;
 	margin-top: 18px;
 	float: left;
 	position: relative;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting a {
 	width: 25px;
 	height: 25px;
@@ -249,6 +289,7 @@ body {
 	overflow: hidden;
 	cursor: pointer;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting .dropdown {
 	width: 120px;
 	display: none;
@@ -262,6 +303,7 @@ body {
 	border-radius: 2px;
 	padding: 5px 0;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting .dropdown li {
 	list-style: none;
 	line-height: 32px;
@@ -270,10 +312,12 @@ body {
 	font-size: 14px;
 	cursor: pointer;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting .dropdown li:hover,
 .layout-panel-north .easyui-layout-north .header .right_navbar .setting .dropdown li.selected {
 	background-color: #e9ebee;
 }
+
 .layout-panel-north .easyui-layout-north .header .right_navbar .log-out {
 	display: block;
 	float: left;
@@ -286,6 +330,7 @@ body {
 	margin-top: 18px;
 	cursor: pointer;
 }
+
 .layout-panel-west {
 	background-color: #e9ebee;
 	border-right: none !important;
@@ -297,6 +342,7 @@ body {
 	-o-transition: width 0.2s;
 	/* Opera */
 }
+
 .layout-panel-west .left-menu {
 	background-color: #131313 !important;
 	background-image: linear-gradient(41deg, #1f449a 0%, #1f449a 10%, #279099 70%, #27b484 100%);
@@ -305,10 +351,12 @@ body {
 	color: #eee;
 	position: relative;
 }
+
 .layout-panel-west .left-menu .search_kuang {
 	width: 228px;
 	margin: 30px auto 20px;
 }
+
 .layout-panel-west .left-menu .search_kuang .form-control {
 	border-radius: 20px;
 	height: 32px;
@@ -316,6 +364,7 @@ body {
 	background-position: 15px center;
 	padding-left: 45px;
 }
+
 .layout-panel-west .left-menu .list-group-item {
 	background-color: transparent;
 	border: none;
@@ -327,20 +376,24 @@ body {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+
 .layout-panel-west .left-menu .list-group-item:hover {
 	font-weight: 600;
 	color: #fff;
 	background-color: transparent;
 	background-image: linear-gradient(41deg, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
 }
+
 .layout-panel-west .left-menu .list-group-item.node-selected {
 	background-color: #1f449a !important;
 	color: #ffffff !important;
 }
+
 .layout-panel-west .left-menu .list-group-item.node-selected:hover {
 	background-color: #1f449a !important;
 	color: #ffffff !important;
 }
+
 .layout-panel-west .left-menu .list-group-item a {
 	text-decoration: none;
 }
@@ -353,20 +406,24 @@ body {
 	height: 20px;
 	vertical-align: middle;
 }
+
 .layout-panel-west .left-menu .list-group-item .expand-icon {
 	font-size: 12px;
 	line-height: 20px;
 	color: #91959e;
 	width: 12px;
 }
+
 .layout-panel-west .left-menu .list-group-item .menu-right {
 	background: url(img/menu-right.png) no-repeat center center;
 	height: 20px;
 }
+
 .layout-panel-west .left-menu .list-group-item .menu-down {
 	background: url(img/menu-down.png) no-repeat center center;
 	height: 20px;
 }
+
 .layout-panel-west .left-menu .list-group-item .sub-icon {
 	width: 20px;
 	height: 20px;
@@ -374,41 +431,51 @@ body {
 	vertical-align: middle;
 	/* margin-right: 14px; */
 }
+
 .layout-panel-west .left-menu .node-selected {
 	font-weight: bold;
 }
+
 .tabs-header {
 	background-color: white !important;
 }
+
 .layout-panel-center {
 	background-color: #e9ebee;
 	padding-top: 0px;
 	padding-right: 0px;
 	padding-bottom: 0px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header {
 	height: 50px;
 	border: none;
 	padding-top: 0;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs-scroller-left {
 	border-top: 0px;
 	border-left: 0px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs-scroller-right {
 	border-top: 0px;
 	border-right: 0px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs {
 	height: 50px !important;
 	padding-left: 0;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li {
 	margin-right: 0px !important;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li:first-child a.tabs-inner {
 	border-left: none;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-inner {
 	height: 50px !important;
 	line-height: 50px !important;
@@ -419,18 +486,22 @@ body {
 	padding: 0 20px;
 	padding-right: 36px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-inner .tabs-title {
 	font-size: 14px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-inner .tabs-closable {
 	padding-right: 10px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-inner:hover {
 	background: none !important;
 	/* color: #1bb0a2 !important; */
 	color: #2ca3f6 !important;
 	font-weight: 600;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-close {
 	background: url(img/close.png) no-repeat center center;
 	text-decoration: none;
@@ -440,6 +511,7 @@ body {
 	height: 16px;
 	right: 20px;
 }
+
 /* .layout-panel-center .easyui-layout-center .tabs-header .tabs a.tabs-close::before {
 	content: "x";
 	color: #eee;
@@ -450,35 +522,45 @@ body {
 .layout-panel-center .easyui-layout-center .tabs-header .tabs a:hover.tabs-close::before {
 	color: #fff;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li.tabs-selected a.tabs-inner {
 	/* color: rgba(0, 0, 0, 0.85); */
 	color: #1f449a;
 	font-weight: 600;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li.tabs-selected a.tabs-close {
 	background: url(img/close.png) no-repeat center center;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li:first-child a.tabs-inner {
 	padding-right: 20px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-header .tabs li:first-child a.tabs-inner .tabs-closable {
 	padding-right: 0px;
 }
+
 .layout-panel-center .easyui-layout-center .tabs-panels {
 	background-color: #f7f7f7 !important;
 }
+
 .mini-navbar .layout-panel-west .search_kuang {
 	display: none;
 }
+
 .mini-navbar .layout-panel-west .treeview {
 	padding-top: 30px;
 }
+
 .mini-navbar .layout-panel-west .treeview .list-group-item {
 	padding-left: 20px;
 }
+
 .mini-navbar .layout-panel-west .treeview .list-group-item .expand-icon {
 	display: none;
 }
+
 .popup {
 	position: fixed;
 	top: 25%;
@@ -495,11 +577,13 @@ body {
 	-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 	box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 }
+
 .popup .modal-header {
 	border-bottom: none;
 	height: 130px;
 	background: url(img/popup_head.png) no-repeat;
 }
+
 .popup .modal-header .close {
 	width: 28px;
 	height: 28px;
@@ -509,6 +593,7 @@ body {
 	margin-top: -9px;
 	margin-right: -9px;
 }
+
 .popup .modal-header h3 {
 	margin-top: 0;
 	margin-bottom: 0;
@@ -517,9 +602,11 @@ body {
 	color: #fff;
 	text-align: center;
 }
+
 .popup .modal-body {
 	padding: 20px 20px 36px;
 }
+
 .popup .modal-body .title {
 	font-size: 20px;
 	color: #666666;
@@ -527,21 +614,26 @@ body {
 	line-height: 28px;
 	margin-top: 0;
 }
+
 .popup .modal-body .table01 td {
 	color: #777777;
 	font-size: 14px;
 	line-height: 22px;
 }
+
 .popup .modal-body .table02 td {
 	padding-left: 10px;
 }
+
 .popup .modal-body .table02 th {
 	padding-left: 10px;
 }
+
 .min-popup {
 	width: 540px;
 	margin-left: -270px;
 }
+
 .min-popup .mini-header {
 	height: 50px;
 	background-image: none;
@@ -549,383 +641,477 @@ body {
 	border-top-left-radius: 5px;
 	border-top-right-radius: 5px;
 }
+
 .min-popup .mini-header h3 {
 	line-height: 20px;
 	font-size: 16px;
 	color: #fff;
 	text-align: left;
 }
+
 .weatherWX {
 	float: left;
 	position: relative;
 	font-size: 15px;
 	margin-right: 32px;
 }
+
 .icon-dataCenter {
 	background: url(img/ydgk.png) no-repeat;
 }
+
 .icon-controlPanel {
 	background: url(img/xqxyyazd.png) no-repeat;
 }
+
 .icon-statisticalAnalysis {
 	background: url(img/dnzx.png) no-repeat;
 }
+
 .icon-analyticalTools {
 	background: url(img/nxhqghyfzqsfx.png) no-repeat;
 }
+
 /**/
 .icon-zbdc {
 	background: url(img/zbdctj.png) no-repeat;
 	/*自备电厂统计icon*/
 }
+
 .icon-dqydl {
 	background: url(img/dqydltj.png) no-repeat;
 	/*地区用电量统计*/
 }
+
 .icon-dqfhfb {
 	background: url(img/dqfh.png) no-repeat;
 	/*地区负荷分布*/
 }
+
 .icon-nhfb {
 	background: url(img/nhfb.png) no-repeat;
 	/*能耗分布图*/
 }
+
 .icon-ttdcfdnl {
 	background: url(img/fdnlfb.png) no-repeat;
 	/*统调电厂发电能力分布图*/
 }
+
 .icon-xnyfdnlfbt {
 	background: url(img/xnyfdnlfbt.png) no-repeat;
 	/*新能源发电能力发布图*/
 }
+
 .icon-dlfhfb {
 	background: url(img/dlfhfb.png) no-repeat;
 	/*电力负荷分布图*/
 }
+
 .icon-ptyx {
 	background: url(img/ptyx.png) no-repeat;
 	/*平台运行*/
 }
+
 .icon-dqfhbd {
 	background: url(img/dqfhbd.png) no-repeat;
 	/*地区负荷波动数据*/
 }
+
 .icon-hyfhbd {
 	background: url(img/hyfhbd.png) no-repeat;
 	/*行业负荷波动数据*/
 }
+
 .icon-ydgk {
 	background: url(img/ydgk.png) no-repeat;
 	/*用电概况*/
 }
+
 .icon-dnzx {
 	background: url(img/dnzx.png) no-repeat;
 	/*电能在线*/
 }
+
 .icon-ysss {
 	background: url(img/ysss.png) no-repeat;
 	/*用水实时*/
 }
+
 .icon-yqzx {
 	background: url(img/yqzx.png) no-repeat;
 	/*用气在线*/
 }
+
 .icon-nyztt {
 	background: url(img/nyztt.png) no-repeat;
 	/*能源组态图*/
 }
+
 /**/
 .icon-hyjjrfg {
 	background: url(img/hyjjrfg.png) no-repeat;
 	/*行业节假日复工分析*/
 }
+
 .icon-fhtz {
 	background: url(img/fhtz.png) no-repeat;
 	/*负荷特征分析*/
 }
+
 .icon-dqydfh {
 	background: url(img/dqydfh.png) no-repeat;
 	/*地区用电负荷统计*/
 }
+
 .icon-hyyd {
 	background: url(img/hyyd.png) no-repeat;
 	/*行业用电分析*/
 }
+
 .icon-cyczxg {
 	background: url(img/cyczxg.png) no-repeat;
 	/*产业产值相关分析*/
 }
+
 .icon-sxycyxgx {
 	background: url(img/sxycyxgx.png) no-repeat;
 	/*上下游产业相关性分析*/
 }
+
 .icon-cpkc {
 	background: url(img/cpkc.png) no-repeat;
 	/*产品库存*/
 }
+
 .icon-ylxh {
 	background: url(img/ylxh.png) no-repeat;
 	/*原料消耗*/
 }
+
 .icon-cncl {
 	background: url(img/cncl.png) no-repeat;
 	/*产能产量*/
 }
+
 .icon-dltj {
 	background: url(img/dltj.png) no-repeat;
 	/*电量统计*/
 }
+
 .icon-sjtb {
 	background: url(img/cpcl.png) no-repeat;
 	/*数据填报*/
 }
+
 .icon-cpcl {
 	background: url(img/cpcl.png) no-repeat;
 	/*产品产量*/
 }
+
 .icon-dldc {
 	background: url(img/dldc.png) no-repeat;
 	/*电力电厂*/
 }
+
 .icon-dfcb {
 	background: url(img/dfcb.png) no-repeat;
 	/*电费成本分析*/
 }
+
 .icon-dnfx {
 	background: url(img/dnfx.png) no-repeat;
 	/*电能分析*/
 }
+
 .icon-ysfx {
 	background: url(img/ysfx.png) no-repeat;
 	/*用水分析*/
 }
+
 .icon-yqfx {
 	background: url(img/yqfx.png) no-repeat;
 	/*用气分析*/
 }
+
 .icon-hdsb {
 	background: url(img/hdsbfx.png) no-repeat;
 	/*耗电时比分析*/
 }
+
 .icon-hdlb {
 	background: url(img/hdlbfx.png) no-repeat;
 	/*耗电类比分析*/
 }
+
 .icon-zbgl {
 	background: url(img/zbgl.png) no-repeat;
 	/*指标关联分析*/
 }
+
 .icon-dlydf {
 	background: url(img/dlydf.png) no-repeat;
 	/*电量与电费分析*/
 }
+
 .icon-ydaq {
 	background: url(img/ydaqfx.png) no-repeat;
 	/*用电安全分析*/
 }
+
 .icon-ybfx {
 	background: url(img/ybfx.png) no-repeat;
 	/*月报分析*/
 }
+
 .icon-ydzfhyb {
 	background: url(img/ydzfhyb.png) no-repeat;
 	/*用电总负荷仪表*/
 }
+
 .icon-cpk {
 	background: url(img/cpk.png) no-repeat;
 	/*产品库*/
 }
+
 /**/
 .icon-jcddagl {
 	background: url(img/jcddagl.png) no-repeat;
 	/*监测点档案管理*/
 }
+
 .icon-qysq {
 	background: url(img/qysq.png) no-repeat;
 	/*企业授权*/
 }
+
 .icon-djgl {
 	background: url(img/djgl.png) no-repeat;
 	/*电价管理*/
 }
+
 .icon-ydsdgl {
 	background: url(img/ydsdgl.png) no-repeat;
 	/*用电时段管理*/
 }
+
 .icon-qyydsdgl {
 	background: url(img/qyydsdgl.png) no-repeat;
 	/*区域用电时段管理*/
 }
+
 .icon-cpgl {
 	background: url(img/cpgl.png) no-repeat;
 	/*产品管理*/
 }
+
 .icon-hydy {
 	background: url(img/hydy.png) no-repeat;
 	/*行业定义*/
 }
+
 .icon-khgl {
 	background: url(img/khgl.png) no-repeat;
 	/*客户管理*/
 }
+
 .icon-fwjggl {
 	background: url(img/fwjggl.png) no-repeat;
 	/*服务机构管理*/
 }
+
 .icon-dnfw {
 	background: url(img/dnfw.png) no-repeat;
 	/*电能服务*/
 }
+
 .icon-yhgl {
 	background: url(img/yhgl.png) no-repeat;
 	/*用户管理*/
 }
+
 .icon-cdgl {
 	background: url(img/cdgl.png) no-repeat;
 	/*菜单管理*/
 }
+
 .icon-qyhysd {
 	background: url(img/qyhysd.png) no-repeat;
 	/*区域行业设定*/
 }
+
 .icon-xxts {
 	background: url(img/xxts.png) no-repeat;
 	/*消息推送*/
 }
+
 .icon-qyztsz {
 	background: url(img/qyztsz.png) no-repeat;
 	/*企业状态设置*/
 }
+
 .icon-ywbdsz {
 	background: url(img/ywbdsz.png) no-repeat;
 	/*运维宝典设置*/
 }
+
 .icon-fhbdsz {
 	background: url(img/fhbdsz.png) no-repeat;
 	/*负荷波动设置*/
 }
+
 .icon-ywbd {
 	background: url(img/ywbd.png) no-repeat;
 	/*运维宝典*/
 }
+
 .icon-bbgl {
 	background: url(img/bbgl.png) no-repeat;
 	/*报表管理*/
 }
+
 /**/
 .icon-sbgl {
 	background: url(img/sbgl.png) no-repeat;
 	/*设备管理*/
 }
+
 .icon-zfkzl {
 	background: url(img/zfkzl.png) no-repeat;
 	/*住房空置率*/
 }
+
 .icon-jjrsz {
 	background: url(img/jjrsz.png) no-repeat;
 	/*节假日设置*/
 }
+
 .icon-cpjg {
 	background: url(img/cpjg.png) no-repeat;
 	/*产品价格*/
 }
+
 .icon-dlzjjy {
 	background: url(img/dlzjjy.png) no-repeat;
 	/*电力直接交易*/
 }
+
 .icon-gwkh {
 	background: url(img/gwkh.png) no-repeat;
 	/*工位考核*/
 }
+
 .icon-scxkh {
 	background: url(img/scxkh.png) no-repeat;
 	/*生产线考核*/
 }
+
 .icon-cjkh {
 	background: url(img/cjkh.png) no-repeat;
 	/*车间考核*/
 }
+
 .icon-bckh {
 	background: url(img/bckh.png) no-repeat;
 	/*班次考核*/
 }
+
 .icon-dlzjjygl {
 	background: url(img/dlzjjygl.png) no-repeat;
 	/*电力直接交易管理*/
 }
+
 .icon-yqgl {
 	background: url(img/yqgl.png) no-repeat;
 	/*园区管理*/
 }
+
 .icon-nyzthz {
 	background: url(img/nyzthz.png) no-repeat;
 	/*能源组态绘制*/
 }
+
 .icon-xqxyyazd {
 	background: url(img/xqxyyazd.png) no-repeat;
 	/*需求相应预案制定*/
 }
+
 .icon-xqxyyazx {
 	background: url(img/xqxyyazx.png) no-repeat;
 	/*需求相应预案执行*/
 }
+
 .icon-ylkgl {
 	background: url(img/ylkgl.png) no-repeat;
 	/*原料库管理*/
 }
+
 .icon-hycpgl {
 	background: url(img/hycpgl.png) no-repeat;
 	/*行业产品管理*/
 }
+
 .icon-ssgj {
 	background: url(img/ssgj.png) no-repeat;
 	/*实时告警*/
 }
+
 .icon-ssgjcssz {
 	background: url(img/ssgjcssz.png) no-repeat;
 	/*实时告警参数设置*/
 }
+
 .icon-zjzzzsd {
 	background: url(img/zjzzzsd.png) no-repeat;
 	/*增加值增长速度*/
 }
+
 .icon-hycllr {
 	background: url(img/hycllr.png) no-repeat;
 	/*行业产量录入*/
 }
+
 .icon-zjjysjlr {
 	background: url(img/zjjysjlr.png) no-repeat;
 	/*直接交易数据录入和修改*/
 }
+
 .icon-nxhqghyfzqsfx {
 	background: url(img/nxhqghyfzqsfx.png) no-repeat;
 	/*江苏和全国行业发展趋势分析*/
 }
+
 .icon-czyzjz {
 	background: url(img/czyzjz.png) no-repeat;
 	/*产值与增加值*/
 }
+
 .icon-ycscqyfx {
 	background: url(img/ycscqyfx.png) no-repeat;
 	/*异常生产企业分析*/
 }
+
 .icon-jcqk {
 	background: url(img/jcqk.png) no-repeat;
 	/*监测情况*/
 }
+
 .icon-hysjck {
 	background: url(img/hysjck.png) no-repeat;
 	/*行业数据查看*/
 }
+
 .icon-ssgjyclxq {
 	background: url(img/ssgjyclxq.png) no-repeat;
 	/*实时告警已处理详情*/
 }
+
 .icon-fdsjck {
 	background: url(img/fdsjck.png) no-repeat;
 	/*发电数据查看*/
 }
+
 .icon-fdzjrl {
 	background: url(img/fdzjrl.png) no-repeat;
 	/*装机容量*/
-}
+}

+ 93 - 81
VbdsmUI_V2.1.1/src/pc/powerservice/electricstatistics/electric_statistics.html

@@ -1,92 +1,104 @@
-<!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>
 
-		<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>
-					</div>
-					<ul id="monitorTree" style="overflow: hidden"></ul>
+<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>
+
+<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>
-			<!--- 右边内容 -->
-			<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">
-					<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 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>
-					<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 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 style="padding-left: 5px; float: left; line-height: 32px">
-						<a id="btnOK">确定</a>
-						<a id="btnExport">导出Excel</a>
+					<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="tab-container" style="width: 100%; height: 94%">
-					<table id="monitorDetail"></table>
+				<div style="padding-left: 5px; float: left; line-height: 32px">
+					<a id="btnOK">确定</a>
+					<a id="btnExport">导出Excel</a>
 				</div>
 			</div>
+			<div id="tab-container" style="width: 100%; height: 90%">
+				<table id="monitorDetail"></table>
+			</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>
+	</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>

+ 100 - 109
VbdsmUI_V2.1.1/src/pc/powerservice/monitor/frm_monitor.html

@@ -3,103 +3,95 @@
 <script type="text/javascript" src="js/upload.util.js"></script>
 
 <div class="easyui-layout" data-options="fit:true" style="border: 0px">
-		<div data-options="region:'center',width:450" style="padding: 5px;">
-			<form id="powerForm" action="" method="post" enctype="multipart/form-data" target='ajaxResult'>
-				<!-- <fieldset><legend>采集点基本信息</legend> -->
-				<table cellpadding="5">
-					<tr>
-						<td width=100 align=right>名称(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td width=220>
+	<div data-options="region:'center',width:450" style="padding: 5px;">
+		<form id="powerForm" action="" method="post" enctype="multipart/form-data" target='ajaxResult'>
+			<!-- <fieldset><legend>采集点基本信息</legend> -->
+			<table cellpadding="5">
+				<tr>
+					<td width=100 align=right>名称(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td width=220>
 						<input type="hidden" name="id" id="id" />
-						<input
-							class="easyui-textbox" type="text" name="name" id="name"  style="width: 160px;"></input></td>
-						<td width=100 align=right>编号:</td>
-						<td width=220>
-							<input type="hidden" name="parentId" id="parentId" >
-							<div id="parentMonitor" style='display:none'>
-							
-							</div>
-							<input class="easyui-textbox" type="text" id="customizeNo"
-							name="customizeNo" style="width: 160px;"></input>
-						</td>
-					</tr>
-					<tr>
-						<td align=right>接线方式:</td>
-						<td><select class="easyui-combobox" name="wiringWay"
-							id="wiringWay">
-								<option value="1">三相四线</option>
-								<option value="0">三相三线2CT</option>
-								<option value="2">三相三线3CT</option>
-							</select>
-						</td>
-						<td align=right>配网类型:</td>
-						<td><select class="easyui-combobox" name="seeType" panelHeight="100px"
-							id="seeType">
-								<option value="1">变压器</option>
-								<option value="2">虚拟节点</option>
-								<option value="0">配网</option>
-						</select></td>
-					</tr>
-					<tr>
-						<td align=right>监测对象:</td>
-						<td>
-						<select id="monitorObj" name="monitorObj" class="easyui-combobox" style="width: 100px;" panelHeight="auto" >
-										<option value="1" selected="selected">主设备</option>
-										<option value="2">辅设备</option>
+						<input class="easyui-textbox" type="text" name="name" id="name" style="width: 160px;"></input>
+					</td>
+					<td width=100 align=right>编号:</td>
+					<td width=220>
+						<input type="hidden" name="parentId" id="parentId">
+						<div id="parentMonitor" style='display:none'>
+
+						</div>
+						<input class="easyui-textbox" type="text" id="customizeNo" name="customizeNo" style="width: 160px;"></input>
+					</td>
+				</tr>
+				<tr>
+					<td align=right>接线方式:</td>
+					<td><select class="easyui-combobox" name="wiringWay" id="wiringWay">
+							<option value="1">三相四线</option>
+							<option value="0">三相三线2CT</option>
+							<option value="2">三相三线3CT</option>
+						</select>
+					</td>
+					<td align=right>配网类型:</td>
+					<td><select class="easyui-combobox" name="seeType" panelHeight="100px" id="seeType">
+							<option value="1">变压器</option>
+							<option value="2">虚拟节点</option>
+							<option value="0">配网</option>
 						</select></td>
-						<td align=right>电价类型:</td>
-						<td > <input type="radio" name="priceType" value="1" checked />动力
+				</tr>
+				<tr>
+					<td align=right>监测对象:</td>
+					<td>
+						<select id="monitorObj" name="monitorObj" class="easyui-combobox" style="width: 100px;" panelHeight="auto">
+							<option value="1" selected="selected">主设备</option>
+							<option value="2">辅设备</option>
+						</select>
+					</td>
+					<td align=right>电价类型:</td>
+					<td> <input type="radio" name="priceType" value="1" checked />动力
 						<input type="radio" name="priceType" value="2" />照明
-						<input type="radio" name="priceType" value="3" />其它</td>
-						
-					</tr>
-					<tr>
-						<td align=right>是否启用CT:</td>
-						<td>
-							<input type="radio" name="useCt" value="1" checked />是 <input
-								type="radio" name="useCt" value="0" />否</td>
-						<td align=right>CT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td><input class="easyui-textbox" name="ct" id="ct"
-							style="width: 160px;"></input></td>
-							
-					</tr>
-					<tr>
+						<input type="radio" name="priceType" value="3" />其它
+					</td>
+
+				</tr>
+				<tr>
+					<td align=right>是否启用CT:</td>
+					<td>
+						<input type="radio" name="useCt" value="1" checked />是 <input type="radio" name="useCt" value="0" />否
+					</td>
+					<td align=right>CT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td><input class="easyui-textbox" name="ct" id="ct" style="width: 160px;"></input></td>
+
+				</tr>
+				<tr>
 					<td align=right>是否启用PT:</td>
-						<td><input type="radio" name="usePt" value="1" checked />是 <input
-							type="radio" name="usePt" value="0" />否</td>
-						<td align=right>PT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td><input class="easyui-textbox" name="pt" id="pt"
-							style="width: 160px;"></input></td>
-							
-					</tr>
-					<tr>
-						<td align=right>额定功率(容量):</td>
-						<td><input class="easyui-textbox" name="pe" id="pe" value="20000"
-							style="width: 160px;"></input></td>
-						<td align=right>额定电压:</td>
-						<td><input class="easyui-textbox" name="ue" id="ue" value="10000"
-							style="width: 160px;"></input></td>
-							
-					</tr>
-					<tr>
-						<td align=right>监测仪编号:</td>
-						<td><input class="easyui-textbox" name="terminalId"
-							id="terminalId" style="width: 160px;"></input></td>
-						<td align=right>排序号:</td>
-						<td><input class="easyui-textbox" name="orderNum"
-							id="orderNum" style="width: 160px;" value="0"></input></td>
-					</tr>
-					<tr>
-						<td align=right>省平台编号:</td>
-						<td><input class="easyui-textbox" name="tid"
-							id="tid" style="width: 160px;"></input></td>
-						<td align=right>是否显示在网页:</td>
-						<td>
-							<input type="radio" name="displayWeb" value="1" checked />是 
-							<input type="radio" name="displayWeb" value="0" />否
-						</td>
-					</tr>
-					<!-- <tr>
+					<td><input type="radio" name="usePt" value="1" checked />是 <input type="radio" name="usePt" value="0" />否</td>
+					<td align=right>PT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td><input class="easyui-textbox" name="pt" id="pt" style="width: 160px;"></input></td>
+
+				</tr>
+				<tr>
+					<td align=right>额定功率(容量):</td>
+					<td><input class="easyui-textbox" name="pe" id="pe" value="20000" style="width: 160px;"></input></td>
+					<td align=right>额定电压:</td>
+					<td><input class="easyui-textbox" name="ue" id="ue" value="10000" style="width: 160px;"></input></td>
+
+				</tr>
+				<tr>
+					<td align=right>监测仪编号:</td>
+					<td><input class="easyui-textbox" name="terminalId" id="terminalId" style="width: 160px;"
+							readonly="readonly"></input></td>
+					<td align=right>排序号:</td>
+					<td><input class="easyui-textbox" name="orderNum" id="orderNum" style="width: 160px;" value="0"></input></td>
+				</tr>
+				<tr>
+					<td align=right>省平台编号:</td>
+					<td><input class="easyui-textbox" name="tid" id="tid" style="width: 160px;"></input></td>
+					<td align=right>是否显示在网页:</td>
+					<td>
+						<input type="radio" name="displayWeb" value="1" checked />是
+						<input type="radio" name="displayWeb" value="0" />否
+					</td>
+				</tr>
+				<!-- <tr>
 						<td align=right>一次接线图:</td>
 						<td colspan=3>
 							<div class="tab-content">
@@ -119,22 +111,21 @@
 					      </div>
 						</td>
 					</tr> -->
-					<tr>
-						<td align=right>备注:</td>
-						<td colspan=3><input class="easyui-textbox"
-							name="description" id="description" data-options="multiline:true"
+				<tr>
+					<td align=right>备注:</td>
+					<td colspan=3><input class="easyui-textbox" name="description" id="description" data-options="multiline:true"
 							style="width: 400px; height: 100px"></input></td>
-					</tr>
+				</tr>
 
-				</table>
-				<!-- </fieldset> -->
-			</form>
-		</div>
-		<div data-options="region:'south',border:false"
-			style="text-align: right; padding: 5px 0 0;">
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-save'"
-				href="javascript:void(0)" id="saveButton" style="width: 80px">保存</a>
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" href="javascript:void(0)" id="cancelButton"  style="width:80px">取消</a>
-		</div>
+			</table>
+			<!-- </fieldset> -->
+		</form>
+	</div>
+	<div data-options="region:'south',border:false" style="text-align: right; padding: 5px 0 0;">
+		<a class="easyui-linkbutton" data-options="iconCls:'icon-save'" href="javascript:void(0)" id="saveButton"
+			style="width: 80px">保存</a>
+		<a class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" href="javascript:void(0)" id="cancelButton"
+			style="width:80px">取消</a>
 	</div>
-<iframe id="ajaxResult" name="ajaxResult" style="display: none"></iframe>
+</div>
+<iframe id="ajaxResult" name="ajaxResult" style="display: none"></iframe>

+ 101 - 110
VbdsmUI_V2.1.1/src/pc/powerservice/monitor/frm_monitor_modify.html

@@ -2,104 +2,96 @@
 <script type="text/javascript" src="js/form-electric-modify.util.js"></script>
 <script type="text/javascript" src="js/upload.util.js"></script>
 <div class="easyui-layout" data-options="fit:true" style="border: 0px">
-		<div data-options="region:'center',width:450" style="padding: 5px;">
-			<form id="powerForm" action="" method="post" enctype="multipart/form-data" target='ajaxResult'>
-				<!-- <fieldset><legend>采集点基本信息</legend> -->
-				<table cellpadding="5">
-					<tr>
-						<td width=100 align=right>名称(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td width=210>
+	<div data-options="region:'center',width:450" style="padding: 5px;">
+		<form id="powerForm" action="" method="post" enctype="multipart/form-data" target='ajaxResult'>
+			<!-- <fieldset><legend>采集点基本信息</legend> -->
+			<table cellpadding="5">
+				<tr>
+					<td width=100 align=right>名称(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td width=210>
 						<input type="hidden" name="id" id="id" />
-						<input
-							class="easyui-textbox" type="text" name="name" id="name"  style="width: 170px;"></input></td>
-						<td width=100 align=right>编号:</td>
-						<td width=210>
-							<input type="hidden" name="parentId" id="parentId" >
-							<div id="parentMonitor" style='display:none'>
-							
-							</div>
-							<input class="easyui-textbox" type="text" id="customizeNo"
-							name="customizeNo" style="width: 170px;"></input>
-						</td>
-					</tr>
-					<tr>
-						<td align=right>接线方式:</td>
-						<td><select class="easyui-combobox" name="wiringWay"
-							id="wiringWay">
-								<option value="1">三相四线</option>
-								<option value="0">三相三线2CT</option>
-								<option value="2">三相三线3CT</option>
-							</select>
-						</td>
-						<td align=right>配网类型:</td>
-						<td><select class="easyui-combobox" name="seeType" panelHeight="100px"
-							id="seeType">
-								<option value="1">变压器</option>
-								<option value="2">虚拟节点</option>
-								<option value="0">配网</option>
+						<input class="easyui-textbox" type="text" name="name" id="name" style="width: 170px;"></input>
+					</td>
+					<td width=100 align=right>编号:</td>
+					<td width=210>
+						<input type="hidden" name="parentId" id="parentId">
+						<div id="parentMonitor" style='display:none'>
+
+						</div>
+						<input class="easyui-textbox" type="text" id="customizeNo" name="customizeNo" style="width: 170px;"></input>
+					</td>
+				</tr>
+				<tr>
+					<td align=right>接线方式:</td>
+					<td><select class="easyui-combobox" name="wiringWay" id="wiringWay">
+							<option value="1">三相四线</option>
+							<option value="0">三相三线2CT</option>
+							<option value="2">三相三线3CT</option>
+						</select>
+					</td>
+					<td align=right>配网类型:</td>
+					<td><select class="easyui-combobox" name="seeType" panelHeight="100px" id="seeType">
+							<option value="1">变压器</option>
+							<option value="2">虚拟节点</option>
+							<option value="0">配网</option>
 						</select></td>
-					</tr>
-					<tr>
-						<td align=right>监测对象:</td>
-						<td>
+				</tr>
+				<tr>
+					<td align=right>监测对象:</td>
+					<td>
 						<select id="monitorObj" name="monitorObj" class="easyui-combobox" style="width: 100px;" panelHeight="auto">
-										<option value="1" selected="selected">主设备</option>
-										<option value="2">辅设备</option>
-						</select></td>
-						<td align=right>电价类型:</td>
-						<td > <input type="radio" name="priceType" value="1" checked />动力
+							<option value="1" selected="selected">主设备</option>
+							<option value="2">辅设备</option>
+						</select>
+					</td>
+					<td align=right>电价类型:</td>
+					<td> <input type="radio" name="priceType" value="1" checked />动力
 						<input type="radio" name="priceType" value="2" />照明
-						<input type="radio" name="priceType" value="3" />其它</td>
-						
-					</tr>
-					<tr>
-						
-						<td align=right>是否启用CT:</td>
-						<td>
-							<input type="radio" name="useCt" value="1" checked />是 <input
-								type="radio" name="useCt" value="0" />否</td>
-						<td align=right>CT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td><input class="easyui-textbox" name="ct" id="ct"
-							style="width: 170px;"></input></td>
-						
-					</tr>
-					<tr>
-						<td align=right>是否启用PT:</td>
-						<td><input type="radio" name="usePt" value="1" checked />是 <input
-							type="radio" name="usePt" value="0" />否</td>
-						<td align=right>PT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
-						<td><input class="easyui-textbox" name="pt" id="pt"
-							style="width: 170px;"></input></td>
-						
-					</tr>
-					<tr>
-						<td align=right>额定功率(容量):</td>
-						<td><input class="easyui-textbox" name="pe" id="pe" value="20000"
-							style="width: 170px;"></input></td>
-						<td align=right>额定电压:</td>
-						<td><input class="easyui-textbox" name="ue" id="ue" value="10000"
-							style="width: 170px;"></input></td>
-						
-					</tr>
-					<tr>
-						<td align=right>监测仪编号:</td>
-						<td><input class="easyui-textbox" name="terminalId"
-							id="terminalId" style="width: 170px;"></input></td>
-						<td align=right>排序号:</td>
-						<td ><input class="easyui-textbox" name="orderNum"
-							id="orderNum" style="width: 170px;" value="0"></input></td>
-					</tr>
-					<tr>
-						<td align=right>省平台编号:</td>
-						<td><input class="easyui-textbox" name="tid" id="tid"
-							style="width: 170px;"></input></td>
-						<td align=right>是否显示在网页:</td>
-						<td>
-							<input type="radio" name="displayWeb" value="1" checked />是 
-							<input type="radio" name="displayWeb" value="0" />否
-						</td>
-					</tr>
-					<!-- <tr>
+						<input type="radio" name="priceType" value="3" />其它
+					</td>
+
+				</tr>
+				<tr>
+
+					<td align=right>是否启用CT:</td>
+					<td>
+						<input type="radio" name="useCt" value="1" checked />是 <input type="radio" name="useCt" value="0" />否
+					</td>
+					<td align=right>CT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td><input class="easyui-textbox" name="ct" id="ct" style="width: 170px;"></input></td>
+
+				</tr>
+				<tr>
+					<td align=right>是否启用PT:</td>
+					<td><input type="radio" name="usePt" value="1" checked />是 <input type="radio" name="usePt" value="0" />否</td>
+					<td align=right>PT变比(<span style='color:red;font-weight:bold;'>*</span>):</td>
+					<td><input class="easyui-textbox" name="pt" id="pt" style="width: 170px;"></input></td>
+
+				</tr>
+				<tr>
+					<td align=right>额定功率(容量):</td>
+					<td><input class="easyui-textbox" name="pe" id="pe" value="20000" style="width: 170px;"></input></td>
+					<td align=right>额定电压:</td>
+					<td><input class="easyui-textbox" name="ue" id="ue" value="10000" style="width: 170px;"></input></td>
+
+				</tr>
+				<tr>
+					<td align=right>监测仪编号:</td>
+					<td><input class="easyui-textbox" name="terminalId" id="terminalId" style="width: 170px;"
+							readonly="readonly"></input></td>
+					<td align=right>排序号:</td>
+					<td><input class="easyui-textbox" name="orderNum" id="orderNum" style="width: 170px;" value="0"></input></td>
+				</tr>
+				<tr>
+					<td align=right>省平台编号:</td>
+					<td><input class="easyui-textbox" name="tid" id="tid" style="width: 170px;"></input></td>
+					<td align=right>是否显示在网页:</td>
+					<td>
+						<input type="radio" name="displayWeb" value="1" checked />是
+						<input type="radio" name="displayWeb" value="0" />否
+					</td>
+				</tr>
+				<!-- <tr>
 						<td align=right>一次接线图:</td>
 						<td colspan=2>
 							<div class="tab-content">
@@ -121,22 +113,21 @@
 							</div>
 						</td>
 					</tr> -->
-					<tr>
-						<td align=right>备注:</td>
-						<td colspan=2><input class="easyui-textbox"
-							name="description" id="description" data-options="multiline:true"
+				<tr>
+					<td align=right>备注:</td>
+					<td colspan=2><input class="easyui-textbox" name="description" id="description" data-options="multiline:true"
 							style="width: 400px; height: 100px"></input></td>
-					</tr>
+				</tr>
 
-				</table>
-				<!-- </fieldset> -->
-			</form>
-		</div>
-		<div data-options="region:'south',border:false"
-			style="text-align: right; padding: 5px 0 0;">
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-save'"
-				href="javascript:void(0)" id="saveButton" style="width: 80px">保存</a>
-			<a class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" href="javascript:void(0)" id="cancelButton"  style="width:80px">取消</a>
-		</div>
+			</table>
+			<!-- </fieldset> -->
+		</form>
+	</div>
+	<div data-options="region:'south',border:false" style="text-align: right; padding: 5px 0 0;">
+		<a class="easyui-linkbutton" data-options="iconCls:'icon-save'" href="javascript:void(0)" id="saveButton"
+			style="width: 80px">保存</a>
+		<a class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" href="javascript:void(0)" id="cancelButton"
+			style="width:80px">取消</a>
 	</div>
-	<iframe style="display: none" id="ajaxResult" name="ajaxResult"></iframe>
+</div>
+<iframe style="display: none" id="ajaxResult" name="ajaxResult"></iframe>

+ 59 - 44
VbdsmUI_V2.1.1/src/pc/powerservice/monitor/js/form-electric.util.js

@@ -1,33 +1,48 @@
 $(function () {
-	var monitorId = getRecordId("_resultGrid")
-	var monitorName = getRecordName("_resultGrid")
+	var monitorId = getRecordId('_resultGrid')
+	var monitorName = getRecordName('_resultGrid')
 
 	var parentId = -1
 	if (monitorId > 0) {
 		parentId = monitorId
 	}
-	$("#parentId").val(parentId)
-	$("#parentMonitor").html(monitorName)
+	$('#parentId').val(parentId)
+	$('#parentMonitor').html(monitorName)
+	let formatDateTime = () => {
+		var date = new Date()
+		var y = date.getFullYear()
+		var m = date.getMonth() + 1
+		m = m < 10 ? '0' + m : m
+		var d = date.getDate()
+		d = d < 10 ? '0' + d : d
+		var h = date.getHours()
+		var minute = date.getMinutes()
+		var second = date.getSeconds()
+		return y + m + d + h + minute + second
+	}
+	var uuid = formatDateTime() + ('' + parseInt(Math.random() * 1000000) + 1000000).slice(1, 7)
+
+	$('#terminalId').val(uuid)
 
-	$("#saveButton").on("click", function () {
-		if ($("#name").val() == null || $("#name").val() == "") {
-			layer.msg("请输入监测点名称.")
+	$('#saveButton').on('click', function () {
+		if ($('#name').val() == null || $('#name').val() == '') {
+			layer.msg('请输入监测点名称.')
 			return false
 		}
-		if ($("#ct").val() == null || $("#ct").val() == "") {
-			layer.msg("请输入CT变比值.")
+		if ($('#ct').val() == null || $('#ct').val() == '') {
+			layer.msg('请输入CT变比值.')
 			return false
 		}
-		if ($("#pt").val() == null || $("#pt").val() == "") {
-			layer.msg("请输入PT变比值")
+		if ($('#pt').val() == null || $('#pt').val() == '') {
+			layer.msg('请输入PT变比值')
 			return false
 		}
-		if (isNaN($("#ct").val())) {
-			layer.msg("CT请输入数值")
+		if (isNaN($('#ct').val())) {
+			layer.msg('CT请输入数值')
 			return false
 		}
-		if (isNaN($("#pt").val())) {
-			layer.msg("PT请输入数值")
+		if (isNaN($('#pt').val())) {
+			layer.msg('PT请输入数值')
 			return false
 		}
 		/* var url = "/web/monitor/add.json" + $.query.toString()  + "&iframe=1&callback=addSuccess";
@@ -52,26 +67,26 @@ $(function () {
 				}
 			}
 		});*/
-		var name = $("#name").val()
-		var _parentId = $("#parentId").val()
-		var customizeNo = $("#customizeNo").val()
-		var wiringWay = $("#wiringWay").combobox("getValue")
-		var seeType = $("#seeType").combobox("getValue")
-		var monitorObj = $("#monitorObj").combobox("getValue")
+		var name = $('#name').val()
+		var _parentId = $('#parentId').val()
+		var customizeNo = $('#customizeNo').val()
+		var wiringWay = $('#wiringWay').combobox('getValue')
+		var seeType = $('#seeType').combobox('getValue')
+		var monitorObj = $('#monitorObj').combobox('getValue')
 		var priceType = $('input[name="priceType"]:checked').val()
 		var useCt = $('input[name="useCt"]:checked').val()
 		var usePt = $('input[name="usePt"]:checked').val()
-		var ct = $("#ct").val()
-		var pt = $("#pt").val()
-		var pe = $("#pe").val()
-		var ue = $("#ue").val()
-		var terminalId = $("#terminalId").val()
-		var orderNum = $("#orderNum").val()
-		var tid = $("#tid").val()
+		var ct = $('#ct').val()
+		var pt = $('#pt').val()
+		var pe = $('#pe').val()
+		var ue = $('#ue').val()
+		var terminalId = $('#terminalId').val()
+		var orderNum = $('#orderNum').val()
+		var tid = $('#tid').val()
 		//var hasMobile = $('input[name="hasMobile"]:checked').val();
 		var displayWeb = $('input[name="displayWeb"]:checked ').val()
-		var pic = $("#pic").val()
-		var description = $("#description").val()
+		var pic = $('#pic').val()
+		var description = $('#description').val()
 		var data = {}
 		data.name = name
 		data.parentId = _parentId
@@ -93,13 +108,13 @@ $(function () {
 		data.pic = pic
 		data.description = description
 		ajax({
-			url: "/web/monitor/add.json",
-			type: "post",
-			dataType: "json",
+			url: '/web/monitor/add.json',
+			type: 'post',
+			dataType: 'json',
 			data: data,
 			success: function (data) {
 				if (data.status == 1) {
-					$("#easyui-dialog-win").dialog("close")
+					$('#easyui-dialog-win').dialog('close')
 					/*var monitor = data.data;
 					$('#_resultGrid').treegrid('append',{
 		                parent: parentId,  // 这里指定父级标识就可以了
@@ -107,7 +122,7 @@ $(function () {
 		            });*/
 					//expandNode(parentId);//不起作用,liuzhixiong更新于2017-08-18
 					layer.msg(data.msg)
-					loadData("_resultGrid", "/web/monitor/getList.json", parentId)
+					loadData('_resultGrid', '/web/monitor/getList.json', parentId)
 				} else {
 					alert(data.msg)
 				}
@@ -120,17 +135,17 @@ $(function () {
 		ajax({
 			url: url,
 			beforeSend: function (XHR) {
-				$("#" + treeId).mask("数据加载中...")
+				$('#' + treeId).mask('数据加载中...')
 			},
 			success: function (data) {
-				$("#" + treeId).unmask()
-				$("#" + treeId).treegrid({
-					idField: "id",
-					treeField: "name",
+				$('#' + treeId).unmask()
+				$('#' + treeId).treegrid({
+					idField: 'id',
+					treeField: 'name',
 					data: data.data,
-					state: "closed",
+					state: 'closed',
 					onLoadSuccess: function (row) {
-						$("#_resultGrid").treegrid("collapseAll")
+						$('#_resultGrid').treegrid('collapseAll')
 						setTimeout(function () {
 							expandNode(nodeId)
 						}, 300)
@@ -142,9 +157,9 @@ $(function () {
 
 	expandNode = function (nodeId) {
 		if (nodeId > 0) {
-			$("#_resultGrid").treegrid("expand", nodeId)
+			$('#_resultGrid').treegrid('expand', nodeId)
 		}
-		var parent = $("#_resultGrid").treegrid("getParent", nodeId)
+		var parent = $('#_resultGrid').treegrid('getParent', nodeId)
 		if (parent != null && parent != undefined) {
 			expandNode(parent.id)
 		}

+ 92 - 78
VbdsmUI_V2.1.1/src/pc/powerservice/monitor/monitor_list.html

@@ -1,91 +1,105 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<title>采集点管理</title>
-		<meta charset="UTF-8" />
-		<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/easyui/themes/color.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.query-2.1.7.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="js/treegrid-dnd.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/util.js" type="text/javascript"></script>
-		<script src="http://static.vbdsm.com/js/lib/layer/layer/layer.js" type="text/javascript"></script>
-		<script src="js/list.util.js" type="text/javascript"></script>
+<head>
+	<title>采集点管理</title>
+	<meta charset="UTF-8" />
+	<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/easyui/themes/color.css" rel="stylesheet" type="text/css" />
+	<link href="http://static.vbdsm.com/js/lib/loadmask/jquery.loadmask.css" rel="stylesheet" type="text/css" />
 
-		<script charset="UTF-8" type="text/javascript"></script>
-	</head>
-	<body class="easyui-layout" id="monitorWindow">
-		<div class="easyui-tabs" data-options="fit:true, border:false, plain:true,fitColumn:true" id="monitorList" style="width: 100%">
-			<div style="overflow: hidden" title="&nbsp;电&nbsp;">
-				<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
-					<div>
-						<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-add" id="addHref" plain="true" title="新增一级监测点">新增</a>
-						<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-edit" id="updateHref" plain="true" title="编辑监测点">编辑</a>
-						<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-delete" id="deleteHref" plain="true" title="删除一级监测点">删除</a>
-						<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-expand" id="btnExpandAll" plain="true" title="全部展开">全部展开</a>
-						<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-collapse" id="btnCollapseAll" plain="true" title="全部收起">全部收起</a>
-					</div>
-				</div>
-				<div style="height: 90%; overflow-y: scroll">
-					<table data-options="border:false, plain:true,fitColumn:true,fit:true" id="_resultGrid"></table>
+	<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.query-2.1.7.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="js/treegrid-dnd.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/util.js" type="text/javascript"></script>
+	<script src="http://static.vbdsm.com/js/lib/layer/layer/layer.js" type="text/javascript"></script>
+	<script src="js/list.util.js" type="text/javascript"></script>
+
+	<script charset="UTF-8" type="text/javascript"></script>
+</head>
+
+<body class="easyui-layout" id="monitorWindow">
+	<div class="easyui-tabs" data-options="fit:true, border:false, plain:true,fitColumn:true" id="monitorList"
+		style="width: 100%">
+		<div style="overflow: hidden" title="&nbsp;电&nbsp;">
+			<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
+				<div>
+					<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-add" id="addHref" plain="true"
+						title="新增一级监测点">新增</a>
+					<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-edit" id="updateHref" plain="true"
+						title="编辑监测点">编辑</a>
+					<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-monitor-delete" id="deleteHref"
+						plain="true" title="删除一级监测点">删除</a>
+					<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-expand" id="btnExpandAll" plain="true"
+						title="全部展开">全部展开</a>
+					<a class="easyui-linkbutton easyui-tooltip" href="#" iconCls="icon-collapse" id="btnCollapseAll" plain="true"
+						title="全部收起">全部收起</a>
 				</div>
 			</div>
-			<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden" title="&nbsp;水&nbsp;">
-				<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addWaterHref" plain="true">新增</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateWaterHref" plain="true">编辑</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteWaterHref" plain="true">删除</a>
-					<div style="display: none">
-						<input id="closeDialog" name="closeDialog" type="button" />
-					</div>
-				</div>
-				<div style="width: 100%; height: 100%; overflow-y: scroll">
-					<table data-options="border:false, plain:true,fitColumn:true" id="_resultWaterGrid"></table>
-				</div>
+			<div style="height: 90%; overflow-y: scroll">
+				<table data-options="border:false, plain:true,fitColumn:true,fit:true" id="_resultGrid"></table>
 			</div>
-			<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden" title="蒸汽">
-				<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addStreamHref" plain="true">新增</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateStreamHref" plain="true">编辑</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteStreamHref" plain="true">删除</a>
-					<div style="display: none">
-						<input id="closeDialog" name="closeDialog" type="button" />
-					</div>
-				</div>
-				<div style="width: 100%; height: 100%; overflow-y: scroll">
-					<table data-options="border:false, plain:true,fitColumn:true" id="_resultStreamGrid"></table>
+		</div>
+		<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden;display: none;"
+			title="&nbsp;水&nbsp;">
+			<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addWaterHref" plain="true">新增</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateWaterHref" plain="true">编辑</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteWaterHref" plain="true">删除</a>
+				<div style="display: none">
+					<input id="closeDialog" name="closeDialog" type="button" />
 				</div>
 			</div>
-			<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden" title="气">
-				<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addGasHref" plain="true">新增</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateGasHref" plain="true">编辑</a>
-					<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteGasHref" plain="true">删除</a>
-					<div style="display: none">
-						<input id="closeDialog" name="closeDialog" type="button" />
-					</div>
+			<div style="width: 100%; height: 100%; overflow-y: scroll">
+				<table data-options="border:false, plain:true,fitColumn:true" id="_resultWaterGrid"></table>
+			</div>
+		</div>
+		<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden;display: none;"
+			title="蒸汽">
+			<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addStreamHref" plain="true">新增</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateStreamHref" plain="true">编辑</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteStreamHref" plain="true">删除</a>
+				<div style="display: none">
+					<input id="closeDialog" name="closeDialog" type="button" />
 				</div>
-				<div style="width: 100%; height: 100%; overflow-y: scroll">
-					<table data-options="border:false, plain:true,fitColumn:true" id="_resultGasGrid"></table>
+			</div>
+			<div style="width: 100%; height: 100%; overflow-y: scroll">
+				<table data-options="border:false, plain:true,fitColumn:true" id="_resultStreamGrid"></table>
+			</div>
+		</div>
+		<div data-options="fit:true, border:false, plain:true,fitColumn:true" style="overflow: hidden;display: none;"
+			title="气">
+			<div style="padding: 3px; background-color: #eeefff; border-bottom: solid 1px #ddd">
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-add" id="addGasHref" plain="true">新增</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-edit" id="updateGasHref" plain="true">编辑</a>
+				<a class="easyui-linkbutton" href="#" iconCls="icon-monitor-delete" id="deleteGasHref" plain="true">删除</a>
+				<div style="display: none">
+					<input id="closeDialog" name="closeDialog" type="button" />
 				</div>
 			</div>
-
-			监测点名称: <input class="easyui-textbox" id="electricName" style="width: 150px" />
-			<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="electricQueryBtn">查询</button>
-			<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="nextQueryBtn" style="display: none">下一个</button>
-			<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="upQueryBtn" style="display: none">上一个</button>
+			<div style="width: 100%; height: 100%; overflow-y: scroll">
+				<table data-options="border:false, plain:true,fitColumn:true" id="_resultGasGrid"></table>
+			</div>
 		</div>
-	</body>
-	<script>
-		var cid = $.query.get("auth_cid")
-		$("body").append('<script src="/system/lang/config.json?script=1&auth_cid=' + cid + '"><\/script>')
-	</script>
-</html>
+
+		监测点名称: <input class="easyui-textbox" id="electricName" style="width: 150px" />
+		<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="electricQueryBtn">查询</button>
+		<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="nextQueryBtn"
+			style="display: none">下一个</button>
+		<button class="easyui-linkbutton" href="javascript:void(0)" iconCls="icon-search" id="upQueryBtn"
+			style="display: none">上一个</button>
+	</div>
+</body>
+<script>
+	var cid = $.query.get("auth_cid")
+	$("body").append('<script src="/system/lang/config.json?script=1&auth_cid=' + cid + '"><\/script>')
+</script>
+
+</html>