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 | 265 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 225 insertions(+), 40 deletions(-)
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index eb0482d..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%;
@@ -46,31 +47,41 @@
<div class="whyc-page-layui-content-container">
<div class="whyc-page-layui-content" style="background-color: pink">
<div class="tbl-container">
- <div class="tbl-filter" lay-filter="tblFilter">
- <div class="layui-form layui-form-pane">
+ <div class="tbl-filter">
+ <div class="layui-form layui-form-pane" lay-filter="tblFilter">
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="province" id="province">
- <option value="">璇烽�夋嫨鐪�/鐩磋緰甯�</option>
- </select>
+ <div class="layui-form" lay-filter="provinceFilter">
+ <select name="province" id="province" lay-filter="province">
+ <option value="">璇烽�夋嫨鐪�/鐩磋緰甯�</option>
+ </select>
+ </div>
</div>
<div class="layui-input-inline">
- <select name="city" id="city" lay-filter="city">
- <option value="">璇烽�夋嫨甯�/鍖�</option>
- </select>
+ <div class="layui-form" lay-filter="cityFilter">
+ <select name="city" id="city" lay-filter="city">
+ <option value="">璇烽�夋嫨甯�/鍖�</option>
+ </select>
+ </div>
</div>
<div class="layui-input-inline">
- <select name="home" id="home" lay-search="">
- <option value="">璇烽�夋嫨鏈烘埧</option>
- </select>
+ <div class="layui-form" lay-filter="homeFilter">
+ <select name="home" id="home" lay-search="" lay-filter="home">
+ <option value="">璇烽�夋嫨鏈烘埧</option>
+ </select>
+ </div>
+
</div>
<div class="layui-input-inline">
- <select name="group" lay-filter="group" lay-search="" id="group">
- <option value="">璇烽�夋嫨鐢垫睜缁�</option>
- </select>
+ <div class="layui-form" lay-filter="groupFilter">
+ <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>
@@ -80,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>
@@ -106,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:[]
@@ -122,43 +133,48 @@
// 鐐瑰嚮鏌ヨ鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勭殑鍗曚綋鍒楄〃
$('#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('璇烽�夋嫨涓�缁勭數姹�');
+ }
});
-
- // 鍒囨崲绛涢�夋潯浠舵ā鍧�
- form.on('select(group)', function(data) {
- var dom = data.elem;
- var $dom = $(dom);
- console.log($dom.find('option:selected').data());
- });
-
// 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹�
table.on('tool(groupTbl)', function(obj) {
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'
+ });
}
+ // 鏌ヨ鐪佷笅鎷夋
searchProvince();
-
- // 鏌ヨ鐪佺殑鍒楄〃
+ // 鏌ヨ鐪�
function searchProvince() {
// 璇锋眰鍚庡彴鏌ヨ
$.ajax({
@@ -168,7 +184,176 @@
data: null,
dataType: 'json',
success:function(result) {
- var rs = result.result;
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#province'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data, _data, {}, {});
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'provinceFilter');
+
+ // 鏌ヨ甯�
+ searchCity();
+ }
+ });
+ }
+
+ // 鍒囨崲鐪�-甯�
+ form.on('select(province)', function(data) {
+ // 鏌ヨ甯�
+ searchCity();
+ });
+
+ // 鏌ヨ甯�
+ function searchCity() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1: $("#province").val()
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName2',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#city'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'cityFilter');
+
+ // 鏌ヨ鏈烘埧
+ searchHome();
+ }
+ });
+ }
+
+ // 鍒囨崲甯�-鏈烘埧
+ form.on('select(city)', function(data) {
+ // 鏌ヨ鏈烘埧
+ searchHome();
+ });
+
+ // 鏌ヨ鏈烘埧
+ function searchHome() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#province").val(),
+ StationName2:$("#city").val()
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName3',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#home'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: ''}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _attr = {
+ StationId: _data.StationId
+ };
+ var _tmp = getLayuiSelect(_data.StationName3, _data.StationName, _attr, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'homeFilter');
+
+ // 鏌ヨ鏈烘埧
+ searchGroup();
+ }
+ });
+ }
+
+ // 鍒囨崲鏈烘埧-鐢垫睜缁�
+ form.on('select(home)', function(data) {
+ // 鏌ヨ鐢垫睜缁�
+ searchGroup();
+ });
+
+ // 鏌ヨ鏈烘埧
+ function searchGroup() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#province").val(),
+ StationName2:$("#city").val(),
+ StationName: $("#home").val(),
+ StationId: $("#home").find('option:selected').attr('stationid')
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchBattByStation',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#group'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鐢垫睜缁�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'(鍏�'+_data.MonCount+"<s:text name='Section'/>"+')';
+ var _tmp = getLayuiSelect(txt, _data.BattGroupId, _attr, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'groupFilter');
}
});
}
--
Gitblit v1.9.1