From 18ce4fb0213f2e7a7369e0d8861b744a2cd1a940 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:26 +0800
Subject: [PATCH] 历史和实时互相跳转定位精确到电池组
---
gx_tieta/WebRoot/charge-test.jsp | 440 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 392 insertions(+), 48 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 084de30..4ef382f 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -27,6 +27,7 @@
<link href="css/collapse.css" type="text/css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" href="css/common.css">
+<link rel="stylesheet" type="text/css" href="css/popup-tbl.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>
@@ -77,13 +78,14 @@
<table id="all_content">
<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> <!--鐢垫睜缁勮彍鍗曟爮-->
+ <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"></div>
<div class="batt-listen">
<div class="count-num">
@@ -401,7 +403,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> <!-- 鍙傛暟鍚嶇О -->
@@ -481,6 +489,166 @@
</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>
+ <tr>
+ <td>绔欑偣ID</td>
+ <td id="station_stationid_ex"></td>
+ </tr>
+ <tr>
+ <td>绔欑偣鍚嶇О</td>
+ <td id="station_stationname"></td>
+ </tr>
+ <tr>
+ <td>鏈烘埧ID</td>
+ <td id="station_stationid"></td>
+ </tr>
+ <tr>
+ <td>鎵�灞炵粍缁�</td>
+ <td id="station_affiliation"></td>
+ </tr>
+ <tr>
+ <td>鏁版嵁鏉ユ簮</td>
+ <td id="station_dataSources"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃绫诲瀷</td>
+ <td id="station_stationType"></td>
+ </tr>
+ <tr>
+ <td>缁忕含搴�</td>
+ <td id="station_jinweidu"></td>
+ </tr>
+ <tr>
+ <td>鎵�鍦ㄥ湴鍧�</td>
+ <td id="station_stationAddr"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鐘舵��</td>
+ <td id="station_stationstate"></td>
+ </tr>
+ <tr>
+ <td>缁存姢鍗曚綅</td>
+ <td id="station_maintenanceCompany"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍦烘櫙</td>
+ <td id="station_stationscenario"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃浜ф潈</td>
+ <td id="station_stationproperty"></td>
+ </tr>
+ <tr>
+ <td>浣跨敤鍗曚綅</td>
+ <td id="station_useUnit"></td>
+ </tr>
+ <tr>
+ <td>鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_siteCode"></td>
+ </tr>
+ <tr>
+ <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_historySiteCode"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍐呴儴缂栧彿</td>
+ <td id="station_siteInternalNumber"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎷奸煶绠�绉�</td>
+ <td id="station_sitePinyinReferred"></td>
+ </tr>
+ <tr>
+ <td>涓枃绠�绉�</td>
+ <td id="station_siteChineseReferred"></td>
+ </tr>
+ <tr>
+ <td>鏄惁寮�閫氫笟鍔�</td>
+ <td id="station_isOpenBusiness"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆浜哄憳</td>
+ <td id="station_schoolPersonnel"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆鏃堕棿</td>
+ <td id="station_entryTime"></td>
+ </tr>
+ <tr>
+ <td>淇敼浜�</td>
+ <td id="station_modifyPeople"></td>
+ </tr>
+ <tr>
+ <td>淇敼鏃堕棿</td>
+ <td id="station_modifyTime"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td id="station_note"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+ <td id="station_receiveorvalidity"></td>
+ </tr>
+ <tr>
+ <td>绉诲姩绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCMCC"></td>
+ </tr>
+ <tr>
+ <td>鐢典俊绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCTC"></td>
+ </tr>
+ <tr>
+ <td>鑱旈�氱珯鍧�鍚嶇О</td>
+ <td id="station_siteNameCUCC"></td>
+ </tr>
+ <tr>
+ <td>鍝佺墝</td>
+ <td id="station_producer"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻鏃堕暱</td>
+ <td id="station_lastTimeLong"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻绫诲埆</td>
+ <td id="station_lastTimeType"></td>
+ </tr>
+ <tr>
+ <td>缁埅鍙戠敓鏃堕棿</td>
+ <td id="station_lastTimeDate"></td>
+ </tr>
+ <tr>
+ <td>鍏变韩鎯呭喌</td>
+ <td id="station_shareInfo"></td>
+ </tr>
+ <tr>
+ <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔＄姸鍐�</td>
+ <td id="station_electPower"></td>
+ </tr>
+ <tr>
+ <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+ <td id="station_isCanElectPower"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯璺▼</td>
+ <td id="station_upperStationRoute"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯闅炬槗绋嬪害</td>
+ <td id="station_upperStationDifficult"></td>
+ </tr>
+ <tr>
+ <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+ <td id="station_clienteleErrorService"></td>
+ </tr>
+ </table>
+ </div>
<input type="button" name="" id="out_card_infor" value="<s:text name='Return'/>">
</div>
@@ -528,6 +696,31 @@
</div>
<div id="bigEchartsCon"></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="clear"></div>
<div id="allGraph">
@@ -542,6 +735,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="js/popup.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript">
var permits;
@@ -609,6 +803,21 @@
searchUserColor();
loading.showLoading($('#lside'));
+
+ var localNav = new Popup($('#localNav'));
+ // 鍏呮斁鐢靛脊鍑烘璁剧疆
+ $(function() {
+ // 鍒濆鍖杔ocalNav寮瑰嚭妗�
+ $('#localNav').find('.close').bind('click', function() {
+ localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ // 绐楀彛澶у皬鏀瑰彉
+ $(window).resize(function() {
+ localNav.hidePopup();
+ });
+ });
+
// 璁剧疆echarts瀵硅薄
var specialMonVolLine;
@@ -1300,16 +1509,7 @@
$(this).css("background-color","#9bbaf3");
});
- function toInformationArray(list){
- Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
- Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
- checkArray = new Array();
- for(var i=0;i<list.length;i++){
- Monnum_list[i]="#"+list[i].mon_num;
- Monvol_list[i]=list[i].mon_vol.toFixed(3);
- checkArray.push(1);
- }
- }
+
//鏌ヨ鎸囧畾鐨勭數姹犵粍id涓嬫寚瀹氭祴璇曟鏁扮殑娴嬭瘯鏁版嵁
@@ -1461,14 +1661,28 @@
data=eval("("+data+")");
if(data.code==1){
data=data.data;
- //console.info(data);
batteststopDataList = data;
- toInformationArray(data);
+
+ var batt = getBattinfById();
+ //console.info(batt);
+ var moncount = batt.MonCount;
+
+ Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
+ Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
+ checkArray = new Array();
var arr = new Array();
- //console.info(data);
- for(var i=0;i<data.length;i++){
- arr[data[i].mon_num-1]=data[i].mon_vol.toFixed(3);
- }
+ for(var i=0;i<moncount;i++){
+
+ Monnum_list[i]="#"+(i+1);
+ if(data[i] != undefined){
+ Monvol_list[i]=data[i].mon_vol.toFixed(3);
+ }else{
+ Monvol_list[i]= (0).toFixed(3);
+ }
+ arr[i]=Monvol_list[i];
+ checkArray.push(1);
+ }
+
//console.info(arr);
//console.info(arrTh[li_index]);
$('#charge_thr_th').find('tr th').eq(1).text(arrTh[li_index]);
@@ -2004,6 +2218,7 @@
if(AllTestData!=undefined){
if(Monnum_list != undefined && Monnum_list.length>0){
AllData=new Array();
+ //console.info(Monnum_list);
for(var i=0;i<Monnum_list.length;i++){
batt_test_voldata[i] = new Array();
batt_test_tmpdata[i] = new Array();
@@ -2032,14 +2247,21 @@
batt_test_data[batt_index]=batt_test_data[batt_index-1].slice(0);
setArrayvalue(batt_test_voldata,batt_index);
setArrayvalue(batt_test_tmpdata,batt_index);
+ }else{
+ var batt = getBattinfById();
+ for(var k =0;k<batt.MonCount;k++){
+ batt_test_data[batt_index][k] = 0;
+ batt_test_voldata[k][batt_index] = 0;
+ batt_test_tmpdata[k][batt_index] = 0;
+ }
}
}
- if(max<AllTestData[i].mon_vol){
+ /* if(max<AllTestData[i].mon_vol){
max = AllTestData[i].mon_vol;
}
if(min>AllTestData[i].mon_vol){
min = AllTestData[i].mon_vol;
- }
+ } */
//console.info(AllTestData[i]);
batt_test_data[batt_index][AllTestData[i].mon_num-1] = AllTestData[i].mon_vol;
batt_test_voldata[AllTestData[i].mon_num-1][batt_index] = AllTestData[i].mon_vol;
@@ -2077,6 +2299,8 @@
// 鏍规嵁鎶樼嚎鍥剧殑鐘舵�佸�肩敓鎴愬搴旂殑鎶樼嚎
var line_status = $('#lineStatus').val();
if(line_status == 0) { // 鐢熸垚鍗曚綋鐢靛帇鎶樼嚎鍥�
+ max = getMaxFromArr(batt_test_voldata);
+ min = getMinFromArr(batt_test_voldata);
CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_voldata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
}else { // 鐢熸垚鍗曚綋
max = getMaxFromArr(batt_test_tmpdata);
@@ -3187,8 +3411,10 @@
var batt = getBattinfById();
var province = batt.StationName1;
var city = batt.StationName2;
+ var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&home='+home);
+ var homeid = batt.BattGroupId;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
});
});
@@ -3505,6 +3731,7 @@
val:_data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:0
});
@@ -3514,6 +3741,7 @@
val: _data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:1
});
@@ -4550,6 +4778,7 @@
var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
@@ -4574,11 +4803,18 @@
second(treeView, $(this).parent(), province);
});
- // 甯�->鏈烘埧
+ // 甯�->鍖�
treeView.ele.on('click', '.city', function() {
var city = $(this).data('attr');
third(treeView, $(this).parent(), city);
});
+
+ // 鍖�->鏈烘埧
+ treeView.ele.on('click', '.county', function() {
+ var county = $(this).data('attr');
+ fourth(treeView, $(this).parent(), county);
+ });
+
battinlist = [];
// 鏈烘埧->鐢垫睜缁�
@@ -4587,10 +4823,11 @@
var tmp = {
StationName1: home.StationName1,
StationName2: home.StationName2,
+ StationName5: home.StationName5,
StationName: home.StationName,
StationId: home.StationId
};
- fourth(treeView, $(this).parent(), tmp);
+ fifth(treeView, $(this).parent(), tmp);
});
// 鐢垫睜缁�
@@ -4622,28 +4859,135 @@
searchAll_lowAction(); //鑾峰彇闃�鍊�
}
- // 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
- var batt_list = $('.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
- };
- console.log(tmp);
- localSideBar(treeView, treeView.container, tmp);
- });
-
-
// 璁剧疆璁板綍鐨勭瑪鏁颁负-1
$('#testrecordcout').val('-1');
});
+
+ // 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
+ var batt_list = $('.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,
+ county: battInfo.county,
+ homeid: battInfo.note,
+ battid: battInfo.val
+ };
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
+ // 宸ュ叿鏉℃暣浣撴牱寮�
+ $('.siderbar-tools').tooltip();
+
+ // 宸ュ叿鏉�-鏈哄巻鍗�
+ $('#siderbarToolsCard').click(function(){
+ var batt = getBattinfById();
+ var tmp = {
+ province: batt.StationName1,
+ city: batt.StationName2,
+ home: batt.StationName,
+ county: batt.StationName5,
+ homeid: batt.StationId,
+ battid: batt.BattGroupId
+ };
+ findBattinfByBattGroupId(batt.BattGroupId);
+ findStationInfoByStation(batt);
+ // 鏍规嵁鏁版嵁瀹氫綅
+ 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 {
+
+ }
+ });
+
+
+ // 鏌ヨ鏈烘埧骞舵洿鏂皊ource
+ var homeSource = [];
+ findHome();
+
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#popupHomeName" ).autocomplete({
+ source: homeSource,
+ select: function(event, ui) {
+ localNav.homeInfo = ui.item; // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
+ });
+
+ // 鏌ヨ鏈烘埧
+ function findHome() {
+ var tmp = {
+ StationName1:'',
+ StationName2: '',
+ StationName5: ''
+ };
+
+ // 鏌ヨ灏嗕俊鎭�
+ $.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,
+ county: _data.StationName5,
+ 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>
</html>
--
Gitblit v1.9.1