From 07ad76ca66cc831264f2b6adbacc502ad484f283 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期五, 23 十一月 2018 15:16:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param.jsp | 6
gx_tieta/WebRoot/batt-state-statistical.jsp | 27 ++--
gx_tieta/WebRoot/mobil/equiphistwarn.html | 302 ++++++++++++++++++--------------------------------
3 files changed, 126 insertions(+), 209 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index ce24b10..6e01c08 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -105,17 +105,17 @@
<div id="paging">
<a href="javascript:" class="search"><s:text name="Search"/></a> <!-- 鏌ヨ -->
<a href="javascript:" id="export_table"><s:text name="Export"/></a> <!-- 瀵煎嚭 -->
- <span id="current">1/1</span>
- <span><s:text name="Each_page"/><!-- 姣忛〉 --><input type="text" id="number" value="10"/><s:text name="Item"/><!-- 鏉� --></span>
+ <!-- <span id="current">1/1</span>
+ <span><s:text name="Each_page"/>姣忛〉<input type="text" id="number" value="10"/><s:text name="Item"/>鏉�</span> -->
<s:text name="Total_data"/><!-- 鏁版嵁鎬婚噺 --><span id="total">0</span>
- <a href="javascript:" id="home"><s:text name="HomePage"/><!-- 棣栭〉 --></a>
- <a href="javascript:" id="pre"><s:text name="Page_Up"/><!-- 涓婁竴椤� --></a>
- <a href="javascript:" id="next_p"><s:text name="Page_Down"/><!-- 涓嬩竴椤� --></a>
- <a href="javascript:" id="last"><s:text name="End_Page"/><!-- 灏鹃〉 --></a>
+ <!-- <a href="javascript:" id="home"><s:text name="HomePage"/>棣栭〉</a>
+ <a href="javascript:" id="pre"><s:text name="Page_Up"/>涓婁竴椤�</a>
+ <a href="javascript:" id="next_p"><s:text name="Page_Down"/>涓嬩竴椤�</a>
+ <a href="javascript:" id="last"><s:text name="End_Page"/>灏鹃〉</a>
<span id="cont">
- <s:text name="Goto"/><!-- 杞埌 --><input type="text" id="page_num" value="1"/>
- <a href="javascript:" id="go"><s:text name="Jump"/><!-- 璺宠浆 --></a>
- </span>
+ <s:text name="Goto"/>杞埌<input type="text" id="page_num" value="1"/>
+ <a href="javascript:" id="go"><s:text name="Jump"/>璺宠浆</a>
+ </span> -->
</div>
</div>
<div id="details"></div>
@@ -168,7 +168,7 @@
]]
,data:[]
,page: false
- ,height: 'full-280'
+ ,height: 'full-270'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -252,21 +252,24 @@
dataType:'json',
data:"json="+json,
success:function(data){
- //console.info(data);
var data=JSON.parse(data.result);
+ console.info(data);
if(data.code==1&&data!=null){
//console.log(data.data);
tOptions.data = data.data;
+ $('#total').text(data.data.length);
}else {
tOptions.data = [];
+ $('#total').text(0);
}
layer.close(load);
+ tOptions.limit = tOptions.data.length;
table.render(tOptions);
// 瑙﹀彂window鐨剅esize浜嬩欢鏄剧ず鏈�鍙充晶鐨勮鎯呬俊鎭诞鍔�
$(window).resize();
}
- })
+ });
}
// 鏋勯�犳煡璇㈡潯浠�
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index cb01b6b..a176289 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -238,7 +238,7 @@
];
defaultArr = [
- '35000001','鐪�','鍩庡競', '鍖哄幙', '鏈烘埧鍚嶇О', '璁惧鍚嶇О', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9600',
+ '35000001','鐪�','鍩庡競', '鍖哄幙', '鏈烘埧鍚嶇О', '璁惧鍚嶇О', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9100',
'0', '1000001', '1', '鏂板缓鐢垫睜缁�1', '2.230', '2.150', '30', '24', '3000',
'2', '0.2', '5000', '0.05',15,0,'', '鍙岀櫥', 'GMF-3000', '2012-05-04', '2012-06-13', ''
];
@@ -452,9 +452,9 @@
var _arr = new Array();
var _tblTr = $('.tbl-body table tbody tr');
_tblTr.eq(_tblTr.length-1).find('td').each(function(i) {
- if(i == 10) {
+ if(i == 12) {
_arr.push(0);
- }else if(i == 11) {
+ }else if(i == 13) {
_arr.push(parseInt($(this).text())+1);
}else {
_arr.push($(this).text());
diff --git a/gx_tieta/WebRoot/mobil/equiphistwarn.html b/gx_tieta/WebRoot/mobil/equiphistwarn.html
index 751ac24..bd81cf1 100644
--- a/gx_tieta/WebRoot/mobil/equiphistwarn.html
+++ b/gx_tieta/WebRoot/mobil/equiphistwarn.html
@@ -35,11 +35,7 @@
<p>鏈烘埧绔欑偣</p>
<select id="homeName" data-mini="true" name="bmd.binf.stationName">
<option value="">鍏ㄩ儴</option>
- </select>
- <p>钃勭數姹犵粍</p>
- <select id="battgroup_name" data-mini="true" name="bmd.binf.BattGroupId">
- <option value="0">鍏ㄩ儴</option>
- </select>
+ </select>
<fieldset data-role="collapsible" data-collapsed="false" data-mini="true">
<legend><strong>鏃堕棿娈甸�夋嫨锛�</strong></legend>
@@ -153,7 +149,7 @@
//console.info("寮�濮嬫煡璇�");
newArrTd = new Array();
var json = JSON.stringify(createSearchForm());
- $.post("Batt_devalarm_dataAction!serchByCondition","json="+json,function(data){
+ $.post("Batt_devalarm_data_historyAction!serchByCondition","json="+json,function(data){
data=data.result;
model=eval("("+data+")");
//console.info(data);
@@ -197,14 +193,16 @@
function createSearchForm(){
var temp={
binf:{
- StationName1:$('#privince').val(),
- StationName:$('#city').val(),
+ StationName:$('#homeName').val(), // 鏈烘埧鍚�
+ StationName5:$('#country').val(), // 鍖�/鍘�
+ StationName2:$('#city').val(), // 甯�
+ StationName1:$('#mainteArea').val(), // 鐪�
BattProductDate:$("#startTime").val()+" 00:00:00",
BattProductDate1:$("#endTime").val()+" 23:59:59",
},
page:{
- pageSize:Page.pageSize, //椤甸潰澶у皬
- pageCurr:Page.pageCurr, //褰撳墠椤�
+ pageSize:Page.pageSize, //椤甸潰澶у皬
+ pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
return temp;
@@ -284,192 +282,108 @@
});
}
-//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
- function findCounty(){
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- };
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName5",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#country");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName5,
- txt:data.data[i-1].StationName5,
- });
- }
- }
- updataSel($Ostation_name1, arr);
- }
- findStationNamebyStationname1();
+ //褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
}
- });
- }
-
- //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
- function findStationNamebyStationname1(){
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val()
- };
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName3",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#homeName");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:"",
- stationid:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName,
- stationid:data.data[i-1].StationId,
- txt:data.data[i-1].StationName3,
- });
- }
- }
- //console.info(111111111111111);
- updataSelStation($Ostation_name1, arr);
- }
-
- findserchByBattGroupNamebystationname();
- }
- });
- }
-
- //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
- function findserchByBattGroupNamebystationname(){
- var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
-
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val(),
- StationName: $("#homeName").val(),
- StationId: stationid
- };
-
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchBattByStation",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.warn();
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#battgroup_name");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:0,
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].BattGroupId,
- txt:data.data[i-1].BattGroupName,
- });
- }
- }
- updataSel($Ostation_name1, arr);
- }
-
- }
- });
- }
-
- //褰撶渷鏀瑰彉鏃舵洿鏂板競
- $('#mainteArea').change(function(){
- findCity();
- });
- //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
- $('#city').change(function(){
- findCounty();
- });
- //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
- $('#country').change(function(){
- findStationNamebyStationname1();
- });
- //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
- $('#homeName').change(function(){
- findserchByBattGroupNamebystationname();
- });
-
- function findStationNamebyStationname1(){
- var selectvalue=$("#privince option:selected").val();
-
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
-
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#city");
- //console.info()
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("鍏ㄩ儴(鍏�"+data.sum+"绉�)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName);
- $option.attr("value",data.data[i-1].StationName);
- }
- $select.append($option);
- }
- }
- });
- }
-
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ stationid:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName,
+ stationid:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+ }
+ });
+ }
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ $('#mainteArea').change(function(){
+ findCity();
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+
// 鏍规嵁婊氬姩鏉＄殑鐘舵�佹樉绀哄拰闅愯棌杩斿洖椤堕儴
$(function() {
$(document).on('scrollstop', function() {
--
Gitblit v1.9.1