From 89cc717e3ccd49d49539b25d7a8554126504b51f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:20 +0800
Subject: [PATCH] 电池配组记录区/县添加
---
gx_tieta/WebRoot/control.jsp | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6c973d5..24d373a 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2896,8 +2896,9 @@
var batt = getBatt();
var province = batt.StationName1;
var city = batt.StationName2;
+ var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
});
});
@@ -2932,6 +2933,7 @@
val:_data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:0
});
@@ -2941,6 +2943,7 @@
val: _data.BattGroupId,
province: _data.stationName1,
city: _data.stationName2,
+ county: _data.stationName5,
home: _data.stationName,
isCharge:1
});
@@ -4111,6 +4114,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());
@@ -4135,10 +4139,16 @@
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 = [];
@@ -4148,10 +4158,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);
});
// 鐢垫睜缁�
@@ -4238,6 +4249,7 @@
var tmp = {
province: batt.StationName1,
city: batt.StationName2,
+ county: batt.StationName5,
home: batt.StationName,
homeid: batt.StationId,
battid: batt.BattGroupId
@@ -4281,11 +4293,12 @@
var tmp = {
province: battInfo.province,
city: battInfo.city,
+ county: battInfo.county,
home: battInfo.home,
homeid: battInfo.note,
battid: battInfo.val
};
-
+ //console.log(tmp);
localSideBar(treeView, treeView.container, tmp);
});
@@ -4305,7 +4318,8 @@
function findHome() {
var tmp = {
StationName1:'',
- StationName2: ''
+ StationName2: '',
+ StationName5:''
};
// 鏌ヨ灏嗕俊鎭�
@@ -4320,6 +4334,7 @@
label: _data.StationName+'('+_data.StationId+')',
province: _data.StationName1,
city: _data.StationName2,
+ county: _data.StationName5,
home: _data.StationName,
homeid: _data.StationId,
battid: undefined
--
Gitblit v1.9.1