From 2421e7a75751f1f8e0fc58811a7abcfd8420c13d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 29 十月 2018 10:48:49 +0800
Subject: [PATCH] 修复bug
---
gx_tieta/WebRoot/control.jsp | 34 +++++++++++++++++++++++++++++++++-
gx_tieta/WebRoot/ele-match-group.jsp | 4 ++--
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 19 ++++++++++---------
3 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index f2bd975..094ebad 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -281,7 +281,13 @@
<!-- 鐢垫睜缁勬満鍘嗗崱璇︾粏淇℃伅-->
<div id="card_infor">
<span class="title-log"><s:text name="The_battery_pack_machine_through_the_card"/></span> <!-- 鐢垫睜缁勬満鍘嗗崱 -->
- <div class="con-list ele-infor con-show">
+ <div id="cardInfoTab" class="whyc-tab-card">
+ <ul class="whyc-tab-title">
+ <li class="whyc-tab-this">鐢垫睜缁勪俊鎭�</li>
+ <li class="">鍩虹珯淇℃伅</li>
+ </ul>
+ </div>
+ <div class="con-list ele-infor con-show" style="height: 400px;overflow-y: auto">
<table>
<tr>
<th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
@@ -358,6 +364,14 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ </table>
+ </div>
+ <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
+ <table>
+ <tr>
+ <th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
+ <th><s:text name="Parameter_value"/></th> <!-- 鍙傛暟鍊� -->
</tr>
</table>
</div>
@@ -4167,6 +4181,24 @@
}
});
+
+ // 鏈哄巻鍗℃ā鍧�
+ $(function() {
+ // 鑾峰彇閫夐」鍗″垪琛�
+ var tabs = $('#cardInfoTab .whyc-tab-title li');
+ var tabContents = $('#card_infor .con-list');
+ // 鐐瑰嚮tabs瑙﹀彂
+ tabs.click(function() {
+ var index = $(this).index();
+ // 绉婚櫎鐗规晥
+ tabs.removeClass('whyc-tab-this');
+ tabContents.removeClass('con-show');
+
+ // 鏄剧ず鐗规晥
+ $(this).addClass('whyc-tab-this');
+ tabContents.eq(index).addClass('con-show');
+ });
+ });
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 86ac658..2b7fd9a 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -476,7 +476,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -509,7 +509,7 @@
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
var txt = '<input type="radio" name="city">'+ __data.StationName2;
- var tmp = treeView.getFolder(txt, 'city', __data);
+ var tmp = treeView.getFolder(txt, 'city', __data.StationName2,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 9a2d311..3b56f4d 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -65,7 +65,7 @@
// 璁剧疆瀹瑰櫒鐨勫搴�
_prop.setContainer = function() {
var eleWidth = this.ele.width();
- this.container.width(eleWidth+20);
+ //this.container.width(eleWidth+20);
};
// 鐢熸垚鍒楄〃
@@ -88,7 +88,7 @@
var _data = $.extend({}, defaults, data[i]);
// 璁剧疆鍐呭瀹瑰櫒
var _li = $('<li></li>');
- var _a = $('<a href="javascript:;" id="'+_data.txt+'" class="sider-menu-folder"></a>');
+ var _a = $('<a href="javascript:;" id="'+_data.id+'" 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) {
@@ -111,10 +111,11 @@
};
// 鑾峰彇folder鐨勪竴鏉℃暟鎹�
- _prop.getFolder = function (txt, cla,attr) {
+ _prop.getFolder = function (txt, cla, id,attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
+ tmp.id = id;
tmp.attr = attr;
return tmp;
};
@@ -237,7 +238,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -279,7 +280,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName2, 'city', __data);
+ var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -324,7 +325,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -480,7 +481,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -520,7 +521,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName2, 'city', __data);
+ var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -563,7 +564,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
--
Gitblit v1.9.1