From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-add.html | 98 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 2f06466..b43ff93 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -233,9 +233,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">浣跨敤鏃ユ湡</label>
+ <label class="layui-form-label">鎶曞叆浣跨敤鏃ユ湡</label>
<div class="layui-input-block">
- <input type="text" name="BattInUseDate" disabled="" id="usedate" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattInUseDate }}">
+ <input type="text" name="BattInUseDate" id="usedate" autocomplete="off" class="layui-input" value="{{= d.BattInUseDate }}">
</div>
</div>
</div>
@@ -404,8 +404,9 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+ var editPopupShow = parent.$('#iframeShowEidt');
var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];
- var battProducers = ['鍦ｉ槼', '鐞嗗＋', '閾舵嘲', '鍗楅兘', '鍙岀櫥', 'SENRY', '鑹鹃粯鐢�', '绉戝＋杈�', '涓版棩', '涓叴鑳芥淳', '鍏夊畤', '閮庤揪', '鑹捐鏂崕杈�', '闆勯煬', '椋庡竼', '鏂囬殕', '涓北'];
+ var battProducers = getBattProducers();
var monNums = [4, 24]
// 娣诲姞瀹屾垚鍚庢彁绀轰俊鎭殑妯℃澘
@@ -467,6 +468,7 @@
laydate.render({
elem: '#usedate'
,format: 'yyyy-MM-dd HH:mm:ss'
+ ,value: new Date()
});
});
@@ -541,30 +543,80 @@
// 鎻愪氦鍐呭
form.on('submit(enAdd)', function(data) {
- //console.log(data);
- layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
- var _data = data.field;
- var province = _data.StationName1; // 鐪�
- var city = _data.StationName2; // 甯�
- var home = _data.StationName3; // 鏈烘埧鍚嶇О
- var bts = _data.StationName4; // 璁惧鍚嶇О
- _data.StationName = province+'-'+city+'-'+home+'-'+bts;
-
- var temp = analysisData(editInfo.addGroupNum, _data);
-
- checkDevId(_data.FBSDeviceId, function(devid){
- // 娣诲姞鐢垫睜淇℃伅
- addBatt(temp);
- }, function(pre, max) {
- layer.msg('璁惧ID:'+pre+'琚崰鐢�,鎺ㄨ崘浣跨敤'+max);
- // 鏇存柊璁惧id鍜岃澶噄p
- $('#devid').val(max);
- $('#fbsip').val(getDevIp(max));
- });
+ // 鏍￠獙鏈烘埧鍚嶇О
+ checkHomeName(data, function() {
+ //console.log(data);
+ layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
+ var _data = data.field;
+ var province = _data.StationName1; // 鐪�
+ var city = _data.StationName2; // 甯�
+ var home = _data.StationName3; // 鏈烘埧鍚嶇О
+ var bts = _data.StationName4; // 璁惧鍚嶇О
+ _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+
+ var temp = analysisData(editInfo.addGroupNum, _data);
+
+ 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;
});
+ // 妫�娴嬫満鎴垮悕绉版槸鍚︾浉鍚�
+ function checkHomeName(data, callback) {
+ var _data = data.field;
+ var province = _data.StationName1; // 鐪�
+ var city = _data.StationName2; // 甯�
+ var home = _data.StationName3; // 鏈烘埧鍚嶇О
+ var bts = _data.StationName4; // 璁惧鍚嶇О
+ _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName: _data.StationName
+ };
+ var loading = layer.load(1);
+ // 璇锋眰鍚庡彴楠岃瘉
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!judgeBatt'
+ ,data: 'json='+JSON.stringify(tmp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ if(rs.code == 1) {
+ // 鏈烘埧宸插瓨鍦ㄥ垽鏂槸鍚﹁繘鍏ョ紪杈戞満鎴�
+ layer.confirm('璇ユ満鎴垮凡瀛樺湪锛屾槸鍚﹁繘鍏ョ紪杈戯紒',{icon:0, title: '鎻愮ず'}, function(index) {
+ // 鏄剧ず缂栬緫闈㈡澘
+ editPopupShow.data('sName', _data.StationName);
+ editPopupShow.click();
+ // 鍏抽棴娣诲姞闈㈡澘闈㈡澘
+ parent.$('#iframeClose').click();
+ });
+ }else {
+ callback();
+ }
+ }
+ ,error: function() {
+ layer.msg('鏍￠獙鏈烘埧鍚嶇О澶辫触锛岃閲嶆柊鎻愪氦锛�');
+ }
+ ,complete: function() {
+ layer.close(loading);
+ }
+ });
+
+ }
+
// 鐩戞祴褰撳墠鎻愪氦鐨勮澶嘔D鏄惁涓烘渶澶�
function checkDevId(devid, success, error) {
var load = layer.load(1);
--
Gitblit v1.9.1