From 0e1721488e6d8f091d13403e20f0bbf5cf397b96 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期二, 18 十二月 2018 18:08:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-edit.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index a90b2c6..1af0aaf 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -419,6 +419,7 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+ editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
// console.log(editInfo);
var data = {
StationId: '4011100'
--
Gitblit v1.9.1