From ad22ba26863980edd80a1f9adfebb8daba31d74d Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.12>
Date: 星期五, 26 十月 2018 11:50:23 +0800
Subject: [PATCH] 添加机房的是否安装的标识
---
gx_tieta/WebRoot/charge-test.jsp | 272 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 167 insertions(+), 105 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index a0c25c3..59320af 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>
@@ -419,10 +419,10 @@
<td><s:text name="Computer_room_IP"/></td> <!-- 鏈烘埧IP -->
<td id="StationIP"></td>
</tr>
- <!-- <tr>
- <td><s:text name="Batt_group"/>ID</td> 鐢垫睜缁処D
+ <tr>
+ <td><s:text name="Batt_group"/>ID</td> <!-- 鐢垫睜缁処D -->
<td id="batt_group_id"></td>
- </tr> -->
+ </tr>
<tr>
<td><s:text name="Battery_name"/></td> <!-- 鐢垫睜缁勫悕绉� -->
<td id="BattGroupName"></td>
@@ -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");
@@ -1299,16 +1300,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涓嬫寚瀹氭祴璇曟鏁扮殑娴嬭瘯鏁版嵁
@@ -1460,14 +1452,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]);
@@ -1924,7 +1930,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 +1939,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(){
@@ -1997,6 +2009,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();
@@ -2025,14 +2038,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;
@@ -2070,6 +2090,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);
@@ -3178,8 +3200,10 @@
$(function() {
$('body').on('click', '#nav a[href="control.jsp"]', function() {
var batt = getBattinfById();
- //console.info(batt.StationId);
- $(this).attr('href', 'control.jsp?battgroupId='+BattGroupId+'&stationId='+batt.StationId);
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var home = batt.StationName;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&home='+home);
});
});
@@ -3489,18 +3513,23 @@
if(model.code == 1){
//console.info(model.data);
for(var i = 0;i<model.data.length;i++){
- if(model.data[i].batt_test_type == 3){
+ var _data = model.data[i];
+ if(_data.batt_test_type == 3){
arr.push({
- note: model.data[i].note,
- val:model.data[i].BattGroupId,
- fbs: model.data[i].batt_test_tlong,
+ note:_data.note,
+ val:_data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:0
});
- }else if(model.data[i].batt_test_type == 2){
+ }else if(_data.batt_test_type == 2){
arr.push({
- note: model.data[i].note,
- val:model.data[i].BattGroupId,
- fbs: model.data[i].batt_test_tlong,
+ note: _data.note,
+ val: _data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:1
});
}
@@ -3514,75 +3543,6 @@
}
});
- }
-
- // 鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
- function createBattListen(ele, list) {
- //console.info(list);
- ele.text("");
- var discharge_num = 0;
- var charge_num = 0;
- var ul = $('<ul></ul>');
- for(var i = 0; i < list.length; i++) {
- var li = "";
- if(list[i].isCharge) {
- li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
- charge_num++;
- }else {
- li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
- discharge_num++;
- }
- ul.append(li);
- }
- $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
- $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
- ele.append(ul);
- }
- // 鐐瑰嚮鐢垫睜鍏呮斁鐢电洃娴嬪垪琛ㄨЕ鍙戜簨浠�
- $(function() {
- var batt_list = $('#ele_content .batt-listen .batt-list');
- batt_list.on('click', 'a', function(){
- var fbsId = $(this).attr('fbs');
- var isSpecial = regFbsId(fbsId);
- $('.special-mon-data').removeClass('show');
- batt_list.find('a').removeClass('active');
- $(this).addClass('active');
- BattGroupId=$(this).attr("value");
- locationBattPos($(this).attr('note'), $(this).attr('value'));
- if(isSpecial) {
-
- }else {
- clearfourPicture();
- }
- });
- });
-
- function BattlocationById(battid){
- if(battid!=undefined){
- BattGroupId = battid;
- $('#lside a').css({'background-color':'#fff'});
- //鑾峰緱涓�绾ц彍鍗曞苟灞曠ず浜岀骇鑿滃崟
- var secTag =$('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().next();
- var secTagA = $('#'+battid).parent().parent().siblings().first();
- //console.info(secTagA.text()+'******');
- if(secTagA.text().trim().length == 0) {
- secTagA.hide();
- }
- secTag.show();
- //$('#'+thr_id).parent().parent().siblings().first().parent().parent().siblings().first().next().show();
- //鑾峰緱浜岀骇鑿滃崟骞跺睍绀轰笁绾ц彍鍗�
- $('#'+battid).parent().parent().siblings().first().next().show();
- $('#'+battid).css('background-color','#9bbaf3');
- //涓�绾ц彍鍗曞睍寮�鏍峰紡
- $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').removeClass("down");
- $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').addClass("up");
- $('#'+battid).parent().parent().siblings().first().children('.mark').text('-');
- $('#'+battid).parent().parent().siblings().first().children('.mark').addClass('black');
- //alert($('#'+thr_id).parent().parent().siblings().first().text());
- location.hash="#"+battid;
- location.hash = '';
- $('#'+battid).click();
- }
}
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
@@ -3728,7 +3688,7 @@
});
});
searchAll_lowAction(); //鑾峰彇闃�鍊�
- seachAllStation();
+ //seachAllStation();
//鏌ヨ鎵�鏈夋満鎴�
function seachAllStation(){
$.ajax({
@@ -4598,5 +4558,107 @@
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 localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
+ 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 = {
+ StationName1: home.StationName1,
+ StationName2: home.StationName2,
+ StationName: home.StationName,
+ 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(); //鑾峰彇闃�鍊�
+ }
+
+ // 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
+ 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');
+ });
+ });
</script>
</html>
--
Gitblit v1.9.1