From 5973f0a18285eec0e0b4d5187e725591b4d112a4 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期二, 11 十二月 2018 15:26:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-add.html | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 2ff4046..8f73e6c 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -96,7 +96,7 @@
<div class="layui-block">
<label class="layui-form-label">璁惧ID<span class="red">*</span></label>
<div class="layui-input-block">
- <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceId }}">
+ <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" disabled="" class="layui-input layui-bg-gray" value="{{= d.FBSDeviceId }}">
</div>
</div>
</div>
@@ -358,6 +358,9 @@
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