From edcc62a5ab482f187e8d57af61c0f5a54b0b35b6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 26 九月 2018 14:45:58 +0800
Subject: [PATCH] 修改左侧导航内容
---
gx_tieta/WebRoot/css/control_style.css | 48 ---------
gx_tieta/WebRoot/charge-test.jsp | 97 ++++++++++++++++++-
gx_tieta/WebRoot/css/charge_test_style.css | 38 -------
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 89 +++++++++++++++--
4 files changed, 171 insertions(+), 101 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index a0c25c3..5b6373a 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -25,8 +25,8 @@
<link href="css/loading.css" type="text/css" rel="stylesheet" />
<link href="jqueryui/jquery-ui.css" type="text/css" rel="stylesheet" />
<link href="css/collapse.css" type="text/css" rel="stylesheet" />
- <link rel="stylesheet" type="text/css" href="css/confirm.css">
-
+<link rel="stylesheet" type="text/css" href="css/confirm.css">
+<link rel="stylesheet" href="css/common.css">
<!-- font-awesome-4.7.0 -->
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
<script type="text/javascript" src="js/echarts2.js"></script>
@@ -542,6 +542,7 @@
<script type="text/javascript" src="js/collapse.js"></script>
<script type="text/javascript" src="js/charge.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script> <!-- 纭妗� -->
+<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1924,7 +1925,7 @@
//鏍规嵁褰撳墠閫変腑鐨勭數姹犵粍id鏌ヨ褰撳墠鐢垫睜缁勭殑鍩烘湰淇℃伅
function getBattinfById(){
- if(battinlist!=undefined && BattGroupId!=undefined){
+ /* if(battinlist!=undefined && BattGroupId!=undefined){
for(var i=0;i<battinlist.length;i++){
for(var k=0;k<battinlist[i].length;k++){
if(BattGroupId==battinlist[i][k].BattGroupId){
@@ -1933,7 +1934,13 @@
}
}
}
- return undefined;
+ return undefined; */
+ var activeFile = $('.whyc-sider-menu .sider-menu-file.active');
+ if(activeFile.length == 1) {
+ return activeFile.data('attr');
+ }else {
+ return undefined;
+ }
}
function clearfourPicture(){
@@ -3728,7 +3735,7 @@
});
});
searchAll_lowAction(); //鑾峰彇闃�鍊�
- seachAllStation();
+ //seachAllStation();
//鏌ヨ鎵�鏈夋満鎴�
function seachAllStation(){
$.ajax({
@@ -4598,5 +4605,85 @@
var cont = '褰撳墠鐢垫睜缁勭殑鏍囩О瀹归噺锛�<input style="border: 1px solid #ccc;height: 24px;" type="text" value="'+batt.MonCapStd+'" class ="batt-moncapstd">AH';
myConfirm.show({content: cont, class: 'show-historydata'});
}
+ // siderbar妯″潡
+ $(function() {
+ var TreeView = GLOBAL.pages.TreeView;
+ var first = GLOBAL.pages.siderbar.first; // 涓�绾у鑸�
+ var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
+ var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
+ var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var treeView = new TreeView($('#lside'));
+ $('#lside').width($('#ele_content').width());
+ treeView.setContainer();
+ // 璁剧疆瀹瑰櫒鍙嫋鍔�
+ $('#ele_content').resizable({
+ handles: 'e',
+ maxWidth: 520,
+ minWidth: 200,
+ alsoResize: $('#lside'),
+ resize:function() {
+ treeView.setContainer();
+ }
+ });
+
+ // 鐢熸垚涓�绾у鑸�-鐪�
+ first(treeView, treeView.container);
+
+ // 鐪�->甯�
+ treeView.ele.on('click', '.province', function() {
+ var province = $(this).data('attr');
+ second(treeView, $(this).parent(), province);
+ });
+
+ // 甯�->鏈烘埧
+ treeView.ele.on('click', '.city', function() {
+ var city = $(this).data('attr');
+ third(treeView, $(this).parent(), city);
+ });
+
+ battinlist = [];
+ // 鏈烘埧->鐢垫睜缁�
+ treeView.ele.on('click', '.home', function() {
+ var home = $(this).data('attr');
+ var tmp = {
+ StationId: home.StationId
+ };
+ fourth(treeView, $(this).parent(), tmp);
+ });
+
+ // 鐢垫睜缁�
+ treeView.ele.on('click', '.eleGroup', function() {
+ var eleGroup = $(this).data('attr');
+
+ // 鍒濆鍖栫壒娈婅澶囩殑鍥炬爣
+ initSpecialGraphLine();
+
+ //鏄剧ず鐢垫睜鐨勮缁嗕俊鎭�
+ $('#address_infor').text($(this).parent().parent().parent().parent().siblings().first().text()+"-"+$(this).parent().parent().siblings().first().text()+"-"+$(this).text());
+ var fbsId = eleGroup.FBSDeviceId;
+ var isSpecial = regFbsId(fbsId);
+ $('.special-mon-data').removeClass('show');
+ BattGroupId=$(this).attr("id");
+ if(isSpecial) {
+ $('.special-mon-data').addClass('show');
+ var temp = {
+ BattGroupId:$(this).attr("id")
+ };
+ searchMonTestInfo(temp);
+ resizeSpecailGraph();
+ }else {
+ getBattStr();
+ findBattinfObj();
+ AllBataDate=new Array();
+ clearfourPicture();
+ findBatttestdata_infByBattGroupId();
+ searchAll_lowAction(); //鑾峰彇闃�鍊�
+ }
+
+
+ // 璁剧疆璁板綍鐨勭瑪鏁颁负-1
+ $('#testrecordcout').val('-1');
+ });
+ });
</script>
</html>
diff --git a/gx_tieta/WebRoot/css/charge_test_style.css b/gx_tieta/WebRoot/css/charge_test_style.css
index 3e79e2c..477528f 100644
--- a/gx_tieta/WebRoot/css/charge_test_style.css
+++ b/gx_tieta/WebRoot/css/charge_test_style.css
@@ -55,45 +55,7 @@
width: 100%;
height:460px;
background: white;
- overflow:scroll;
position:relative;
-}
-#lside>ul{
- position:absolute;
- top:0;
- left:0;
- width: 100%;
- margin-bottom: 30px;
-}
-#lside>ul>li>a{
- _display:block;
- display:block;
- color:black;
- font-size: 16px;
- padding:12px 5px;
- white-space: nowrap;
-}
-#lside>ul>li>ul{
- _display:block;
- display:none;
- }
-#lside>ul>li>ul>li>a{
- _display:block;
- display:block;
- font-size: 14px;
- padding:10px 20px;
- white-space: nowrap;
-}
-#lside>ul>li>ul>li>ul{
- _display:block;
- display:none;
-}
-#lside>ul>li>ul>li>ul>li>a{
- _display:block;
- display:block;
- font-size: 12px;
- padding:10px 10px 10px 40px;
- white-space: nowrap;
}
/* 鐢垫睜鍏呮斁鐢电洃娴嬫ā鍧� */
#ele_content .batt-listen {
diff --git a/gx_tieta/WebRoot/css/control_style.css b/gx_tieta/WebRoot/css/control_style.css
index db48907..34cc5ee 100644
--- a/gx_tieta/WebRoot/css/control_style.css
+++ b/gx_tieta/WebRoot/css/control_style.css
@@ -57,54 +57,6 @@
background: white;
position: relative;
}
-#lside>ul{
- width: 100%;
- position:absolute;
- margin-bottom: 30px;
-}
-#lside>ul>li>a{
- display:block;
- color:black;
- font-size: 16px;
- padding:12px 5px;
- white-space: nowrap;
-}
-#lside>ul>li>ul{
- display:none;
- }
-#lside>ul>li>ul>li>a{
- display:block;
- font-size: 14px;
- padding:10px 20px;
- white-space: nowrap;
-}
-#lside>ul>li>ul>li>ul{
- display:none;
-}
-#lside>ul>li>ul>li>ul>li>a{
- display:block;
- font-size: 12px;
- padding:10px 10px 10px 40px;
- white-space: nowrap;
-}
-#lside li.list-error a{
- color: #FF0000 !important;
-}
-#lside li.list-pink a{
- color: #f023df !important;
-}
-#lside li.list-blue a{
- color: #0000ff !important;
-}
-#lside li.list-lightBlue a{
- color: #5a5af3 !important;
-}
-#lside li.list-green a{
- color: #008000 !important;
-}
-#lside li.list-lightGreen a{
- color: #857d18 !important;
-}
/* 鐢垫睜鍏呮斁鐢电洃娴嬫ā鍧� */
#ele_content .batt-listen {
width: 100%;
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index c8ff446..6da7376 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -90,9 +90,9 @@
var _li = $('<li></li>');
var _a = $('<a href="javascript:;" class="sider-menu-folder"></a>');
var _i = $('<i class="fa fa fa-caret-right"></i>');
- var _span = $('<span>'+_data.txt+'</span>');
+ var _span = $('<span class="treeview-txt">'+_data.txt+'</span>');
if(_data.file) {
- _a = $('<a href="javascript:;" class="sider-menu-file"></a>');
+ _a = $('<a href="javascript:;" id="'+_data.id+'" class="sider-menu-file"></a>');
_i = $('<i class="fa"></i>');
}
_a.addClass(_data.cla);
@@ -120,10 +120,11 @@
};
// 鑾峰彇file鐨勪竴鏉℃暟鎹�
- _prop.getFile =function(txt, cla, attr) {
+ _prop.getFile =function(txt, cla, id, attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
+ tmp.id = id;
tmp.file = true;
tmp.attr = attr;
return tmp;
@@ -159,7 +160,42 @@
_prop.delProgress = function(container) {
container.find('.treeView-progressBar-container').remove();
};
-
+
+ // 灞曞紑鎸囧畾鐨�
+ _prop.spreadFolder = function(cla, txt, callback) {
+ var rsCla = '.sider-menu-folder'+'.'+cla;
+ var aFolders = this.ele.find(rsCla);
+ // 娌℃湁鑾峰彇鍒板唴瀹瑰氨杩斿洖false
+ if(aFolders.length == 0) {
+ return false;
+ }
+ var tgt = aFolders.eq(0);
+ aFolders.each(function() {
+ var _txt = $(this).find('.treeview-txt').text();
+ console.info();
+ if(txt == _txt) {
+ tgt = $(this);
+ }
+ });
+ tgt.parent().addClass('sider-menu-open');
+ // 璁剧疆鍥炶皟鍑芥暟骞朵笖璁剧疆榛樿鐨勫��
+ if(callback) {
+ callback(this, tgt.parent(), tgt.data('attr'));
+ }
+
+ };
+
+ _prop.activeFile = function(cla, txt, callback) {
+ var rsCla = '.sider-menu-file'+'.'+cla;
+ var aFiles = this.ele.find(rsCla);
+ // 娌℃湁鑾峰彇鍒板唴瀹瑰氨杩斿洖false
+ if(aFiles.length == 0) {
+ return false;
+ }
+ var tgt = aFiles.eq(0);
+ tgt.click();
+ };
+
// 娣诲姞鍒癵l.pages.TreeView鐨勫懡鍚嶇┖闂翠笅
gl.pages.TreeView = TreeView;
})(jQuery, window, document, GLOBAL);
@@ -187,6 +223,7 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
+ treeView.spreadFolder('province', '', firstSpread);
}else {
}
@@ -197,8 +234,14 @@
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
gl.pages.siderbar.first = first;
+ // 灞曞紑涓�绾у鑸�
+ function firstSpread(treeView, container, data) {
+ second(treeView, container, data, true);
+ }
+
+
// 鐢熸垚浜岀骇瀵艰埅-甯�
- function second(treeView, container, data) {
+ function second(treeView, container, data, spread) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
return;
@@ -222,6 +265,10 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
+
+ if(spread) {
+ treeView.spreadFolder('city', '', secondSpread, true);
+ }
}else {
}
@@ -232,8 +279,14 @@
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
gl.pages.siderbar.second = second;
+ // 灞曞紑浜岀骇瀵艰埅
+ function secondSpread(treeView, container, data) {
+ third(treeView, container, data, true);
+ }
+
+
// 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
- function third(treeView, container, data) {
+ function third(treeView, container, data, spread) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
return;
@@ -248,6 +301,7 @@
success: function(data){
var rs = JSON.parse(data.result);
treeView.delProgress(container);
+ console.info(rs);
if(rs.code == 1) {
var _data= rs.data;
var formatData = [];
@@ -257,6 +311,9 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
+ if(spread) {
+ treeView.spreadFolder('home', '', thirdSpread, true);
+ }
}else {
}
@@ -266,6 +323,15 @@
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
gl.pages.siderbar.third = third;
+
+ // 灞曞紑涓夌骇瀵艰埅
+ function thirdSpread(treeView, container, data) {
+ var tmp = {
+ StationId: data.StationId
+ };
+ fourth(treeView, container, tmp, true);
+ }
+
// 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
function thirdFile(treeView, container, data) {
@@ -288,7 +354,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.StationName3, 'home', __data);
+ var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -303,7 +369,7 @@
gl.pages.siderbar.thirdFile = thirdFile;
// 鐢熸垚 涓夌骇瀵艰埅-鐢垫睜缁�
- function fourth(treeView, container, data) {
+ function fourth(treeView, container, data, active) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
return;
@@ -323,11 +389,14 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.BattGroupName, 'eleGroup', __data);
+ var tmp = treeView.getFile(__data.BattGroupName, 'eleGroup', __data.BattGroupId, __data);
formatData.push(tmp);
}
- //console.info(batt);
treeView.treeView(container, formatData);
+
+ if(active) {
+ treeView.activeFile('eleGroup', '');
+ }
}else {
}
--
Gitblit v1.9.1