From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +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-add.html | 126 +++++++++++++++++++++++++++++++++++++----
1 files changed, 113 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index ac7051a..535f425 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>
@@ -48,7 +48,7 @@
<div class="layui-block">
<label class="layui-form-label">鐪�</label>
<div class="layui-input-block">
- <input type="text" name="StationName1" lay-verify="required" id="province" autocomplete="off" class="layui-input" value="{{= d.StationName1 }}">
+ <select name="StationName1" id="province" lay-filter="province"></select>
</div>
</div>
</div>
@@ -56,7 +56,7 @@
<div class="layui-block">
<label class="layui-form-label">甯�</label>
<div class="layui-input-block">
- <input type="text" name="StationName2" lay-verify="required" id="StationName2" autocomplete="off" class="layui-input" value="{{= d.StationName2 }}">
+ <select name="StationName2" id="city" lay-filter="city"></select>
</div>
</div>
</div>
@@ -64,7 +64,7 @@
<div class="layui-block">
<label class="layui-form-label">鍖�/鍘�</label>
<div class="layui-input-block">
- <input type="text" name="StationName5" lay-verify="required" id="county" autocomplete="off" class="layui-input" value="{{= d.StationName5 }}">
+ <select name="StationName5" id="county"></select>
</div>
</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>
@@ -126,7 +126,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>
@@ -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,7 +347,10 @@
{{# }); }}
</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" src="../pages/js/mylayui.js"></script>
<script type="text/javascript">
layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
var form = layui.form;
@@ -358,6 +361,9 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+
+
+ editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
//console.log(editInfo);
var data = {
StationId: '4011100'
@@ -411,8 +417,43 @@
elem: '#usedate'
,format: 'yyyy-MM-dd HH:mm:ss'
});
+ });
+
+ // 娣诲姞鐪�-甯�-鍖�/鍘胯仈鍔ㄦ搷浣�
+ var linkAge = new LinkAge('../json/cut-area.json', $('#province'), $('#city'), $('#county'), function() {
+ form.render();
+ });
+
+ // 鐪佸垏鎹� 鏇存柊 甯�-鍖�/鍘�
+ form.on('select(province)', function(data) {
+ var elem = $(data.elem);
+ var val = elem.find('option:selected').attr('num');
+
+ // 甯�
+ var citiesData = linkAge._getCities(val);
+ var citiesOptions = linkAge._createDom(citiesData);
+ linkAge.city.html(citiesOptions);
+ // 鍖�/鍘�
+ var countiesData = linkAge._getCounty(val, linkAge.city.find('option:selected').attr('num'));
+ var countiesOptions = linkAge._createDom(countiesData);
+ linkAge.county.html(countiesOptions);
+ form.render();
+ });
+
+
+ // 甯傚垏鎹� 鏇存柊鍖�/鍘�
+ form.on('select(city)', function(data) {
+ var elem = $(data.elem);
+ var val = elem.find('option:selected').attr('num');
+ console.log(linkAge.province.find('option:selected').attr('num'));
+ // 鍖�/鍘�
+ var countiesData = linkAge._getCounty(linkAge.province.find('option:selected').attr('num'), val);
+ var countiesOptions = linkAge._createDom(countiesData);
+ linkAge.county.html(countiesOptions);
+
+ form.render();
});
// 楠岃瘉淇℃伅
@@ -441,9 +482,26 @@
$('#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);
+ //console.log(data);
layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
var _data = data.field;
var province = _data.StationName1; // 鐪�
@@ -451,14 +509,56 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- //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() {
@@ -538,11 +638,11 @@
layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
setTimeout(function() {
parent.$('#iframeClose').click();
+ parent.$('#paging .search').click();
}, 3000);
}else{
layer.msg('娣诲姞澶辫触锛�');
- }
- loading.hideLoading($('#main'));
+ }
},
error:function(){
layer.msg('娣诲姞澶辫触锛�');
--
Gitblit v1.9.1