From 0c652f652fedd626383d7d3d151f23fee24a7680 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期一, 24 十二月 2018 16:02:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 90 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 8949974..cf87186 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -90,7 +90,7 @@
<div class="layui-form" lay-filter="homeFilter">
<div class="layui-form-item">
<div class="layui-input-block">
- <select name="home" id="home" lay-filter="home">
+ <select name="home" id="home" lay-filter="home" lay-search="">
<option value="">璇烽�夋嫨鏈烘埧</option>
</select>
</div>
@@ -653,38 +653,68 @@
if(len) {
_rsData = tOptions.data[len-1];
}
-
- // 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
- layer.open({
- type: 1
- ,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
- ,content: addGroupContent
- ,fixed: true
- ,resize: false
- ,btn:['纭畾', '鍙栨秷']
- ,yes: function(index) {
- var groupNum = $('#addGroupnum').val();
- layer.close(index);
- // 鐢熸垚鏁扮粍
- var _arr = [];
- for(var i=0; i<groupNum; i++) {
- _arr.push(i+1);
+ getMaxDevId(function(id) {
+ // 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
+ layer.open({
+ type: 1
+ ,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
+ ,content: addGroupContent
+ ,fixed: true
+ ,resize: false
+ ,btn:['纭畾', '鍙栨秷']
+ ,yes: function(index) {
+ var groupNum = $('#addGroupnum').val();
+ layer.close(index);
+ // 鐢熸垚鏁扮粍
+ var _arr = [];
+ for(var i=0; i<groupNum; i++) {
+ _arr.push(i+1);
+ }
+
+ _rsData.addGroupNum = _arr;
+ _rsData.FBSDeviceId = id;
+ $('#iframeEdit').data('data', _rsData);
+
+ iframePopup = layer.open({
+ type: 2
+ ,title: '鏂板缓鐢垫睜缁�'
+ ,area:['1200px', '520px']
+ ,resize: false
+ ,content: 'iframe/batt-info-add.html'
+ });
}
-
- _rsData.addGroupNum = _arr;
- $('#iframeEdit').data('data', _rsData);
-
- iframePopup = layer.open({
- type: 2
- ,title: '鏂板缓鐢垫睜缁�'
- ,area:['1200px', '520px']
- ,resize: false
- ,content: 'iframe/batt-info-add.html'
- });
- }
- });
+ });
+ });
+
});
+ // 鑾峰彇鏈�澶ц澶噄d
+ function getMaxDevId(callback) {
+ 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(isFunction(callback)) {
+ callback(rs.data);
+ }
+ }else {
+ layer.msg('璁＄畻璁惧id澶辫触锛�')
+ }
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+
+ });
+ }
+
// 鏌ヨ鐢垫睜缁勪俊鎭�
function search(temp, newLoad) {
--
Gitblit v1.9.1