From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:41:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-edit.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index a90b2c6..1d44c02 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -127,7 +127,7 @@
</div>
<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
<div class="layui-block">
- <label class="layui-form-label">璁惧鍚嶇О</label>
+ <label class="layui-form-label">FBS璁惧鍚嶇О</label>
<div class="layui-input-block">
<input type="text" name="FBSDeviceName" lay-verify="required" id="devname" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceName }}">
</div>
@@ -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