From 7876e8a630a50994758e3c91cf2c11d8ffd44ae6 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期二, 30 十月 2018 10:22:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 169 +++++++++----
gx_tieta/WebRoot/js/AreaRestriction_min.js | 1
gx_tieta/WebRoot/css/index_layout.css | 14 +
gx_tieta/WebRoot/pages/css/mylayui.css | 82 ++++++
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 397 +++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/pages/js/common.js | 3
6 files changed, 610 insertions(+), 56 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
new file mode 100644
index 0000000..b0b5b1b
--- /dev/null
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -0,0 +1,397 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <base href="<%=basePath%>">
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+ <meta http-equiv="description" content="This is my page">
+ <title>娴侀噺缁熻</title> <!--娴侀噺缁熻-->
+ <link rel="stylesheet" type="text/css" href="pages/css/base.css">
+ <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.min.js">
+ <link rel="stylesheet" type="text/css" href="src/css/layui.css">
+ <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+ </head>
+ <body>
+ <!--澶撮儴鍐呭寮�濮�-->
+ <jsp:include page="Top.jsp" flush="true"/>
+ <!--澶撮儴鍐呭缁撴潫-->
+ <!--瀵艰埅寮�濮�-->
+ <jsp:include page="nav.jsp" flush="true"/>
+ <!-- 涓讳綋鍐呭 -->
+ <div class="layui-page-container">
+ <!-- 鏉′欢绛涢�� -->
+ <div class="layui-page-filter">
+ <div class="page-filter-header layui-page-filter-fweight">娴侀噺缁熻</div>
+ <div class="page-filter-content">
+ <table>
+ <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
+ <td>缁熻鏂瑰紡</td>
+ <td colspan="2">鏃堕棿娈�</td>
+ </tr>
+ <tr>
+ <td>
+ <div class="layui-form" lay-filter="provinceFilter">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select name="province" id="province" lay-filter="province">
+ <option value="">璇烽�夋嫨鐪�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form" lay-filter="cityFilter">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select name="city" id="city" lay-filter="city">
+ <option value="">璇烽�夋嫨甯�/鍖�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form" lay-filter="homeFilter">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select name="home" id="home" lay-filter="home">
+ <option value="">璇烽�夋嫨鏈烘埧</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select id="statistics" name="statistics" lay-filter="statistics">
+ <option value="3">鎸夊勾缁熻</option>
+ <option value="1">鎸夋湀缁熻</option>
+ <option value="2">鎸夋棩缁熻</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td class="w272">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="startTime" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
+ </div>
+ </td>
+ <td class="w272">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="endTime" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <!-- 椤甸潰涓婚鍐呭 -->
+ <div class="layui-page-content">
+ <!-- 琛ㄦ牸鍐呭 -->
+ <table id="pageTbl" lay-filter="pageTbl"></table>
+ </div>
+ <!-- 鍒嗛〉鍐呭 -->
+ <div id="paging">
+ <a href="javascript:" class="search"><s:text name="Search"/><!-- 鏌ヨ --></a>
+ <s:text name="Total_data"/><!-- 鏁版嵁鎬婚噺 --><span id="total" class="total">0</span>
+ </div>
+ </div>
+ <!-- 鏁翠綋鐏拌壊閬僵灞� -->
+ <div id="allShade"></div>
+ <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="src/layui.js"></script>
+ <script type="text/javascript" src="pages/js/mylayui.js"></script>
+ <script type="text/javascript">
+ layui.use(['form', 'table', 'layer', 'laydate', 'element'], function() {
+ var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
+ var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
+ var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
+ var laydate = layui.laydate; // 鑾峰彇鏃ユ湡妯″潡
+
+ // 瀹氫箟鏃堕棿妯″潡
+ var date = new Date();
+ var today = date.format("yyyy-MM-dd")+" 23:59:59";
+ // 瀹氫箟寮�濮嬫椂闂�
+ laydate.render({
+ elem: '#startTime',
+ type: 'datetime',
+ value: '2000-01-01 00:00:00',
+ btns: ['confirm'],
+ max: today,
+ min: '2000-01-01 00:00:00'
+ });
+
+ // 瀹氫箟缁撴潫鏃堕棿
+ laydate.render({
+ elem: '#endTime',
+ type: 'datetime',
+ value: today,
+ btns: ['confirm'],
+ min: '2000-01-01 00:00:00',
+ max: today
+ });
+
+
+ // 鏌ヨ鐪佷笅鎷夋
+ searchProvince();
+ // 鏌ヨ鐪�
+ function searchProvince() {
+ // 璇锋眰鍚庡彴鏌ヨ
+ $.ajax({
+ type:'post',
+ async:true,
+ url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
+ data: null,
+ dataType: 'json',
+ success:function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#province'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data, _data, {}, {});
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'provinceFilter');
+
+ // 鏌ヨ甯�
+ searchCity();
+ }
+ });
+ }
+
+ // 鍒囨崲鐪�-甯�
+ form.on('select(province)', function(data) {
+ // 鏌ヨ甯�
+ searchCity();
+ });
+
+ // 鏌ヨ甯�
+ function searchCity() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1: $("#province").val()
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName2',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#city'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'cityFilter');
+
+ // 鏌ヨ鏈烘埧
+ searchHome();
+ }
+ });
+ }
+
+ // 鍒囨崲甯�-鏈烘埧
+ form.on('select(city)', function(data) {
+ // 鏌ヨ鏈烘埧
+ searchHome();
+ });
+
+ // 鏌ヨ鏈烘埧
+ function searchHome() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#province").val(),
+ StationName2:$("#city").val()
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName3',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#home'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: '', dev_id: ''}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _attr = {
+ StationId: _data.StationId,
+ dev_id: _data.FBSDeviceId
+ };
+ var _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'homeFilter');
+
+ }
+ });
+ }
+
+ // 琛ㄦ牸妯″潡
+ var tOptions = {
+ elem: '#pageTbl'
+ ,toolbar: false
+ ,cellMinWidth: 80
+ ,cols: [[
+ {field:'timeSlot', title:'缁熻鏃堕棿娈�', align:'center', width: 380}
+ ,{field:'province', title:'鐪�', align:'center'}
+ ,{field:'city', title:'甯�', align:'center'}
+ ,{field:'home', title:'鏈烘埧鍚嶇О', align:'center'}
+ ,{field:'flowSize', title:'娴侀噺', align:'center'}
+ ]]
+ ,data:[]
+ ,limit: 1000
+ ,page: false
+ ,height: 'full-290'
+ };
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
+
+ // 鐐瑰嚮鏌ヨ
+ $('#paging .search').click(function() {
+ var temp = createSearchForm();
+ if(temp.dev_id) {
+ sTblData(temp);
+ }else {
+ layer.msg('璇烽�夋嫨鏈烘埧锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+ });
+
+ // 鏌ヨ琛ㄦ牸鏁版嵁
+ function sTblData(sData) {
+ // 寮�鍚瓑寰呮
+ var loading = layer.load();
+ // 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'StationtrafficAction!serchByCondition',
+ data: "json="+JSON.stringify(sData),
+ dataType: 'json',
+ success: function(result) {
+ // 鍏抽棴绛夊緟妗�
+ layer.close(loading);
+ // 瑙ｆ瀽鑾峰彇鐨刯son
+ var rs = JSON.parse(result.result);
+ // 鍒濆鍖栨暟鎹粨鏋�
+ tOptions.data = [];
+ if(rs.code == 1) {
+ // 閬嶅巻鏁版嵁缁撴灉
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.timeSlot = _data.note;
+ tmp.province = _data.stationName1;
+ tmp.city = _data.stationName2;
+ tmp.home = _data.stationName;
+ tmp.flowSize = tranfficCount(_data.nowflow);
+ tOptions.data.push(tmp);
+ }
+ }else {
+ layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+
+ var pageNum = tOptions.data.length;
+ tOptions.limit = pageNum;
+
+ // 璁剧疆鍒嗛〉淇℃伅
+ $('#total').text(pageNum);
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
+ }
+ });
+ }
+
+ // 鏌ヨ琛ㄦ牸鐨勬瀯閫犳潯浠�
+ function createSearchForm(){
+ var dev_id = $('#home').find("option:selected").attr('dev_id');
+ var temp = {
+ dev_id: dev_id?dev_id:0,
+ record_time:$('#startTime').val(),
+ record_time1:$('#endTime').val(),
+ num:$('#statistics').val()
+ };
+ return temp;
+ }
+
+ // 璁＄畻娴侀噺
+ function tranfficCount(value){
+ value = (value/1048576).toFixed(2);
+ if(value>1024){
+ value = (value/1024).toFixed(2);
+ return value + "G";
+ }else{
+ return value + "M";
+ }
+ }
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/css/index_layout.css b/gx_tieta/WebRoot/css/index_layout.css
index 59f6c84..8a30d97 100644
--- a/gx_tieta/WebRoot/css/index_layout.css
+++ b/gx_tieta/WebRoot/css/index_layout.css
@@ -6,6 +6,7 @@
width:100%;
}
#content .nav-map {
+ position: relative;
display: table;
width: 80%;
height: 500px;
@@ -34,7 +35,6 @@
/*鏄剧ず涓浗鍜屼腑鍥藉悇鐪侊紙琛屾斂鍖猴紝鐩磋緰甯傦級鐨勫湴鍥�*/
#content .china-map{
- display: table-cell;
width: auto;
height:100%;
min-height: 200px;
@@ -516,4 +516,16 @@
.map-info-footer button:hover {
background: #f4f4f4;
color: #555;
+}
+#mapImgDesc span {
+ line-height: 30px;
+ margin-left: 6px;
+ margin-right: 8px;
+}
+
+#mapImgDesc img{
+ width: 22px;
+ height: 22px;
+ margin-right: 8px;
+ vertical-align: middle;
}
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index bb12f73..41ac7e9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="src/css/layui.css">
<link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
- #map .explain-header:hover {
+ .explain-header:hover {
cursor: pointer;
background-color: #84ABFA !important;
color: #D6D1D1
@@ -109,36 +109,47 @@
<jsp:include page="nav.jsp" flush="true"/>
<!--瀵艰埅缁撴潫-->
<div id="content">
- <!-- 鍦板浘鍐呭绛涢�� -->
- <div class="map-info-panel-left">
- <div class="map-info-panel-content">
- <div class="map-info">
- <span>闄愬埗鏄剧ず鍖哄煙: </span><span class="k-point red" id="mapVsArea">涓浗</span>
- <span class="mr5">鏈烘埧鏄剧ず绫诲瀷:</span><span class="k-point red" id="mapIconStyle">鍏ㄩ儴</span>
- </div>
- <div class="map-info-detail">
- <table>
- <tbody>
- <tr>
- <td class="w8em alg-c">鏈烘埧鏄剧ず绫诲瀷:</td>
- <td>
- <select name="mapIconStyleSel" id="mapIconStyleSel">
- <option>鍏ㄩ儴</option>
- <option>宸插畨瑁�</option>
- <option>鏈畨瑁�</option>
- </select>
- </td>
- </tr>
- </tbody>
- </table>
- <div class="map-info-footer alg-r">
- <button type="button" class="mr10 map-panel-hide" value="纭畾" id="mapPanelEn">纭畾</button>
- <button type="button" class="mr10 map-panel-hide" value="闅愯棌">闅愯棌</button>
+
+ <div class="nav-map small">
+ <!-- 鍦板浘鍐呭绛涢�� -->
+ <div class="map-info-panel-left">
+ <div class="map-info-panel-content">
+ <div class="map-info">
+ <span>闄愬埗鏄剧ず鍖哄煙: </span><span class="k-point red" id="mapVsArea">涓浗</span>
+ <span class="mr5">鏈烘埧鏄剧ず绫诲瀷:</span><span class="k-point red" id="mapIconStyle">鍏ㄩ儴</span>
+ <span class="map-info-btn-icon" id="showMapInfoDetail" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
+ </div>
+ <div class="map-info-detail">
+ <table>
+ <tbody>
+ <tr>
+ <td class="w8em alg-c">闄愬埗鏄剧ず鍖哄煙:</td>
+ <td>
+ <select name="mapVsAreaSel" id="mapVsAreaSel">
+ <option>涓浗</option>
+ <option>涓浗-骞胯タ</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="w8em alg-c">鏈烘埧鏄剧ず绫诲瀷:</td>
+ <td>
+ <select name="mapIconStyleSel" id="mapIconStyleSel">
+ <option>鍏ㄩ儴</option>
+ <option>宸插畨瑁�</option>
+ <option>鏈畨瑁�</option>
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="map-info-footer alg-r">
+ <button type="button" class="mr10 map-panel-hide" value="纭畾" id="mapPanelEn">纭畾</button>
+ <button type="button" class="mr10 map-panel-hide" value="闅愯棌">闅愯棌</button>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="nav-map small">
<!-- 鐢垫睜鍒嗗竷鍥� -->
<div class="china-map" id="map">
<div class="img-change" style="display:none;">
@@ -527,8 +538,8 @@
});
$(function() { // 鏄剧ず鍜岄殣钘忓浘鏍囪鏄�
- $('#map').on('click', '.explain-header', function() {
- $('#map .explain-list').fadeToggle();
+ $('.nav-map').on('click', '.explain-header', function() {
+ $('.explain-list').fadeToggle();
});
$('#map').on('dblclick', '.explain-header', function() {
@@ -689,10 +700,10 @@
{
text: '杩斿洖涓績鐐�',
- callback: function(e) {
- centerMapByPoint(map);
+ callback: function(e){
+ centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
}
- },
+ }
];
//console.info(getPermit('taskchange_edit_permit', permits)+"*******");
if(getPermit('batt_map_edit_permit', permits)) {
@@ -1499,9 +1510,10 @@
changeMapImgDesc(iconExplain, 'normal');
- mapEle.prepend(iconExplain);
+ mapEle.parent().append(iconExplain);
+
+
}
-
// 鍒囨崲鍦板浘鍥炬爣璇存槑
function changeMapImgDesc(iconExplain, type) {
iconExplain.find('.explain-list').remove();
@@ -1519,35 +1531,43 @@
function mapImgDescNormal(iconExplain) {
// 鏈烘埧钀藉悗
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var icon = $('<img src="'+mapImages.behind+'" style="float:left">');
- var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勮惤鍚庢満鎴�</span>');
- iconList.append(icon);
+ var input = $('<input type="checkbox" checked="checked">');
+ var icon = $('<img src="'+mapImages.behind+'">');
+ var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+ iconList.append(input);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
// 鏈烘埧鍛婅
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var icon = $('<img src="'+mapImages.warn+'" style="float:left;">');
- var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勫憡璀︽満鎴�</span>');
- iconList.append(icon);
+ var input = $('<input type="checkbox" checked="checked">');
+ var icon = $('<img src="'+mapImages.warn+'">');
+ var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+ iconList.append(input);
iconList.append(span);
+ iconList.append(icon);
iconList.append('<div class="clear"></div>');
iconExplain.append(iconList);
// 鏈烘埧寤舵椂
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var icon = $('<img src="'+mapImages.timeout+'" style="float:left">');
- var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>');
- iconList.append(icon);
+ var input = $('<input type="checkbox" checked="checked">');
+ var icon = $('<img src="'+mapImages.timeout+'">');
+ var span = $('<span>鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>');
+ iconList.append(input);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
// 姝ｅ父鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var icon = $('<img src="'+mapImages.normal+'" style="float:left">');
- var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">姝ｅ父鏈烘埧</span>');
- iconList.append(icon);
+ var input = $('<input type="checkbox" checked="checked">');
+ var icon = $('<img src="'+mapImages.normal+'">');
+ var span = $('<span>姝ｅ父鏈烘埧</span>');
+ iconList.append(input);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
}
@@ -1557,16 +1577,16 @@
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var icon = $('<img src="'+mapImages.nuclear+'" style="float:left">');
var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鏍稿/鍋滅數鏀剧數</span>');
- iconList.append(icon);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
// 鍛婅
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var icon = $('<img src="'+mapImages.devalarm+'" style="float:left;">');
var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850璁惧鍛婅</span>');
- iconList.append(icon);
iconList.append(span);
+ iconList.append(icon);
iconList.append('<div class="clear"></div>');
iconExplain.append(iconList);
@@ -1574,16 +1594,16 @@
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var icon = $('<img src="'+mapImages.precharge+'" style="float:left">');
var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850棰勫厖鐢�</span>');
- iconList.append(icon);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
// 鍦ㄧ嚎娴厖
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var icon = $('<img src="'+mapImages.float+'" style="float:left">');
var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850鍦ㄧ嚎娴厖</span>');
- iconList.append(icon);
iconList.append(span);
+ iconList.append(icon);
iconExplain.append(iconList);
}
@@ -3522,14 +3542,57 @@
}
});
}
- var mapViewArea = GLOBAL.BMap.mapViewArea;
+
+ // 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�
+ var mapViewArea = GLOBAL.BMap.mapViewArea; // 鍦板浘鏄剧ず鍖哄煙鐨勪俊鎭�
+ // 鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
+ $('#showMapInfoDetail').click(function() {
+ $('.map-info-detail').slideToggle();
+ });
+
+ // 鐐瑰嚮闅愯棌
+ $('.map-info-detail .map-panel-hide').click(function() {
+ $('.map-info-detail').slideUp();
+ });
+
+ // 閬嶅巻mapViewArea鑾峰彇mapVsAreaSel涓嬫媺妗嗙殑鍊�
+ var mapVsAreaSel = $('#mapVsAreaSel');
+ var mapVsAreaSelOpts = [];
+ for(var i=0; i<mapViewArea.length; i++) {
+ var _data = mapViewArea[i];
+ var tmp = getOptionsData(_data.name, _data.area, _data);
+ mapVsAreaSelOpts.push(tmp);
+ }
+ // 鐢熸垚闈㈡澘涓殑mapVsAreaSel
+ createOptions(mapVsAreaSel, mapVsAreaSelOpts);
// 鏄剧ず榛樿鍖哄煙-涓浗
- setMapViewArea(mapViewArea[0]);
+ setMapViewArea(mapViewArea[0]);
+ centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
+ // 鐐瑰嚮闈㈡澘纭畾鎸夐挳
+ $('#mapPanelEn').click(function() {
+ var areaData = mapVsAreaSel.find('option:selected').data('attr');
+
+ // 璁剧疆澶撮儴鍙鍖哄煙鐨勬枃鏈�
+ $('#mapVsArea').text(areaData.name);
+
+ // 璁剧疆鍙鍖哄煙
+ setMapViewArea(areaData);
+ });
+
// 璁剧疆鍦板浘鐨勫彲瑙嗗尯鍩�
function setMapViewArea(data) {
var left = new BMap.Point(data.left.lng, data.left.lat);
var right = new BMap.Point(data.right.lng, data.right.lat);
var b = new BMap.Bounds(left, right);
+
+ var cLng = (data.left.lng+data.right.lng)/2;
+ var cLat = (data.left.lat+data.right.lat)/2;
+ var f = new BMap.Point(cLng, cLat);
+ map.panTo(f, {
+ noAnimation: "no"
+ });
+
+
try {
BMapLib.AreaRestriction.setBounds(map, b);
} catch (e) {
diff --git a/gx_tieta/WebRoot/js/AreaRestriction_min.js b/gx_tieta/WebRoot/js/AreaRestriction_min.js
index ec87afd..f5afe64 100644
--- a/gx_tieta/WebRoot/js/AreaRestriction_min.js
+++ b/gx_tieta/WebRoot/js/AreaRestriction_min.js
@@ -22,7 +22,6 @@
if (d.containsBounds(c.getBounds())) {
return
}
- console.log(c.getBounds());
var i = c.getBounds(),
h = i.getSouthWest(),
g = i.getNorthEast(),
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 678653a..6a52b37 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -1,5 +1,53 @@
+html, body {
+ width: 100%;
+ height: 100%;
+ min-width: 1200px;
+ overflow: hidden;
+ overflow-x: auto;
+}
.layui-table-view {
margin: 0;
+}
+
+/* layui-page-filter */
+.page-filter-header {
+ line-height: 36px;
+ background: url('../images/table_th_bg.gif') repeat-x;
+ text-align:center;
+}
+.layui-page-filter-fweight {
+ font-weight: bold;
+ text-align: center;
+}
+.page-filter-content table{
+ width: 100%;
+}
+.page-filter-content table td {
+ border: 1px solid #ccc;
+}
+.layui-page-filter-tbl-header td {
+ font-size: 14px;
+ padding: 6px 0;
+}
+
+.page-filter-content .layui-input,
+.page-filter-content .layui-select {
+ border: 0;
+}
+.page-filter-content .layui-input {
+ height: 30px;
+ font-size: 14px;
+}
+.page-filter-content .layui-form-item {
+ margin: 0;
+}
+.page-filter-content .layui-input-block {
+ height: 30px;
+ min-height: 30px;
+ margin: 0;
+}
+.page-filter-content .layui-form-select dl {
+ top: 34px;
}
.layui-table thead tr {
color: #000;
@@ -16,4 +64,38 @@
.layui-form-pane .layui-form-label {
background-color: #4EABE3;
color: #FFFFFF;
+}
+
+/*鍒嗛〉鏍峰紡*/
+#paging{
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ padding:6px 0;
+ font-size: 14px;
+ background:url(../images/table_th_bg.gif) repeat-x;
+ text-align: center;
+}
+#paging input{
+ width:28px;
+ height:24px;
+ border:1px solid #00FFFF;
+}
+#paging span.total {
+ margin-left: 10px;
+}
+#paging span{
+ margin-left:20px;
+}
+#paging a{
+ margin-left:10px;
+}
+#paging .input_container{
+ width:100%;
+}
+
+/* width */
+.w272 {
+ width: 272px;
}
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 4e407d3..19ee467 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -456,7 +456,8 @@
gl.namespace('BMap');
// 鍦板浘鍙鍖哄煙瀹氫箟
var mapViewArea = [
- {name: '涓浗',area:'涓浗' ,left: {lng:71.3822, lat:0.6212}, right: {lng: 139.526,lat:54.3093}},
+ {name: '涓浗',area:'涓浗', left: {lng:71.3822, lat:0.6212}, right: {lng: 139.526,lat:54.3093}},
+ {name: '涓浗-骞胯タ',area: '骞胯タ鐪�' ,left: {lng:104.45675, lat:20.8744}, right: {lng: 112.068,lat:26.391}}
];
// 灏嗗彉閲弇apView缁戝畾鍒癎LOBAL.BMap涓�
--
Gitblit v1.9.1