From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/index.jsp | 185 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 180 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2f681a8..eb12531 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -34,6 +34,8 @@
<link rel="stylesheet" href="css/img-change.css">
<link rel="stylesheet" href="css/confirm.css">
<link rel="stylesheet" href="css/loading.css">
+ <link rel="stylesheet" href="src/css/layui.css">
+ <link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
#map .explain-header:hover {
cursor: pointer;
@@ -81,6 +83,15 @@
overflow-y: auto;
overflow-x: hidden;
}
+ .BMapLib_bubble_content a {
+ color: #2A3AF0;
+ }
+ .BMapLib_bubble_content a:hover {
+ text-decoration: underline;
+ }
+ body .layui-layer-dialog {
+ min-width:400px;
+ }
</style>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
@@ -97,6 +108,20 @@
<jsp:include page="nav.jsp" flush="true"/>
<!--瀵艰埅缁撴潫-->
<div id="content">
+ <!-- <div id="mapStatusOpts" class="map-status-container">
+ <div class="layui-form layui-form-pane">
+ <label class="layui-form-label">鏈烘埧绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="warnType" id="warnType">
+ <option value="0">鍏ㄩ儴</option>
+ <option value="1">钀藉悗</option>
+ <option value="2">鍛婅</option>
+ <option value="3">寤舵椂</option>
+ <option value="4">姝ｅ父</option>
+ </select>
+ </div>
+ </div>
+ </div> -->
<div class="nav-map small">
<!-- 鐢垫睜鍒嗗竷鍥� -->
<div class="china-map" id="map">
@@ -137,7 +162,11 @@
<!-- 鐢垫睜鏁呴殰涓庣數姹犲憡璀﹂ゼ鐘跺浘 -->
<div class="pie-con">
-
+ <div class="pie-conf">
+ <a href="javascript:;" class="pie-btn" id="faCog" title="鍥捐〃閰嶇疆">
+ <i class="fa fa-cog"></i>
+ </a>
+ </div>
<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
<div class="brdn-pie module"></div>
<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
@@ -314,12 +343,14 @@
<script type="text/javascript" src="pages/js/base.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
+ <script type="text/javascript" src="pages/js/pages/index-common.js"></script>
<script type="text/javascript" src="js/panel.js"></script>
<script type="text/javascript" src="js/search.js"></script>
<script type="text/javascript" src="js/changePinYin.js"></script>
<script type="text/javascript" src="js/createMap.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/loading.js"></script>
+ <script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1738,7 +1769,7 @@
function showMapPanel(target, warnList) {
var point = target.point;
- console.log(target.getLabel());
+ //console.log(target.getLabel());
var searchInforWin = null;
for(var i = 0; i < warnList.length; i++) {
if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {
@@ -1770,7 +1801,7 @@
var opts = {
title : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">璇︽儏>></a>', //鏍囬鏈紑鍚�
width : '290', //瀹藉害
- height : 140, //楂樺害
+ height : 160, //楂樺害
panel : "panel", //妫�绱㈢粨鏋滈潰鏉�
enableAutoPan : true, //鑷姩骞崇Щ
enableSendToPhone:false,
@@ -2083,7 +2114,7 @@
var allStation = [];
var mapPages = {
- pageSize:100, // 姣忛〉鐨勮鏁�
+ pageSize:1000, // 姣忛〉鐨勮鏁�
pageCurr:1, // 褰撳墠椤电爜鏁�
pageAll:1, // 鏁扮洰
pageNum: 0,
@@ -2172,6 +2203,7 @@
data: "json="+JSON.stringify(mapPages),
success: function(result) {
var data = JSON.parse(result.result);
+ console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _list = formatUpdateStation(_data);
@@ -2221,7 +2253,6 @@
alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
return;
}
-
var temp = {
StationId: stationInfo.sId
};
@@ -3311,5 +3342,149 @@
addrAnalyze(posTxt);
});
});
+
+ layui.use(['form', 'layer', 'laytpl'], function() {
+ var form = layui.form;
+ var layer = layui.layer;
+ var laytpl = layui.laytpl;
+
+ // 鐐瑰嚮楗肩姸鍥鹃厤缃�
+ $('#faCog').click(function() {
+ searchUserBieState(); // 鏌ヨ褰撳墠楗肩姸鍥剧殑閰嶇疆鐘舵��
+ });
+
+ var layerMsg;
+
+ // 鐐瑰嚮閰嶇疆椤瑰閫夋
+ $('body').on('click', '#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]', function(event) {
+ layer.close(layerMsg);
+ var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+ var num = 0;
+ iptList.each(function() {
+ if($(this).is(':checked')) {
+ num++;
+ }
+ });
+ if(num>4) {
+ layerMsg = layer.msg("鏈�澶氶�夋嫨鍥涗釜锛�", {
+ type: 1
+ });
+ $(this).prop('checked', false);
+ }
+
+ });
+
+
+ var pie = GLOBAL.Index.Pie;
+ var pieType = pie.pieType;
+ var pieConfTpl = getTpl('iframe/pie-config.html');
+ //鏌ヨ褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
+ function searchUserBieState(){
+ $.ajax({
+ type:"post",
+ url: "Echarts_usrAction!serchByCondition",
+ async:true,
+ dataType:'json',
+ data:null,
+ success: function(data){
+ var model = eval('('+data.result+')');
+ if(model.code == 1) {
+ var result = model.data;
+ var formatData = formatPieRsData(result[0]);
+ laytpl(pieConfTpl).render(formatData, function(html) {
+ layer.open({
+ id: 'pie',
+ title: '楗肩姸鍥鹃厤缃�',
+ maxHeight: 450,
+ content: html,
+ yes: function(index) {
+ var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+ var iptArr = [];
+ iptList.each(function() {
+ if($(this).is(':checked')) {
+ iptArr.push(1);
+ }else {
+ iptArr.push(0);
+ }
+ });
+
+ var temp = structUpdatePie(iptArr);
+ layer.load();
+ updateUserBieState(temp);
+ }
+ });
+ });
+ }
+
+ }
+ });
+ }
+
+ // 鏍煎紡鍖栨煡璇㈢粨鏋�
+ function formatPieRsData(result) {
+ var data={};
+ data.tblData=[];
+ // 閬嶅巻pieType鐨勭被鍨�
+ for(var i=0; i<pieType.length; i++) {
+ var tmp = {};
+ var num = i+1;
+ var key = 'echarts'+num+'_enable';
+ tmp.name = pieType[i].name;
+ tmp.status = result[key];
+ data.tblData.push(tmp);
+ }
+
+ return data;
+ }
+
+
+ // 鏋勯�犳洿鏂伴ゼ鐘跺浘鍙傛暟
+ function structUpdatePie(arr) {
+ var rs = {
+ echarts1_enable:0,
+ echarts2_enable:0,
+ echarts3_enable:0,
+ echarts4_enable:0,
+ echarts5_enable:0,
+ echarts6_enable:0,
+ echarts7_enable:0,
+ echarts8_enable:0,
+ echarts9_enable:0,
+ echarts10_enable:0
+ };
+
+ // 閬嶅巻arr缁檙s鍊奸噸瀹氫箟
+ for(var i=0; i<arr.length; i++) {
+ var num = i+1;
+ var key = 'echarts'+num+'_enable';
+ rs[key] = arr[i];
+ }
+
+ return rs;
+ }
+
+ // 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
+ function updateUserBieState(temp, dialog, load){
+ // 鏇存柊鍚庡彴鏁版嵁
+ $.ajax({
+ type:"post",
+ url: "Echarts_usrAction!add",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(temp),
+ success: function(data){
+ layer.closeAll();
+
+ var model = eval('('+data.result+')');
+ if(model.code == 1) {
+ layer.msg('閰嶇疆鎴愬姛锛侊紒锛�');
+ }else {
+ layer.msg('閰嶇疆澶辫触锛侊紒锛�');
+ }
+ }
+ });
+ }
+
+ });
</script>
</html>
--
Gitblit v1.9.1