From 2e9957c187b7735453fe8225bd095e64b072334e Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期一, 17 十二月 2018 19:19:56 +0800
Subject: [PATCH] 添加内容
---
gx_tieta/WebRoot/iframe/batt-info-add.html | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index f7e1740..1c5bb17 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -28,7 +28,7 @@
<div style="height: 8px;"></div>
<div class="layui-row">
<div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
- <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enAdd">纭娣诲姞</button>
+ <button class="layui-btn layui-btn-sm layui-btn-normal layui-anim-scaleSpring" lay-submit="" lay-filter="enAdd">纭娣诲姞</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">鍏抽棴闈㈡澘</button>
</div>
</div>
@@ -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>
@@ -240,7 +240,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>
@@ -347,6 +347,8 @@
{{# }); }}
</div>
</script>
+ <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript">
layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
@@ -358,6 +360,9 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+
+
+ editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
//console.log(editInfo);
var data = {
StationId: '4011100'
@@ -441,6 +446,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(enAdd)', function(data) {
// console.log(data);
@@ -451,14 +473,56 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- //console.log(_data);
+ // console.log(_data);
var temp = analysisData(editInfo.addGroupNum, _data);
//console.log(temp);
- // 娣诲姞鐢垫睜淇℃伅
- addBatt(temp);
+ checkDevId(_data.FBSDeviceId, function(devid){
+ // 娣诲姞鐢垫睜淇℃伅
+ addBatt(temp);
+ }, function(pre, max) {
+ layer.msg('璁惧ID:'+pre+'琚崰鐢�,鎺ㄨ崘浣跨敤'+max);
+ // 鏇存柊璁惧id鍜岃澶噄p
+ $('#devid').val(max);
+ $('#fbsip').val(getDevIp(max));
+ });
});
return false;
});
+
+ // 鐩戞祴褰撳墠鎻愪氦鐨勮澶嘔D鏄惁涓烘渶澶�
+ function checkDevId(devid, success, error) {
+ var load = layer.load(1);
+ // 鏌ヨ鍚庡彴
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!searchmaxdev_id'
+ ,data:null
+ ,dataType: 'json'
+ ,success:function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.data.length != 0) {
+ if(rs.data == devid) {
+ if(isFunction(success)) {
+ success(rs.data);
+ }
+ }else {
+ if(isFunction(error)) {
+ error(devid, rs.data);
+ }
+ }
+
+ }else {
+ layer.msg('璁＄畻璁惧id澶辫触锛�')
+ }
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+
+ });
+ }
+
// 鍏抽棴闈㈡澘
$('#closePage').click(function() {
@@ -542,8 +606,7 @@
}, 3000);
}else{
layer.msg('娣诲姞澶辫触锛�');
- }
- loading.hideLoading($('#main'));
+ }
},
error:function(){
layer.msg('娣诲姞澶辫触锛�');
--
Gitblit v1.9.1