From 42acb64952c98e07a0b10bbc9bee4fefb8a72a79 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.17>
Date: 星期一, 29 十月 2018 16:42:33 +0800
Subject: [PATCH] 发声对象添加
---
gx_tieta/WebRoot/control.jsp | 188 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 183 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index ee80a7c..094ebad 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -113,6 +113,12 @@
.w400 {
width: 400px;
}
+ .w500 {
+ width: 500px;
+ }
+ .mr250 {
+ margin-left: -250px;
+ }
</style>
</head>
@@ -127,6 +133,13 @@
<table>
<tr>
<td id="ele_content">
+ <div class="siderbar-tools">
+ <div class="siderbar-tools-right">
+ <i class="fa fa-file-text-o" title="鏈哄巻鍗�" id="siderbarToolsCard"></i>
+ <i class="fa fa-search" title="鏌ヨ鏈烘埧" id="siderbarToolsSearch"></i>
+ <i class="fa fa-outdent" title="鍏ㄩ儴鏀剁缉" id="siderbarToolsHide"></i>
+ </div>
+ </div>
<!--鐢垫睜缁勮彍鍗曟爮-->
<div id="lside">
@@ -268,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> <!-- 鍙傛暟鍚嶇О -->
@@ -345,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>
@@ -802,6 +829,32 @@
</div>
</div>
+ <!-- 瀵艰埅瀹氫綅 -->
+ <div class="popup w500 mr250" id="localNav">
+ <div class="popup-title"><span>鏈烘埧鏌ヨ</span><a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧鍚嶇О/鏈烘埧id</th>
+ </tr>
+ <tr>
+ <td>
+ <input name="popupHomeName" id="popupHomeName" type="text">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="popup-footer">
+ <input type="button" name="" id="localNav_en" class="status-change-btn" value="纭畾" > <!-- 纭畾 -->
+ <input type="button" name="" class="close" value="鍙栨秷" > <!-- 鍙栨秷 -->
+ </div>
+ </div>
+
<!-- 鏈�澶у唴闃诲崟浣� -->
<div class="confirm">
<div class="confirm-header"><span>鏈�澶у唴闃诲崟浣擄紙鍓�10锛�</span><a href="javascript:closeConfirm();" class="close">X</a></div>
@@ -905,6 +958,7 @@
var equip61850_popup = new Popup($('#equip61850'));
var BTS_popup = new Popup($('#bts'));
var equip4016_popup = new Popup($('#equip4016'));
+ var localNav = new Popup($('#localNav'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -927,12 +981,18 @@
equip4016_popup.hidePopup(); // 闅愯棌61850寮瑰嚭妗嗗拰閬僵灞�
});
+ // 鍒濆鍖杔ocalNav寮瑰嚭妗�
+ $('#localNav').find('.close').bind('click', function() {
+ localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
+ });
+
// 绐楀彛澶у皬鏀瑰彉
$(window).resize(function() {
LD9_popup.hidePopup(); // 闅愯棌LD9寮瑰嚭妗嗗拰閬僵灞�
equip61850_popup.hidePopup(); // 闅愯棌61850寮瑰嚭妗嗗拰閬僵灞�
BTS_popup.hidePopup(); // 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
+ localNav.hidePopup();
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -1439,6 +1499,7 @@
data = eval("("+data+")");
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1450,6 +1511,8 @@
}else {
_str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);
}
+ //console.log(mygraph);
+ //debugger;
if(model.code == 1) {
var nowTime = new Date().getTime(); //褰撳墠鏃堕棿
var record = new Date(model.data[0].record_datetime).getTime();
@@ -3350,7 +3413,8 @@
if(regEquipType(batt.FBSDeviceId, globalPattern.BTS)) {
var temp = {
num: CMD_BTS_Stop,
- dev_id: batt.FBSDeviceId
+ dev_id: batt.FBSDeviceId,
+ TestCmd: 0
};
// 鏄剧ず鏄惁鍋滄娴嬭瘯
myConfirm.show({
@@ -3880,6 +3944,14 @@
$('.confirm-mask').hide();
}
+ // 鏈烘埧瀹氫綅闈㈡澘鏁版嵁鏌ヨ
+ $(function() {
+
+
+ });
+
+
+
// siderbar妯″潡
$(function() {
var TreeView = GLOBAL.pages.TreeView;
@@ -3954,6 +4026,7 @@
}
mygraph.ischange = 1; //閲嶆柊缁樺埗鎷撴墤鍥�
+
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
@@ -3965,6 +4038,7 @@
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
clearInterval(time);
+ mygraph.graphtype = 4;
showtable();
time=window.setInterval("showtable()",4000);
}
@@ -3979,7 +4053,7 @@
var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
var scrollY=$(window).scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
- console.log(scrollY);
+ //console.log(scrollY);
var oRightMenu=document.getElementById("right_menu");
$(this).click();
@@ -3988,7 +4062,7 @@
$("#right_menu").show();
$("#right_menu .more_menu").hide();
$("#right_menu .angle").hide();
- console.log(disX+"***"+disY);
+ //console.log(disX+"***"+disY);
//浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
oRightMenu.style.left= disX+'px';
oRightMenu.style.top= disY+scrollY+'px';
@@ -4003,6 +4077,47 @@
treeView.ele.find('li').removeClass('sider-menu-open');
});
+ // 宸ュ叿鏉℃暣浣撴牱寮�
+ $('.siderbar-tools').tooltip();
+
+ // 宸ュ叿鏉�-鏈哄巻鍗�
+ $('#siderbarToolsCard').click(function(){
+ var batt = getBatt();
+ var tmp = {
+ province: batt.StationName1,
+ city: batt.StationName2,
+ home: batt.StationName,
+ homeid: batt.StationId,
+ battid: batt.BattGroupId
+ };
+ findBattinfByBattGroupId(batt.BattGroupId);
+ // 鏍规嵁鏁版嵁瀹氫綅
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
+ // 宸ュ叿鏉�-鍏ㄩ儴鏀剁缉
+ $('#siderbarToolsHide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 宸ュ叿鏉�-鏌ヨ
+ $('#siderbarToolsSearch').click(function(){
+ localNav.homeInfo = undefined;
+ $('#popupHomeName').val('');
+ localNav.showPopup();
+ });
+
+ // 鐐瑰嚮闈㈡澘鐨勭‘瀹氭寜閽�
+ $('#localNav_en').click(function() {
+ // 瀹氫綅
+ if(localNav.homeInfo) {
+ localNav.hidePopup();
+ localSideBar(treeView, treeView.container, localNav.homeInfo);
+ }else {
+
+ }
+ });
+
// 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
var batt_list = $('#ele_content .batt-listen .batt-list');
batt_list.on('click', 'a', function(){
@@ -4016,10 +4131,73 @@
home: battInfo.home,
homeid: battInfo.note,
battid: battInfo.val
- }
+ };
localSideBar(treeView, treeView.container, tmp);
});
+
+ // 鏌ヨ鏈烘埧骞舵洿鏂皊ource
+ var homeSource = [];
+ findHome();
+
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#popupHomeName" ).autocomplete({
+ source: homeSource,
+ select: function(event, ui) {
+ localNav.homeInfo = ui.item; // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
+ });
+
+ // 鏌ヨ鏈烘埧
+ function findHome() {
+ var tmp = {
+ StationName1:'',
+ StationName2: ''
+ };
+
+ // 鏌ヨ灏嗕俊鎭�
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
+ var rs = JSON.parse(result.result);
+ if(rs.code==1){
+ homeSource = [];
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ label: _data.StationName+'('+_data.StationId+')',
+ province: _data.StationName1,
+ city: _data.StationName2,
+ home: _data.StationName,
+ homeid: _data.StationId,
+ battid: undefined
+ };
+
+ // 娣诲姞鍒拌祫婧�
+ homeSource.push(tmp);
+ }
+ $( "#popupHomeName" ).autocomplete('option', 'source', homeSource);
+ }
+ });
+ }
+
+ });
+
+ // 鏈哄巻鍗℃ā鍧�
+ $(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>
--
Gitblit v1.9.1