From a016677520c05b9c72c2426781df7cbdb4ecfe71 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 08 十一月 2018 10:20:36 +0800
Subject: [PATCH] 首页面卡顿问题
---
gx_tieta/WebRoot/index.jsp | 131 ++++++++++++++-----------------------------
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 1
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 2
3 files changed, 45 insertions(+), 89 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index 27174f5..df51077 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -569,6 +569,7 @@
// 鑾峰彇鐢熸垚鎶樼嚎鍥剧殑閰嶇疆椤�
function getlineGraphOpts(data, type) {
+ console.log(data);
var rs = {
xdata:[],
sdata: [],
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index a21aa51..bf69554 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1716,6 +1716,48 @@
}
}
+ // 鏇存柊鍦板浘鍥炬爣
+ function updateMapDotIcon(map, dotList, isTop) {
+ // 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
+ for(var i = 0; i<dotList.length; i++) {
+ var isShow = checkMapImgStyle(dotList[i].msg);
+ var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
+ var mk = getMapMarker(map, dotList[i].title);
+ if(mk) {
+ // 璁剧疆鍦板浘鍥炬爣
+ mk.setIcon(dotIcon);
+
+ // 灏嗗凡缁忓畨瑁呯殑鏄剧ず鍦ㄩ《閮�
+ if(isTop) {
+ mk.setTop(true);
+ }
+
+ // 闅愯棌marker鐐�
+ isShow?mk.show():mk.hide();
+ }
+ }
+ }
+
+ // 鑾峰彇鍦板浘鍥炬爣
+ function getMapMarker(map, msg) {
+ var rs = false;
+ var allOverlay = map.getOverlays();
+ for (var i = 0; i < allOverlay.length; i++){
+ try{
+ if(allOverlay[i].getLabel().content == msg){
+ rs = allOverlay[i];
+ return rs;
+ }
+ }catch(e) {
+
+ }
+
+ }
+
+ return rs;
+
+ }
+
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
var allOverlay = map.getOverlays();
@@ -2325,7 +2367,7 @@
}
}
- createMapDot(map, updateStationData, true);
+ updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
if(mapPages.pageCurr>mapPages.pageNum || updateStationData.length<mapPages.pageSize) {
@@ -3021,94 +3063,7 @@
rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}";
return rs;
}
- /* $(function(){
- setTimeout(function(){
- var _script = document.createElement('script');
- _script.type = "text/javascript";
- _key = "55UbnVOR7XovezZC4jFvTqNDPAamsuoo";//鐧惧害鍦板浘鍙互鐢宠鍒�
- _script.src = "http://api.map.baidu.com/location/ip?ak="+_key+"&coor=bd09ll&ip=&callback=f";//鎷兼帴URL
- document.head.appendChild(_script);
-
- }, 2000);
-
- });
- var pointX;
- var pointY;
- function f(data){
- pointX = data.content.point.x;
- pointY = data.content.point.y;
- console.info("浣犳墍鍦ㄥ煄甯�:"+data.content.address);
- console.info("浣犲煄甯傜粡搴�:"+pointX);
- console.info("浣犵殑鍩庡競绾害:"+pointY);
- var point = new BMap.Point(pointX, pointY);
- map.centerAndZoom(point, 10); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
- } */
-
-
- /* $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name1");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
- }
- findStationNamebyStationname1();
- });
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
- };
- //var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
- }
- findserchByBattGroupNamebystationname();
- });
- } */
-
//鏌ヨ鎵�鏈夌殑缁存姢鍖�
function searchAllProvince(){
$.ajax({
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 4a630cf..9227e58 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -638,7 +638,7 @@
if(container.find('ul').length !=0) {
location.hash="#"+homeInfo.StationName;
location.hash="";
- treeView.spreadFolder('home', homeInfo.StationName3, fourthSpread, true);
+ treeView.spreadFolder('home', homeInfo.StationName, fourthSpread, true);
return;
}
treeView.addProgress(container);
--
Gitblit v1.9.1