From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/charge-test.jsp | 124 ++++++++++++++---------------------------
1 files changed, 42 insertions(+), 82 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 5b6373a..084de30 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -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>
@@ -3185,8 +3185,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);
});
});
@@ -3496,18 +3498,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
});
}
@@ -3521,75 +3528,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();
- }
}
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
@@ -4612,6 +4550,7 @@
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();
@@ -4646,6 +4585,9 @@
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);
@@ -4680,6 +4622,24 @@
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');
--
Gitblit v1.9.1