From 8950b527f88b682913c4c05a5e1cdd8f18e7d468 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 15:18:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equip-charge-param.jsp | 248 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 190 insertions(+), 58 deletions(-)
diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index ba216b7..7cc7238 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -19,6 +19,7 @@
<link href="css/basic.css" type="text/css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="css/query.css">
<link rel="stylesheet" type="text/css" href="css/confirm.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
.tbl-toolbox {
bottom: 80px;
@@ -35,26 +36,32 @@
<div id="main">
<!-- 鏌ヨ鏉′欢寮�濮� -->
<div class="query-list">
- <div class="query-header"><a href="javascript:;"><s:text name="Equipment_discharg_model_param"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁� 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+ <div class="query-header"><a href="javascript:;"><s:text name="Discharg_model_state"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁� 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
<!-- 鏌ヨ鏉′欢鍐呭寮�濮� -->
<div class="query-body">
<form action="" id="search_form">
<table>
<thead>
<tr>
- <th><s:text name="Maintenance_area"/><!-- 缁存姢鍖� --></th>
+ <th>鐪�<!-- 鐪� --></th>
+ <th>甯�<!-- 甯� --></th>
+ <th>鍖�/鍘�<!-- 鍖�/鍘� --></th>
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣 --></th>
</tr>
</thead>
<tbody>
<tr>
<td>
- <select id="station_name1" name="station_name1">
- </select>
+ <select id="station_name1" name="station_name1"></select>
+ </td>
+ <td>
+ <select id="city" name="station_name2"></select>
+ </td>
+ <td>
+ <select id="county" name="station_name5"></select>
</td>
<td>
- <select id="station_name" name="station_name">
- </select>
+ <select id="station_name" name="station_name"></select>
</td>
</tr>
</tbody>
@@ -84,6 +91,7 @@
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/myinterval.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -237,7 +245,7 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code == 1){
for(var i = 0;i<model.data.length;i++){
data = model.data;
@@ -305,7 +313,6 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
if(model.code == 1){
var arr = new Array();
for(var i = 0;i<model.data.length;i++){
@@ -350,71 +357,196 @@
}
+ var isNewLoad = true; //鏄惁绗竴娆″姞杞介〉闈�
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
+ var pre_province = getQueryString('province');
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction!serchByStationNot91",null,function(data){
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
data=eval("("+data+")");
//console.info(data);
- var $select=$("#station_name1");
- $select.text("");
if(data.code==1 && data.data.length>0){
+ var $select = $("#station_name1");
+ $select.text('');
for(var i=0;i<=data.data.length;i++){
$option=$("<option></option>");
if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
+ $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
$option.attr("value", "");
}else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
+ $option.text(data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
+ if(pre_province == data.data[i-1] && isNewLoad){
+ $option.attr("selected",true);
+ }
}
$select.append($option);
- }
- }else{
- var $option=$("<option>鏆傛棤9100S缁存姢鍖�</option>");
- $select.append($option);
- }
- findStationNamebyStationname1();
- });
-
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- //var stationid = getQueryString("stationId");
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction!serchByStationNameNot91","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName);
- $option.attr("value",data.data[i-1].FBSDeviceId);
- $option.attr("dev_name",data.data[i-1].FBSDeviceName);
- $option.attr("stataion_name",data.data[i-1].StationName);
- $option.attr("stataion_name1",data.data[i-1].StationName1);
- $select.append($option);
- }
-
- }
}
- });
- }
+ }else{
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ }
+ findCity();
+ });
});
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_city = getQueryString("city");
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findCounty();
+ }
+ });
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_county = getQueryString('county');
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty();
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(isLoad){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_home = getQueryString('home');
+
+ var auto_seach = false;
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
+ var $select = $("#station_name");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ 'stataion_name1': __data.StationName1,
+ 'stataion_name': __data.StationName,
+ 'dev_name': __data.FBSDeviceName
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr,{},true);
+ auto_seach = true;
+
+ }
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ if(auto_seach){
+ var temp = createSearchParam();
+ searchModelParam(temp);
+ }
+ isNewLoad = false;
+ layer.close(filterLoad);
+ });
+ }
//棣栭〉
$('#home').click(function(){
@@ -430,7 +562,7 @@
$("#pre").click(function(){
if(Page!=undefined){
var currentPage = Page.pageCurr;
- console.info(Page);
+ //console.info(Page);
if(Page != undefined && currentPage>1){
//console.info(Pmodel.data);
Page.pageCurr = currentPage - 1;
--
Gitblit v1.9.1