From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/dataManage.jsp | 440 +++++++++++++++++++++++-------------------------------
1 files changed, 188 insertions(+), 252 deletions(-)
diff --git a/gx_tieta/WebRoot/dataManage.jsp b/gx_tieta/WebRoot/dataManage.jsp
index 38b5024..dc4686e 100644
--- a/gx_tieta/WebRoot/dataManage.jsp
+++ b/gx_tieta/WebRoot/dataManage.jsp
@@ -13,6 +13,7 @@
<title><s:text name="Batt_charge_discharge_manage"/></title>
<link rel="stylesheet" type="text/css" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/dtManage.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style>
.b8cfe5{
background-color:#b8cfe5;
@@ -38,7 +39,9 @@
<form action="" id="search_form">
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td>
<td><s:text name="Battery_record"/></td> <!-- 鐢垫睜娴嬭瘯璁板綍 -->
@@ -53,6 +56,14 @@
<tr>
<td>
<select id="station_name1" name="bmd.binf.StationName1">
+ </select>
+ </td>
+ <td>
+ <select id="city" name="bmd.binf.StationName2">
+ </select>
+ </td>
+ <td>
+ <select id="county" name="bmd.binf.StationName5">
</select>
</td>
<td>
@@ -196,6 +207,8 @@
</body>
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="js/query.js"></script>
+<script type="text/javascript" src="pages/js/common.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -346,7 +359,7 @@
var binfs=new Array();
$('.tbl-body table tbody tr').each(function(i){
if($(this).hasClass('b8cfe5')){
- binfs.push(Alltestdata[i].binf);
+ binfs.push(batttestdatas[i].binf);
}
});
if(confirm("纭鍒犻櫎杩�"+binfs.length+"鏉℃祴璇曟暟鎹悧锛�")){
@@ -362,30 +375,27 @@
//閫変腑鍙抽敭鑿滃崟涓殑[鏌ョ湅鏁版嵁]閫夐」璺宠浆鍒板巻鍙叉暟鎹煡璇㈤〉闈㈤�変腑鎸囧畾鐨勭數姹犵粍
$('#right-menu .check_data').click(function(){
- var battgroupid=0;
- var stationid = 0;
+ var batt = {};
//console.info(Alltestdata);
$('.tbl-body table tbody tr').each(function(i){
if($(this).hasClass('b8cfe5')){
- battgroupid=Alltestdata[i].binf.BattGroupId;
- stationid = Alltestdata[i].binf.StationId;
+ batt = Alltestdata[i].binf;
}
- });
- $(this).attr("href","charge-test.jsp?battgroupId="+battgroupid+"&stationId="+stationid);
+ });
+ //console.log(batt);
+ $(this).attr("href", skipUrl('charge-test.jsp', batt.StationName1, batt.StationName2,batt.StationName5, batt.StationName));
});
//閫変腑鍙抽敭鑿滃崟涓殑[鏌ョ湅钀藉悗鍗曚綋缁熻鏁版嵁]閫夐」璺宠浆鍒板巻鍙叉暟鎹煡璇㈤〉闈㈤�変腑鎸囧畾鐨勭數姹犵粍
$('#right-menu .check_last').click(function(){
- var battgroupid=0;
- var stationid = 0;
+ var batt = {};
//console.info(Alltestdata);
$('.tbl-body table tbody tr').each(function(i){
if($(this).hasClass('b8cfe5')){
- battgroupid = Alltestdata[i].binf.BattGroupId;
- stationid = Alltestdata[i].binf.StationId;
+ batt = Alltestdata[i].binf;
}
});
- $(this).attr("href","eleAnalyse.jsp?battgroupId="+battgroupid+"&stationId="+stationid);
+ $(this).attr("href", skipUrl('eleAnalyse.jsp', batt.StationName1, batt.StationName2,batt.StationName5, batt.StationName));
});
//椤甸潰鍐呭鏁版嵁杩涜鎿嶄綔鐨勬晥鏋�
@@ -435,7 +445,7 @@
});
});
-
+ var batttestdatas; //褰撳墠琛ㄦ牸涓殑鏁版嵁鏁扮粍(鍏朵腑鐨剆tationid鏍囪瘑浜嗗綋鍓嶆暟鎹槸灞炰簬鍐呴樆鏁版嵁杩樻槸鍏呮斁鐢垫暟鎹�)
var formjson;
//鏍规嵁绛涢�夋潯浠舵煡璇�
function searchDisCharage(){
@@ -446,6 +456,7 @@
formjson = temp;
}
Alltestdata=new Array();
+ batttestdatas = new Array();
// 娓呴櫎琛ㄦ牸鍐呭
$('.tbl-body table').remove();
//鍒涘缓绛夊緟妗�
@@ -465,6 +476,7 @@
var alllist=list[i];
var tmp = $.extend(true, {}, alllist.data);
Alltestdata.push(tmp);
+ batttestdatas.push(alllist.data);
Page = alllist.data.page;
tbArrTd.push(alllist.data.binf.StationName); //鏈烘埧鍚嶇О
tbArrTd.push(alllist.data.binf.BattGroupName); //鐢垫睜缁勫悕绉�
@@ -592,7 +604,10 @@
}
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -615,40 +630,138 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.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);
+ 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();
+ }
+ // 鏌ヨ鍖哄幙
+ $.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);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findStationNamebyStationname1();
+ findCity(true);
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#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 selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.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");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $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]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -657,222 +770,60 @@
}
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ function findserchByBattGroupNamebystationname(isLoad){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
};
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
- $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- $option.attr("stationname",data.data[i-1].StationName);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = 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 = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option:selected').eq(0).val(0);
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
- /* $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- 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.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
- }
- $select.append($option);
- }
- }
- findStationNamebyStationname1();
- });
-
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏌ヨ鐢垫睜鍝佺墝
- $.post("BattInfAction_serchByBattProducer",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#batt_producer");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option = $("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattProducer);
- $option.attr("value", data.data[i-1].BattProducer);
- }else{
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", "");
- }
- $select.append($option);
- }
- }
- });
-
-
- //鏌ヨ鍗曚綋鐢靛帇
- $.post("BattInfAction_serchByMonVolStd",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#monvol_std");
- $select.text('');
- //console.info(data)
- for(var i=0;i<=data.data.length;i++){
- var $option = $("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].MonVolStd);
- $option.attr("value", data.data[i-1].MonVolStd);
- }else{
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", 0);
- }
- $select.append($option);
- }
- }
- });
-
- //鏌ヨ鐢垫睜瀹归噺
- $.post("BattInfAction_serchByMonCapStd",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select= $("#moncap_std");
- $select.text('');
- //console.info(data)
- for(var i=0;i<=data.data.length;i++){
- var $option = $("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].MonCapStd);
- $option.attr("value", data.data[i-1].MonCapStd);
- }else{
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", 0);
- }
- $select.append($option);
- }
- }
- });
-
- //鏌ヨ鍖呮満浜�
- $.post("User_infAction_searchAll",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#baojiren");
- $select.text('');
- //console.info(data)
- for(var i=0;i<=data.data.length;i++){
- var $option = $("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].UName);
- $option.attr("value", data.data[i-1].UId);
- }else{
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
- }
- }
- });
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<data.data.length;i++){
- var $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].StationName);
- $option.attr("value",data.data[i].StationName);
- //}
- $select.append($option);
- }
- }
- findserchByBattGroupNamebystationname();
- });
- }
- $('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
- });
-
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var station_name1=$("#station_name1 option:selected").val();
- var station_name=$("#station_name option:selected").val();
-
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
- data=data.result;
- //console.info(data);
- data=eval("("+data+")");
- //console.info(data.data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- }else{
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
- }
- }
- });
- }
- */
//椤甸潰鍔犺浇鏃跺垵濮嬪寲鏃堕棿
$(document).ready(function(){
var today=new Date().format('yyyy-MM-dd');
@@ -1032,8 +983,10 @@
},
binf:{
StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#county').val(),
StationName:$('#station_name').val(),
- BattGroupId:$('#battgroup_name').val(),
+ BattGroupId:$('#battgroup_name').val()
},
tdata:{
test_type:$('#test_type').val(),
@@ -1082,22 +1035,5 @@
};
return temp;
}
- /* $(window).resize(function() {
- initPage();
- });
- // 鍒濆鍖栭〉闈㈤珮搴�
- function initPage() {
- var winHt = $(window).height();
- var bodyHt = $('body').height();
- var shiftHt = winHt - bodyHt;
- var tblHt = $('#tb-body').height();
- var resultHt = tblHt + shiftHt;
-
- if(shiftHt > 0 || resultHt > 200) {
- $('#tb-body').height(resultHt);
- }else {
- $('#tb-body').height(200);
- }
- } */
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1