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/iframe/batt-info-edit.html | 138 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 103 insertions(+), 35 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index af9caf7..b570de3 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -134,41 +134,9 @@
</div>
<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
<div class="layui-block">
- <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
- <div class="layui-input-block">
- <select name="GroupIndexInFBSDevice" id="devindex">
- {{# layui.each([0,1,2,3], function(index) { }};
- {{# if(index == d.GroupIndexInFBSDevice) { }}
- <option value="{{ index }}" selected>{{ index }}</option>
- {{# }else{ }}
- <option value="{{ index }}">{{ index }}</option>
- {{# } }}
- {{# }); }}
- </select>
- </div>
- </div>
- </div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
- <div class="layui-block">
- <label class="layui-form-label">鐢垫睜缁処D</label>
- <div class="layui-input-block">
- <input type="text" name="BattGroupId" lay-verify="required|number" id="groupid" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupId }}">
- </div>
- </div>
- </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>
<div class="layui-input-block">
<input type="text" name="BattGroupNum" lay-verify="required|number" id="groupnum" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupNum }}">
- </div>
- </div>
- </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>
- <div class="layui-input-block">
- <input type="text" name="BattGroupName" lay-verify="required" id="groupname" autocomplete="off" class="layui-input" value="{{= d.BattGroupName }}">
</div>
</div>
</div>
@@ -264,7 +232,7 @@
<div class="layui-block">
<label class="layui-form-label">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
<div class="layui-input-block">
- <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
+ <input type="text" name="station_phone" lay-verify="required|number" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
</div>
</div>
</div>
@@ -333,6 +301,51 @@
</div>
</div>
</div>
+ <div class="layui-row layui-col-space8">
+ {{# layui.each(d.btsinfo, function(index, item) { }}
+ <div class="layui-col-lg6">
+ <div class="layui-card">
+ <div class="layui-card-header layui-bg-gray">{{item.BattGroupName}}</div>
+ <div class="layui-card-body">
+ <div class="layui-row layui-col-space8">
+ <div class="layui-col-lg6">
+ <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">
+ {{# layui.each([0,1,2,3], function(k) { }}
+ {{# if(item.GroupIndexInFBSDevice == k) { }}
+ <option value="{{ k }}" selected>{{ k }}</option>
+ {{# }else{ }}
+ <option value="{{ k }}">{{ k }}</option>
+ {{# } }}
+ {{# }); }}
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <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" value="{{item.BattGroupId}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <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}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{# }); }}
+ </div>
</script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript">
@@ -428,6 +441,23 @@
$('#fbsip').val(getDevIp(val));
});
+ // 鏍规嵁鏍囩О鐢靛帇淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);
+
+ // 鏍规嵁鍗曚綋鏁伴噺淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);
+
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ function setFloatAndoutLine() {
+ var vol = $('#monvol').val();
+ var monnum = $('#moncount').val();
+ var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
+ var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
+
+ $('#floatVolLevel').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $('#offlineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
+ }
+
// 鎻愪氦鍐呭
form.on('submit(enEidt)', function(data) {
layer.confirm('鏄惁纭淇敼', {icon: 3, title:'鎻愮ず'}, function(index){
@@ -437,8 +467,8 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- var temp = [_data];
- //console.log(temp);
+ var temp = analysisData(editInfo.btsinfo, _data);
+ // console.log(temp);
// 鏇存柊鏁版嵁
updBatt(temp);
});
@@ -502,6 +532,44 @@
}
});
}
+
+ // 瑙ｆ瀽娣诲姞鐨勬暟鎹�
+ function analysisData(btsinfo, data) {
+ //console.log(arr);
+ var rs = [];
+ for(var i=0; i<btsinfo.length; i++) {
+ var temp = {};
+ var _btsinfo = btsinfo[i];
+ var _num = _btsinfo.GroupIndexInFBSDevice;
+ var _index = 'group'+_num+'.index';
+ var _name = 'group'+_num+'.name';
+ var _id = 'group'+_num+'.id';
+ Object.keys(data).forEach(function(key) {
+ if(checkKeyNotVal(key)) {
+ if(key == _index) {
+ temp.GroupIndexInFBSDevice = data[key];
+ }else if(key == _name){
+ temp.BattGroupName = data[key];
+ }else if(key == _id) {
+ temp.BattGroupId = data[key];
+ }
+ }else {
+ temp[key] = data[key];
+ }
+ });
+
+ rs.push(temp);
+ }
+
+ return rs;
+ }
+
+ // 妫�娴嬪綋鍓嶅睘鎬ф槸鍚︿负搴熷睘鎬�
+ function checkKeyNotVal(key) {
+ var patt = /^group[0-9]{1}\./;
+
+ return patt.test(key);
+ }
});
</script>
</body>
--
Gitblit v1.9.1