From 6382c2a4220ff5774dba39848c2faabf0f7002f1 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 10 十二月 2018 10:39:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 88 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 9437d58..e23abfc 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -483,14 +483,80 @@
// 缂栬緫鐢垫睜缁勪俊鎭�
function editBattGroup(obj) {
- $('#iframeEdit').data('data', obj.data);
- iframePopup = layer.open({
- type: 2
- ,area:['1200px', '520px']
- ,resize: false
- ,content: 'iframe/batt-info-edit.html'
- });
+ //console.log(obj);
+ searchHomeInfoByName(obj.data.StationName);
}
+
+ // 鏍规嵁鏈烘埧鐨勫悕绉版煡璇㈡満鎴跨殑淇℃伅
+ function searchHomeInfoByName(homename) {
+ var temp = {
+ binf:{
+ StationName1: '', // 鐪�
+ StationName2: '', // 甯�
+ StationName5: '', // 鍖�/鍘�
+ StationName: homename // 鏈烘埧鍚嶇О
+ }
+ ,page: {
+ pageCurr: 1
+ ,pageSize: 100
+ }
+ };
+
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!searchInform",
+ async:true,
+ dataType:'json',
+ data:"json="+JSON.stringify(temp),
+
+ success: function(res){
+ var rs = JSON.parse(res.result)
+ if(rs.code == 1) {
+ var data = rs.data;
+ var tmp = {
+ btsinfo:[]
+ };
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ // 閬嶅巻缁撴灉闆嗙敓鎴愮壒娈婄殑鏍煎紡鏁版嵁
+ var _tmp = {};
+ Object.keys(_data).forEach(function(key) {
+ if(key == 'GroupIndexInFBSDevice') { // 璁惧绱㈠紩
+ _tmp.GroupIndexInFBSDevice = _data.GroupIndexInFBSDevice;
+ }else if(key == 'BattGroupName') { // 鐢垫睜缁勫悕绉�
+ _tmp.BattGroupName = _data.BattGroupName;
+ }else if(key == 'BattGroupId') { // 鐢垫睜缁処D
+ _tmp.BattGroupId = _data.BattGroupId;
+ }else {
+ tmp[key] = _data[key];
+ }
+ });
+
+ tmp.btsinfo.push(_tmp);
+ }
+
+ //console.log(tmp);
+ $('#iframeEdit').data('data', tmp);
+ iframePopup = layer.open({
+ type: 2
+ ,title: '淇敼鐢垫睜缁�'
+ ,area:['1200px', '520px']
+ ,resize: false
+ ,content: 'iframe/batt-info-edit.html'
+ });
+ }else {
+ layer.msg('鑾峰彇鏁版嵁澶辫触锛�')
+ }
+ },
+ complete: function() {
+ layer.close(load);
+ }
+ });
+ }
+
// 鍒犻櫎鐢垫睜缁�
function delBattGroup(obj) {
@@ -510,12 +576,12 @@
var bts = data.StationName4; // 璁惧鍚嶇О
data.StationName = province+'-'+city+'-'+home+'-'+bts;
var temp = [data];
- delBatt(temp);
+ delBatt(temp, obj);
});
}
//鍒犻櫎澶氫釜鐢垫睜缁�
- function delBatt(temp){
+ function delBatt(temp, obj){
var load = layer.load(1);
$.ajax({
type: "post",
@@ -529,7 +595,8 @@
//console.info(model);
if(model.code ==1){
layer.msg('鍒犻櫎鎴愬姛锛�');
- $('#paging .search').click();
+ obj.del();
+ //$('#paging .search').click();
}else{
layer.msg('鍒犻櫎澶辫触锛�');
}
@@ -609,6 +676,7 @@
iframePopup = layer.open({
type: 2
+ ,title: '鏂板缓鐢垫睜缁�'
,area:['1200px', '520px']
,resize: false
,content: 'iframe/batt-info-add.html'
--
Gitblit v1.9.1