From aaffaeae2f2b141663117c6c19e18f08f202e8f2 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@USER-20180117QL> Date: 星期四, 20 十二月 2018 08:48:03 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/iframe/batt-info-edit.html | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html index a90b2c6..ccbce2d 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> @@ -313,7 +313,7 @@ <div class="layui-block"> <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label> <div class="layui-input-block"> - <select name="group{{item.GroupIndexInFBSDevice}}.index"> + <select name="group{{index}}.index"> {{# layui.each([0,1,2,3], function(k) { }} {{# if(item.GroupIndexInFBSDevice == k) { }} <option value="{{ k }}" selected>{{ k }}</option> @@ -329,7 +329,7 @@ <div class="layui-block"> <label class="layui-form-label">鐢垫睜缁処D</label> <div class="layui-input-block"> - <input type="text" name="group{{item.GroupIndexInFBSDevice}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.BattGroupId}}"> + <input type="text" name="group{{index}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.BattGroupId}}"> </div> </div> </div> @@ -337,7 +337,7 @@ <div class="layui-block"> <label class="layui-form-label">鐢垫睜缁勫悕绉�</label> <div class="layui-input-block"> - <input type="text" name="group{{item.GroupIndexInFBSDevice}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}"> + <input type="text" name="group{{index}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}"> </div> </div> </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