From 5de347e1a4dc3b32b230e092cd12cac9af75bda0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 14:15:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/set-match-group.jsp | 101 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index 6ab2b3c..34b0406 100644
--- a/gx_tieta/WebRoot/set-match-group.jsp
+++ b/gx_tieta/WebRoot/set-match-group.jsp
@@ -23,6 +23,7 @@
<link rel="stylesheet" type="text/css" href="css/basic.css" />
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" href="pages/css/common.css">
+ <link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
html, body {
height: 100%;
@@ -73,14 +74,14 @@
</div>
<div class="layui-input-inline">
<div class="layui-form" lay-filter="groupFilter">
- <select name="group" id="group" lay-filter="group" lay-search="">
+ <select name="group" id="group" lay-filter="group">
<option value="">璇烽�夋嫨鐢垫睜缁�</option>
</select>
</div>
</div>
</div>
- <button class="layui-btn layui-btn-sm layui-btn-normal" id="search"><i class="fa fa-search"></i> 鏌ヨ</button>
+ <button class="layui-btn layui-btn-sm" id="search"><i class="fa fa-search"></i> 鏌ヨ</button>
</div>
</div>
@@ -90,9 +91,11 @@
</div>
</div>
</div>
+ <div id="setMatchGroupData"></div>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="src/layui.js"></script>
+ <script type="text/javascript" src="pages/js/mylayui.js"></script>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="replace">鏇存崲</a>
</script>
@@ -116,8 +119,6 @@
,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'}
,{field:'nominalcap', title:'鏍囩О瀹归噺', align:'center'}
,{field:'monvol', title:'鏍囩О鐢靛帇锛圴锛�', align:'center'}
- ,{field:'relcap', title:'瀹為檯瀹归噺', align:'center'}
- ,{field:'percap', title:'瀹归噺鐧惧垎姣�(%)', align:'center'}
,{fixed: 'right', title:'鎿嶄綔', toolbar: '#toolBar', width: 70}
]]
,data:[]
@@ -132,15 +133,18 @@
// 鐐瑰嚮鏌ヨ鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勭殑鍗曚綋鍒楄〃
$('#search').click(function() {
- var data = [{stationname: 'xxx'},{stationname: 'enen'}];
- var num = data.length;
- tOptions.data = data;
- // 璁剧疆鍒嗛〉淇℃伅
- // tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞�
- tOptions.page.limit = num;
- tOptions.page.limits = [num];
- // 閲嶆柊缁樺埗琛ㄦ牸
- table.reload('groupTbl', tOptions);
+ var groupData = $('#group').find('option:selected').data('data');
+ // 鍒ゆ柇鏄惁宸茬粡閫変腑鐢垫睜缁�
+ if(groupData) {
+ $('#setMatchGroupData')
+ console.log(groupData);
+ tOptions.data = [{}];
+ table.render(tOptions);
+ }else {
+ tOptions.data = [];
+ table.render(tOptions);
+ layer.msg('璇烽�夋嫨涓�缁勭數姹�');
+ }
});
// 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹�
@@ -148,14 +152,24 @@
var event = obj.event;
switch(event) {
case 'replace':
- showReplacePanel();
+ showReplacePanel(obj.data);
break;
}
});
// 鏄剧ず鏇存崲鐢垫睜鍗曚綋闈㈡澘
- function showReplacePanel() {
-
+ function showReplacePanel(obj) {
+ $('#setMatchGroupData').data('data', obj);
+
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '鏇存崲鐢垫睜',
+ area: ['1200px', '500px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/set-match-group.html'
+ });
}
// 鏌ヨ鐪佷笅鎷夋
@@ -175,7 +189,7 @@
var ele = $('#province'); // 鐩爣select
if(rs.code == 1) {
var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, {}));
+ list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -183,7 +197,7 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, {}));
+ list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
}
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
@@ -221,7 +235,7 @@
var ele = $('#city'); // 鐩爣select
if(rs.code == 1) {
var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, {}));
+ list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -229,7 +243,7 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, {}));
+ list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
}
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
@@ -268,7 +282,7 @@
var ele = $('#home'); // 鐩爣select
if(rs.code == 1) {
var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: ''}, {}));
+ list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: ''}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -279,7 +293,7 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, {}));
+ list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
}
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
@@ -320,7 +334,7 @@
var ele = $('#group'); // 鐩爣select
if(rs.code == 1) {
var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鐢垫睜缁�', '0', {}, {}));
+ list.push(getLayuiSelect('璇烽�夋嫨鐢垫睜缁�', '', {}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -334,7 +348,7 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, {}));
+ list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
}
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
@@ -342,45 +356,6 @@
form.render('select', 'groupFilter');
}
});
- }
-
- // 鐢熸垚鐗瑰畾鐨剆elect鍒楄〃
- function createLayuiSelect(ele, list) {
- // 娓呯┖鍐呭
- ele.text('');
- // 閬嶅巻list缁撴灉闆嗙敓鎴愪笅鎷�
- for(var i=0; i<list.length; i++) {
- var _list = list[i];
- var option = $('<option></option>'); // option鍏冪礌
- // 璁剧疆option鐨勬枃鏈�/灞炴�у��/data鍊�
- option.text(_list.txt);
- option.val(_list.val);
- option.data('data', _list.data);
- Object.keys(_list.attr).forEach(function(key){
- var val = _list.attr[key];
- option.attr(key, val);
- });
- ele.append(option);
- }
- }
-
- // 鏋勯�犵敓鎴恠elect鍒楄〃鐨勫璞℃暟缁�
- function getLayuiSelect(txt, val, attr, data) {
- var obj = {
- val: '',
- txt: '',
- attr: {},
- data: {}
- };
-
- // 璁剧疆鍐呭鐨勫��
- obj.val = val; // option鐨剉alue鍊�
- obj.txt = txt; // option鐨勬枃鏈��
- obj.attr = attr; // option鐨勮嚜瀹氫箟鐨勫睘鎬�
- obj.data = data; // option鐨刣ata鍊�
-
- // 杩斿洖鏋勯�犵殑瀵硅薄
- return obj;
}
});
</script>
--
Gitblit v1.9.1