From f59beda72702cbb8c22775ebc4c6c183f43662be Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 25 九月 2018 16:18:46 +0800
Subject: [PATCH] 添加内容
---
gx_tieta/WebRoot/control.jsp | 55 ++++++++++++++++++++++-----
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 13 +++---
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index e792f0f..0b06a6b 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -127,11 +127,6 @@
<table>
<tr>
<td id="ele_content">
- <!-- 鏈烘埧鏁扮數姹犵粍鏁� -->
- <div id="mach_num">
- <s:text name="Room_num"></s:text>:<span id="room_num"></span>; <s:text name="Batt_group_num"></s:text>:<span id="batt_group_num"></span>
- <div style="float: right; margin-right: 5px"><i class="fa"></i></div>
- </div>
<!--鐢垫睜缁勮彍鍗曟爮-->
<div id="lside">
@@ -981,8 +976,6 @@
var winHt = $(window).height();
var bodyHt = $('body').height();
var batt_listen = $('#ele_content .batt-listen').height();
- //console.info('*****');
- //console.info(batt_listen);
var shiftHt = winHt - bodyHt;
var graph = $('.graph').height();
var lSide = $('#lside').height();
@@ -2010,16 +2003,23 @@
//鏍规嵁褰撳墠閫変腑鐨勭數姹犵粍id鑾峰彇褰撳墠鐢垫睜缁勭殑淇℃伅
function getBatt(){
- 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){
+ console.info(battinlist);
return battinlist[i][k];
}
}
}
+ } */
+ var activeFile = $('.whyc-sider-menu .sider-menu-file.active');
+ if(activeFile.length == 1) {
+ return activeFile.data('attr');
+ }else {
+ return undefined;
}
- return undefined;
+
}
//灏嗘寚瀹氬垪涓殑涓巚alue鐩哥瓑鐨勫�肩殑鍗曞厓鏍煎彉涓虹孩鑹�
@@ -3944,6 +3944,8 @@
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',
@@ -3970,15 +3972,48 @@
third(treeView, $(this).parent(), city);
});
+ battinlist = [];
// 鏈烘埧->鐢垫睜缁�
treeView.ele.on('click', '.home', function() {
var home = $(this).data('attr');
var tmp = {
StationId: home.StationId
};
- console.info(tmp);
fourth(treeView, $(this).parent(), tmp);
});
+
+ // 鐢垫睜缁�
+ treeView.ele.on('click', '.eleGroup', function() {
+ var eleGroup = $(this).data('attr');
+ // 鏍规嵁BattGroupId鏌ヨ鏁版嵁
+ if(BattGroupId != eleGroup.BattGroupId) {
+ BattGroupId = eleGroup.BattGroupId;
+ // 瀵笲TS9611鍋氱壒娈婄殑澶勭悊
+ var batt = getBatt();
+ console.info(batt);
+ $('#eleCircleBtn').removeClass('hide');
+ if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {
+ var isAct = $('#eleCircleBtn').hasClass('action');
+ if(isAct) {
+ lname = 'Voltage';
+ $('#'+lname).addClass('action');
+ }
+
+ $('#eleCircleBtn').removeClass('action').addClass('hide');
+ $('.ele-circle').hide();
+ $('.graph').show();
+ myChart.resize();
+ }
+ mygraph.ischange = 1; //閲嶆柊缁樺埗鎷撴墤鍥�
+
+ getBattStr();
+ searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
+ clearInterval(time);
+ showtable();
+ time=window.setInterval("showtable()",4000);
+ }
+
+ });
});
</script>
<script type="text/javascript" src="js/Title.js"></script>
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 5c809fb..e72197a 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -89,14 +89,14 @@
// 璁剧疆鍐呭瀹瑰櫒
var _li = $('<li></li>');
var _a = $('<a href="javascript:;" class="sider-menu-folder"></a>');
- _a.addClass(_data.cla);
var _i = $('<i class="fa fa fa-caret-right"></i>');
var _span = $('<span>'+_data.txt+'</span>');
if(_data.file) {
_a = $('<a href="javascript:;" class="sider-menu-file"></a>');
_i = $('<i class="fa"></i>');
}
-
+ _a.addClass(_data.cla);
+
_a.append(_i);
_a.append(_span);
_li.append(_a);
@@ -212,6 +212,7 @@
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 = [];
@@ -246,6 +247,7 @@
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 = [];
@@ -280,17 +282,16 @@
data:"json = "+JSON.stringify(data),
success: function(data){
var rs = JSON.parse(data.result);
- console.info(rs);
+ treeView.delProgress(container);
if(rs.code == 1) {
var _data= rs.data;
var formatData = [];
- console.log(_data);
- return;
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName3, 'eleGroup', __data);
+ var tmp = treeView.getFile(__data.BattGroupName, 'eleGroup', __data);
formatData.push(tmp);
}
+ //console.info(batt);
treeView.treeView(container, formatData);
}else {
--
Gitblit v1.9.1