From 2a36c57ee730a5bfd373b34fbae1b9fe3e1de980 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.32>
Date: 星期五, 23 十一月 2018 09:34:16 +0800
Subject: [PATCH] 手机 电池实时告警BUG
---
gx_tieta/WebRoot/mobil/elewarn2.html | 424 ++++++++++++++++++++++++++--------------------------
gx_tieta/WebRoot/mobil/batt-state-manage.html | 4
2 files changed, 214 insertions(+), 214 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-state-manage.html b/gx_tieta/WebRoot/mobil/batt-state-manage.html
index 16f8b8f..177ea32 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-manage.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-manage.html
@@ -312,11 +312,11 @@
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
- arrTd[index++] = '寮�闂�';
+ arrTd[index++] = '鍏抽棬';
arrTd[index++] = _data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
arrTd[index++] = StringtoData(_data.station_dooropen_start_time);
}else {
- arrTd[index++] = '鍏抽棬';
+ arrTd[index++] = '寮�闂�';
arrTd[index++] = "-";//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
arrTd[index++] = formartTime(0);
}
diff --git a/gx_tieta/WebRoot/mobil/elewarn2.html b/gx_tieta/WebRoot/mobil/elewarn2.html
index 1b8f8fc..fe8ea96 100644
--- a/gx_tieta/WebRoot/mobil/elewarn2.html
+++ b/gx_tieta/WebRoot/mobil/elewarn2.html
@@ -223,71 +223,29 @@
}else{
$('#searchNull').popup('open');
}
- var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ //var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
if(pagecurr == 1){
- console.info(pagecurr+"***********");
+ //setPage();
createTbl(tblCon, arrTh, ArrWarnTb);
}else
{
addTrToTbl(tblCon, arrTh, ArrWarnTb);
- }
- Page.pageCurr++;
- $('#pageCurr').val(Page.pageCurr);
+ }
+ Page.pageCurr++;
+ $('#pageCurr').val(Page.pageCurr);
loadclose();
});
}
-//椤甸潰鍔犺浇鏃舵煡璇㈢渷
- $.post("BattInfAction_serchByStation",null,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=$("#mainteArea");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:"",
- txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName1,
- txt:data.data[i-1].StationName1,
- });
- }
- }
- updataSel($Ostation_name1, arr);
- }
- findCity();
- });
-
-
-//褰撶渷鏀瑰彉鏃舵洿鏂板競
- function findCity(){
- var data = {
- StationName1: $("#mainteArea").val()
- };
- //console.info(data);
- // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName2",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
data = data.result;
data = eval("("+data+")");
//console.info(data);
- //console.info(data.code);
+ //console.info(data.code);
if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#city");
+ var $Ostation_name1=$("#mainteArea");
$Ostation_name1.text("");
var arr = new Array();
for(var i=0;i<=data.data.length;i++)
@@ -295,180 +253,222 @@
if(i == 0){
arr.push({
val:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
});
}else{
arr.push({
- val:data.data[i-1].StationName2,
- txt:data.data[i-1].StationName2,
+ val:data.data[i-1].StationName1,
+ txt:data.data[i-1].StationName1,
});
}
}
updataSel($Ostation_name1, arr);
}
- findCounty();
- }
+ findCity();
});
- }
-
-//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
- 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
- };
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ function findCity(){
+ var data = {
+ StationName1: $("#mainteArea").val()
+ };
+ //console.info(data);
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ 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=$("#city");
+ $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].StationName2,
+ txt:data.data[i-1].StationName2,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCounty();
+ }
+ });
+ }
- //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);
- }
-
+ //褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ 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();
+ }
+ });
}
- });
- }
-
- //褰撶渷鏀瑰彉鏃舵洿鏂板競
- $('#mainteArea').change(function(){
- findCity();
- });
- //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
- $('#city').change(function(){
- findCounty();
- });
- //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
- $('#country').change(function(){
- findStationNamebyStationname1();
- });
- //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
- $('#homeName').change(function(){
- findserchByBattGroupNamebystationname();
- });
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ 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();
+ });
+
</script>
</div>
</body>
--
Gitblit v1.9.1