From 757b5f5e674abd212586a0af94577dec4cc46c2d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 11:57:16 +0800
Subject: [PATCH] 导航定位
---
gx_tieta/WebRoot/control.jsp | 157 ++++++++++---------
gx_tieta/WebRoot/index.jsp | 68 ++++++++
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 214 ++++++++++++++++++++++++++
3 files changed, 355 insertions(+), 84 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 692e91d..312a61f 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -254,14 +254,14 @@
<div id="right_menu">
<ul>
<li><a href="javascript:"><s:text name="Check_the_battery_card"></s:text></a></li> <!-- 鏌ョ湅鐢垫睜缁勬満鍘嗗崱 -->
- <li><a href="upload.jsp" target="_blank"><s:text name="Upload_FBO/IDC_data"></s:text></a></li> <!-- 涓婁紶'FBO/IDC'鏁版嵁 -->
- <li><a href="uploadresis.jsp" target="_blank"><s:text name="Upload_resistance_conductivity_data"></s:text></a></li> <!-- 涓婁紶鐢甸樆鐢靛鏁版嵁 -->
+ <!-- <li><a href="upload.jsp" target="_blank"><s:text name="Upload_FBO/IDC_data"></s:text></a></li> --> <!-- 涓婁紶'FBO/IDC'鏁版嵁 -->
+ <!-- <li><a href="uploadresis.jsp" target="_blank"><s:text name="Upload_resistance_conductivity_data"></s:text></a></li> --> <!-- 涓婁紶鐢甸樆鐢靛鏁版嵁 -->
<li><a href="eleBrdwMaint.jsp" target="_blank"><s:text name="Batt_failure_maintenance_record_query" /></a></li> <!-- 鐢垫睜鏁呴殰缁存姢璁板綍鏌ヨ -->
<li><a href="javascript:targetBattReport();"><s:text name="Battery_statistical_analysis_queries"></s:text></a></li> <!-- 鐢垫睜缁熻鍒嗘瀽鏌ヨ-->
<!--<li><a href="eleMonomer.jsp"><s:text name="Batt_statistical_analysis_query"></s:text></a></li> 鐢垫睜鍗曚綋缁熻鍒嗘瀽鏌ヨ -->
<li style="display:none;"><a href="javascript:"><s:text name="Search_engine_or_the_batt_group"></s:text></a></li> <!-- 鎼滅储鏈烘埧鎴栫數姹犵粍-->
- <li><a href="javascript:" id="all_show"><s:text name="Expand_all"></s:text></a></li> <!-- 鍏ㄩ儴灞曞紑 -->
+ <!-- <li><a href="javascript:" id="all_show"><s:text name="Expand_all"></s:text></a></li> --> <!-- 鍏ㄩ儴灞曞紑 -->
<li><a href="javascript:" id="all_hide"><s:text name="Collapse_all"></s:text></a></li> <!-- 鍏ㄩ儴鏀剁缉 -->
</ul>
</div>
@@ -1325,15 +1325,17 @@
}); */
- //灞忚斀娴忚鍣ㄥ彸閿彍鍗曞姛鑳�
+ //灞忚斀娴忚鍣ㄥ彸閿彍鍗曞姛鑳�
$(document).ready(function(){
- document.oncontextmenu=function(){
- return false;
- };
+ // 灞忚斀#lside鐨勫彸閿彍鍗�
+ document.oncontextmenu=function(){
+ return false;
+ };
});
// 鑿滃崟鏍忛紶鏍囧彸閿彍鍗曟樉绀�
$(document).ready(function(){
- $('.thr').mousedown(function(e){
+ $('#ele_content').on('mousedown', '.eleGroup', function(e){
+ alert(123);
//鍒╃敤jquery鐨勬柟寮忚幏鍙栧綋鍓嶇偣鍑荤殑鏄惁鏄彸閿�
if(e.which==3)
{
@@ -2708,16 +2710,23 @@
//console.info(model);
if(model.code == 1){
for(var i = 0;i<model.data.length;i++){
- if(model.data[i].batt_test_type == 3){
+ var _data = model.data[i];
+ if(_data.batt_test_type == 3){
arr.push({
- note:model.data[i].note,
- val:model.data[i].BattGroupId,
+ note:_data.note,
+ val:_data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:0
});
- }else if(model.data[i].batt_test_type == 2){
+ }else if(_data.batt_test_type == 2){
arr.push({
- note: model.data[i].note,
- val:model.data[i].BattGroupId,
+ note: _data.note,
+ val: _data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:1
});
}
@@ -2748,6 +2757,8 @@
li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
discharge_num++;
}
+
+ li.data('attr', list[i]);
ul.append(li);
}
$('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
@@ -2756,12 +2767,7 @@
}
// 鐐瑰嚮鐢垫睜鍏呮斁鐢电洃娴嬪垪琛ㄨЕ鍙戜簨浠�
$(function() {
- var batt_list = $('#ele_content .batt-listen .batt-list');
- batt_list.on('click', 'a', function(){
- batt_list.find('a').removeClass('active');
- $(this).addClass('active');
- locationBattPos($(this).attr('note'), $(this).attr('value'));
- });
+
});
function BattlocationById(battid){
if(battid!=undefined){
@@ -2885,16 +2891,7 @@
});
});
- //鍏ㄩ儴鏀剁缉
- $('#all_hide').click(function(){
- $('.fir').next().slideUp();
- //$('.sec').next().slideUp();
- $("#lside").scrollTop(0);
- $(".arrow").removeClass("up");
- $(".arrow").addClass("down");
- $(".mark").text("+");
- $(".mark").removeClass("black");
- });
+
});
// 鏄剧ず鐢垫睜鎬绘暟
@@ -3027,51 +3024,8 @@
}
// 鏍规嵁鏈烘埧id鍜岀數姹犵粍id瀹氫綅
- function locationBattPos(stationid, battId) {
- var _firTag = $('#lside .fir[name="'+stationid+'"]');
-
- if(_firTag.next('ul').length == 0) {
- addLoadingToMenu(stationid); // 娣诲姞鏁版嵁鍔犺浇绛夊緟
- $.ajax({
- type: "post",
- url: "BattInfAction!serchBattByStation",
- async:true,
- dataType:'text',
- data:"json = "+JSON.stringify({
- StationId:stationid
- }),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- removeLoadingMenu(stationid); // 绉婚櫎鏁版嵁鍔犺浇绛夊緟
- if(model.code == 1){
- //console.info(model.data);
- battinlist.push(model.data);
- createLsideSec(model.data, battId);
- }
- },
- error:function(){
-
- }
- });
- }else {
- var _ul = _firTag.next();
- _ul.slideDown();
- _ul.find('.thr').each(function() {
- if($(this).attr('id') == battId) {
- $('#lside a').css('background-color', "");
- $(this).css('background-color', '#9bbaf3');
- BattGroupId = battId;
- location.hash = '#'+battId;
- location.hash = "";
- }
- });
- getBattStr();
- searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
- clearInterval(time);
- showtable();
- time=window.setInterval("showtable()",4000);
- }
+ function locationBattPos(info) {
+ console.log(info);
}
// 鍚戦〉闈㈢殑宸︿晶娣诲姞鍔犺浇绛夊緟
@@ -3102,7 +3056,7 @@
function getBattStr() {
var battInfo = getBatt();
//console.info(battInfo);
- var battStr = battInfo.StationName+'-'+battInfo.BattGroupName;
+ var battStr = battInfo.StationName+'-'+battInfo.BattGroupName+'-鏍囩О瀹归噺'+battInfo.MonCapStd+'AH';
$('#address_infor').text(battStr);
}
@@ -3952,6 +3906,7 @@
var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
treeView.setContainer();
@@ -4025,6 +3980,56 @@
time=window.setInterval("showtable()",4000);
}
});
+
+ // 鍙抽敭鑿滃崟鏄剧ず
+ treeView.ele.on('mousedown', '.eleGroup', function(e) {
+ //鍒╃敤jquery鐨勬柟寮忚幏鍙栧綋鍓嶇偣鍑荤殑鏄惁鏄彸閿�
+ if(e.which==3)
+ {
+ BattGroupId=$(this).attr("id");
+ var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
+ var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
+ var scrollY=$("body").scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
+
+ var oRightMenu=document.getElementById("right_menu");
+
+ $(this).click();
+
+ //鏄剧ず鑿滃崟鍐呭
+ $("#right_menu").show();
+ $("#right_menu .more_menu").hide();
+ $("#right_menu .angle").hide();
+ //浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
+ oRightMenu.style.left=disX+'px';
+ oRightMenu.style.top=disY+scrollY+'px';
+
+ setPosition($("#right_menu"),disX, disY);
+
+ }
+ });
+
+ //鍏ㄩ儴鏀剁缉
+ $('#all_hide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
+ var batt_list = $('#ele_content .batt-listen .batt-list');
+ batt_list.on('click', 'a', function(){
+ batt_list.find('a').removeClass('active');
+ $(this).addClass('active');
+ var battInfo = $(this).parent().data('attr');
+
+ var tmp = {
+ province: battInfo.province,
+ city: battInfo.city,
+ home: battInfo.home,
+ homeid: battInfo.note,
+ battid: battInfo.val
+ }
+
+ localSideBar(treeView, treeView.container, tmp);
+ });
});
</script>
<script type="text/javascript" src="js/Title.js"></script>
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index d81e5ce..2064a1b 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -3390,10 +3390,22 @@
id: 'pie',
title: '楗肩姸鍥鹃厤缃�',
maxHeight: 450,
- yes: function(index, kk) {
+ 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);
+ }
+ });
- },
- content: html
+ var temp = structUpdatePie(iptArr);
+ layer.load();
+ updateUserBieState(temp);
+ }
});
});
}
@@ -3411,7 +3423,6 @@
var tmp = {};
var num = i+1;
var key = 'echarts'+num+'_enable';
- console.log(key);
tmp.name = pieType[i].name;
tmp.status = result[key];
data.tblData.push(tmp);
@@ -3419,6 +3430,55 @@
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>
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6cab98b..6d51ccf 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -88,7 +88,7 @@
var _data = $.extend({}, defaults, data[i]);
// 璁剧疆鍐呭瀹瑰櫒
var _li = $('<li></li>');
- var _a = $('<a href="javascript:;" class="sider-menu-folder"></a>');
+ var _a = $('<a href="javascript:;" id="'+_data.txt+'" class="sider-menu-folder"></a>');
var _i = $('<i class="fa fa fa-caret-right"></i>');
var _span = $('<span class="treeview-txt">'+_data.txt+'</span>');
if(_data.file) {
@@ -184,14 +184,25 @@
};
- _prop.activeFile = function(cla, txt, callback) {
+ _prop.activeFile = function(container, cla, id, callback) {
var rsCla = '.sider-menu-file'+'.'+cla;
- var aFiles = this.ele.find(rsCla);
+ var aFiles = container.find(rsCla);
+ console.log(aFiles.length);
// 娌℃湁鑾峰彇鍒板唴瀹瑰氨杩斿洖false
if(aFiles.length == 0) {
return false;
}
var tgt = aFiles.eq(0);
+
+ // 閬嶅巻鍒楄〃
+ aFiles.each(function() {
+ var _id = $(this).attr('id');
+ // id鍖归厤
+ if(_id == id) {
+ tgt = $(this);
+ }
+ });
+
tgt.click();
};
@@ -405,7 +416,7 @@
treeView.treeView(container, formatData);
//console.info(formatData);
if(active) {
- treeView.activeFile('eleGroup', '');
+ treeView.activeFile(container,'eleGroup', '');
var battId = formatData[0].id;
location.hash="#"+battId;
location.hash = "";
@@ -419,4 +430,199 @@
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
gl.pages.siderbar.fourth = fourth;
+
+})(jQuery, window, document, GLOBAL);
+
+
+// 璁剧疆鏍规嵁鐪佸競鏈烘埧鍜岀數姹犺繘琛屽畾浣�
+;(function($, window, document, gl, undefined) {
+ gl.namespace('pages.siderbar');
+
+ var homeInfo = {
+ StationName1: '',
+ StationName2: '',
+ StationName: '',
+ StationId: ''
+ };
+
+ var battId=undefined;
+
+ // 瀹氫綅鏈烘埧
+ function localSideBar(treeView, container, data) {
+ // 鍏抽棴鎵�鏈夌殑
+ treeView.ele.find('li').removeClass('sider-menu-open');
+
+
+ first(treeView, container);
+ homeInfo.StationName1 = data.province;
+ homeInfo.StationName2 = data.city;
+ homeInfo.StationName = data.home;
+ homeInfo.StationId = data.homeid;
+ battId = data.battid;
+ }
+
+ // 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
+ gl.pages.siderbar.localSideBar = localSideBar;
+
+ // 鐢熸垚涓�绾у鑸�-鐪�
+ function first(treeView, container) {
+ //treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchAllStation",
+ async:true,
+ dataType:'json',
+ data:null,
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+ treeView.spreadFolder('province', homeInfo.StationName1, firstSpread);
+ }else {
+
+ }
+ }
+ });
+ }
+
+ // 灞曞紑涓�绾у鑸�
+ function firstSpread(treeView, container) {
+ second(treeView, container, homeInfo, true);
+ }
+
+
+ // 鐢熸垚浜岀骇瀵艰埅-甯�
+ function second(treeView, container, data, spread) {
+ // 宸茬粡瀛樺湪
+ if(container.find('ul').length !=0) {
+ treeView.spreadFolder('city', homeInfo.StationName2, secondSpread, true);
+ return;
+ }
+ treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ treeView.delProgress(container);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFolder(__data.StationName2, 'city', __data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+
+ if(spread) {
+ treeView.spreadFolder('city', homeInfo.StationName2, secondSpread);
+ }
+ }
+ }
+ });
+ }
+
+ // 灞曞紑浜岀骇瀵艰埅
+ function secondSpread(treeView, container) {
+ third(treeView, container, homeInfo, true);
+ }
+
+
+ // 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+ function third(treeView, container, data, spread) {
+ // 宸茬粡瀛樺湪
+ if(container.find('ul').length !=0) {
+ location.hash="#"+homeInfo.StationName;
+ location.hash="";
+ treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
+ return;
+ }
+ treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ treeView.delProgress(container);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+ if(spread) {
+ treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
+ }
+ }
+ }
+ });
+ }
+
+ // 灞曞紑涓夌骇瀵艰埅
+ function thirdSpread(treeView, container, data) {
+ fourth(treeView, container, homeInfo, true);
+ }
+
+ // 鐢熸垚 涓夌骇瀵艰埅-鐢垫睜缁�
+ function fourth(treeView, container, data, active) {
+ // 宸茬粡瀛樺湪
+ if(container.find('ul').length !=0) {
+ container.addClass('sider-menu-open');
+ if(battId) {
+ treeView.activeFile(container,'eleGroup', battId);
+ }else {
+ treeView.activeFile(container,'eleGroup', '');
+ }
+ return;
+ }
+ treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchBattByStation",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ treeView.delProgress(container);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ //console.log(_data);
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFile(__data.BattGroupName, 'eleGroup', __data.BattGroupId, __data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+ if(active) {
+ if(battId) {
+ treeView.activeFile(container,'eleGroup', battId);
+ location.hash="#"+battId;
+ location.hash="";
+ }else {
+ treeView.activeFile(container,'eleGroup', '');
+ }
+ }
+ }
+ }
+ });
+ }
})(jQuery, window, document, GLOBAL);
\ No newline at end of file
--
Gitblit v1.9.1