From 9b5bed11d3b746a2cb6b16d1c7db3eb477c90743 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期三, 21 十一月 2018 12:35:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/battM.html | 2
gx_tieta/WebRoot/index.jsp | 10
gx_tieta/WebRoot/mobil/ele-infor-search2.html | 188 ++++++++-------
gx_tieta/WebRoot/js/dischargetest/bts.js | 7
gx_tieta/WebRoot/mobil/selectbatt.html | 4
gx_tieta/WebRoot/dischargetest.jsp | 128 +++++++--
gx_tieta/WebRoot/mobil/eleAnalyse.html | 339 ++++++++++++++++++++--------
gx_tieta/WebRoot/mobil/mobilJs/base.js | 2
gx_tieta/WebRoot/ele_statistics.jsp | 1
9 files changed, 454 insertions(+), 227 deletions(-)
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 7df1b5a..a087a89 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -209,7 +209,7 @@
</tr>
<tr>
<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
- <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+ <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -732,46 +732,95 @@
}; // 鍏呯數鐢垫祦
$('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');
+ $('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');
}
});
})(jQuery);
// 鏇存敼鏀剧數闈㈡澘鐨勫�煎悗
$(function() {
- $('.popup.fbs9100 .popup-tbl td i').tooltip();
- // 鐩戞祴闈㈡澘涓殑input鏀瑰彉瑙﹀彂$.checkTestInfor()浜嬩欢
- $('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {
+ // 鏀剧數鐢垫祦
+ $('#discurr').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 1000,
+ msg: '鍙栧�艰寖鍥�0~1000A'
+ });
+
+ // 鏀剧數灏忔椂鐜�
+ $('#hourrate').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鏀剧數鐢靛
+ $('#discap').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: true,
+ min: 0,
+ max: 90000,
+ msg: '鍙栧�艰寖鍥�0~90000AH'
+ });
+
+ // 鏀剧數鏃堕暱
+ $('#distime').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: true,
+ min: 0,
+ max: 5940,
+ msg: '鍙栧�艰寖鍥�0~5940鍒嗛挓'
+ });
+
+ // 鍗曚綋涓嬮檺闃�鍊�
+ $('#MonomerVol_low').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0~20V'
+ });
+
+ // 缁勭涓嬮檺闃�鍊糋roupVol_low
+ $('#GroupVol_low').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: true,
+ min: 0,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0~60V'
+ });
+
+ // 鍗曚綋涓嬮檺鏁伴噺
+ $('#MonomerlowCount').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鍗囧帇涓婇檺
+ $('#MonomerlowCount').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal({
+ pattern: /^[0-9]+(\.[0-9]*)?$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ // 娓╁害涓婇檺
+ $('#TempUpHighLimit').testVal({
+ pattern: /^[0-9]+$/,
+ regVal: false,
+ msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝ｇ‘'
+ });
+
+ $('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {
$.checkTestInfor();
- var bool = $.regPositiveNum($(this).val());
- if(bool) {
- // 璇诲彇鏀剧數鍙傛暟鎴愬姛鎵ц
- if($.disTestInfor.success) {
- paramsBtn.ensure(true);
- }
- $(this).next('i').removeClass('error-data');
- $(this).myTooltip('hide');
- }else {
- paramsBtn.ensure(false);
- //var errorImg = $('<i class="fa fa-frown-o error-img"></i>');
- $(this).next('i').addClass('error-data');
- $(this).myTooltip({
- position: 'top',
- thing: 'show',
- content: '<span style="color:#FF0000">鏁版嵁鏍煎紡閿欒(璇疯緭鍏ユ鏁�)</span>'
- });
- }
- });
-
- // 褰撴枃鏈鑾峰彇鐒︾偣鏃�
- $('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {
- if($(this).next('i').hasClass('error-data')) {
- $(this).myTooltip('show');
- }
- });
-
- // 鏂囨湰妗嗗け鍘荤劍鐐�
- $('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {
- $(this).myTooltip('hide');
});
$('.popup.fbs9100').on('change', 'select', function() {
@@ -1128,6 +1177,17 @@
$('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);
$('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);
$('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);
+
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true,
+ min: 0,
+ max: list[0].binf.charge_curr_max,
+ msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
+ $('#ChargeCurrSetLabel').text('鍏呯數鐢垫祦锛�0~'+list[0].binf.charge_curr_max+'A锛�');
}
}
}
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 41aaa58..ba40519 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -267,6 +267,7 @@
var load = layer.load(1);
//console.info($("#search_form").serialize());
var temp = createSearchForm();
+ console.info(temp);
var json = JSON.stringify(temp);
battinfo_list = new Array();
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index d977595..abbd9d9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -121,7 +121,7 @@
<div class="map-info-detail">
<div class="layui-collapse" lay-filter="test" lay-accordion="">
<div class="layui-colla-item">
- <h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
+ <h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
<div class="layui-colla-content layui-show">
<table>
<tbody>
@@ -216,12 +216,12 @@
<i class="fa fa-cog"></i>
</a>
</div>
+ <!--鐢垫睜鏁呴殰淇鍥�-->
+ <div class="repair-pie module"></div>
<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
<div class="brdn-pie module"></div>
<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
<div class="warn-pie module"></div>
- <!--鐢垫睜鏁呴殰淇鍥�-->
- <div class="repair-pie module"></div>
<!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
<div class="health-pie module"></div>
<!--娓呴櫎娴姩-->
@@ -721,7 +721,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -1104,7 +1104,7 @@
powercut_isNew = false;
createPie(repairPie,repairTle,repairObj);
repairPie.on('click', function() {
- window.open('powercut.jsp?power_state=0');
+ window.open('batt-state-manage.jsp?power_state=0');
});
}else{
var opt = getOpt(repairTle, repairObj);
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index a8eb593..4f3f62c 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -90,7 +90,7 @@
pattern: /^[0-9]+(\.[0-9]*)?$/,
regVal: true,
min: 0,
- max: 20,
+ max: 60,
msg: '鍙栧�艰寖鍥�0~60V'
});
@@ -218,8 +218,8 @@
// 璁剧疆鍙傛暟
function setBTSParam(list, errorStatus) {
- //setDischageBattinfo(list[0].fsparam.BattGroupNum); //璁剧疆琚祴鐢垫睜缁勪俊鎭�
- console.log(list);
+ // setDischageBattinfo(list[0].fsparam.BattGroupNum); //璁剧疆琚祴鐢垫睜缁勪俊鎭�
+ // console.log(list);
if(list[0].fsparam.TestCmd == CMD_BTS_StartDischarge){
$('#discharge_type').val(CMD_BTS_StartDischarge);
}else if(list[0].fsparam.TestCmd == CMD_BTS_StartRESTest){
@@ -247,6 +247,7 @@
msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
});
+ // 璁剧疆鏂囨湰鍊�
$('#ChargeCurrSetLabel').text('鍏呯數鐢垫祦锛�0~'+list[0].binf.charge_curr_max+'A锛�');
}
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index f5adaf4..acf3c2c 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -14,7 +14,7 @@
<!-- 涓夌骇鑿滃崟鍐呭 -->
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="machineroomM.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <a href="selectbatt.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
<h1>钃勭數姹犵粍</h1>
</div>
diff --git a/gx_tieta/WebRoot/mobil/ele-infor-search2.html b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
index d02f5f5..ea4fd65 100644
--- a/gx_tieta/WebRoot/mobil/ele-infor-search2.html
+++ b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
@@ -263,33 +263,43 @@
//鏌ヨ鐢垫睜淇℃伅
function searchBadBatt(){
loadshow();
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
var temp = createSearchForm();
+ console.info(stationid);
+ /*var temp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
+ };*/
+ //console.info(temp);
var json = JSON.stringify(temp);
//console.info(json);
arrTd = new Array();
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
data=eval("("+data.result+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
//console.info(data);
arr=new Array();
index=0;
for(var i=0;i<data.length;i++){
- Page.pageAll=data[i].page.pageAll;
- arr[index++]=data[i].binf.BattGroupId; //鐢垫睜缁刬d
- arr[index++]=data[i].binf.StationName; //鏈烘埧鍚嶇О
- arr[index++]=data[i].binf.StationIp; //鏈烘埧IP
- arr[index++]=data[i].binf.BattGroupName; //鐢垫睜缁勫悕绉�
- arr[index++]=data[i].binf.BattGroupNum; //鐢垫睜缁勫簭鍙�
- arr[index++]=data[i].binf.MonCount; //鍗曚綋鏁伴噺
- arr[index++]=data[i].binf.MonCapStd; //鏍囩О瀹归噺
- arr[index++]=data[i].binf.MonVolStd; //鏍囩О鍗曚綋鐢靛帇
- arr[index++]=data[i].binf.BattProducer; //鐢垫睜鍝佺墝
- arr[index++]=data[i].binf.BattProductDate.substr(0,10); //鐢垫睜鐢熶骇鏃ユ湡
- arr[index++]=data[i].binf.BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
+ Page.pageAll=data[i].Size;
+ arr[index++]=data[i].BattGroupId; //鐢垫睜缁刬d
+ arr[index++]=data[i].StationName; //鏈烘埧鍚嶇О
+ arr[index++]=data[i].StationIp; //鏈烘埧IP
+ arr[index++]=data[i].BattGroupName; //鐢垫睜缁勫悕绉�
+ arr[index++]=data[i].BattGroupNum; //鐢垫睜缁勫簭鍙�
+ arr[index++]=data[i].MonCount; //鍗曚綋鏁伴噺
+ arr[index++]=data[i].MonCapStd; //鏍囩О瀹归噺
+ arr[index++]=data[i].MonVolStd; //鏍囩О鍗曚綋鐢靛帇
+ arr[index++]=data[i].BattProducer; //鐢垫睜鍝佺墝
+ arr[index++]=data[i].BattProductDate.substr(0,10); //鐢垫睜鐢熶骇鏃ユ湡
+ arr[index++]=data[i].BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
}
- console.info(Page);
+ //console.info(Page);
createTbl(tbl, arrTh, arr);
}else{
@@ -297,7 +307,7 @@
Page.pageAll = 0;
}
setPage();
- console.info(Page);
+ //console.info(Page);
loadclose();
}).error(function(){
loadclose();
@@ -317,7 +327,7 @@
binf:{
StationName1:$('#mainteArea').val(),
StationName2:$('#city').val(),
- StationName5:$('#county').val(),
+ StationName5:$('#country').val(),
StationName:$('#homeName').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
@@ -354,7 +364,7 @@
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=$("#mainteArea");
$Ostation_name1.text("");
@@ -384,7 +394,7 @@
var data = {
StationName1: $("#mainteArea").val()
};
- console.info(data);
+ //console.info(data);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -395,8 +405,8 @@
success: function(data){
data = data.result;
data = eval("("+data+")");
- console.info(data);
- console.info(data.code);
+ //console.info(data);
+ //console.info(data.code);
if(data.code==1&&data.data.length>0){
var $Ostation_name1=$("#city");
$Ostation_name1.text("");
@@ -428,7 +438,7 @@
StationName1: $("#mainteArea").val(),
StationName2:$("#city").val(),
};
- console.info(data);
+ //console.info(data);
$.ajax({
type: "post",
url: "BattInfAction!serchStationName5",
@@ -438,8 +448,8 @@
success: function(data){
data = data.result;
data = eval("("+data+")");
- console.info(data);
- console.info(data.code);
+ //console.info(data);
+ //console.info(data.code);
if(data.code==1&&data.data.length>0){
var $Ostation_name1=$("#country");
$Ostation_name1.text("");
@@ -482,10 +492,64 @@
success: function(data){
data = data.result;
data = eval("("+data+")");
- console.info(data);
- console.info(data.code);
+ //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].StationName3,
+ stationid:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").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++)
@@ -497,59 +561,8 @@
});
}else{
arr.push({
- val:data.data[i-1].StationId,
- txt:data.data[i-1].StationName3,
- });
- }
- }
- console.info(111111111111111);
- updataSelStation($Ostation_name1, arr);
- }
-
- findserchByBattGroupNamebystationname();
- }
- });
- }
-
- //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
- function findserchByBattGroupNamebystationname(){
-
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val(),
- StationName: $("#homeName").text(),
- StationId: $("#homeName").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.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:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName3,
- txt:data.data[i-1].StationName3,
+ val:data.data[i-1].BattGroupId,
+ txt:data.data[i-1].BattGroupName,
});
}
}
@@ -560,12 +573,19 @@
});
}
- //褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
$('#mainteArea').change(function(){
findCity();
- findStationNamebyStationname1();
- });
-
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+ //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
$('#homeName').change(function(){
findserchByBattGroupNamebystationname();
});
@@ -610,7 +630,7 @@
$.post("BattInfAction_serchByMonVolStd",null,function(data){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
var $Omonvol_std=$("#monvol_std");
$Omonvol_std.text("");
@@ -639,7 +659,7 @@
if(data.code==1 && data.data.length>0){
var $Omoncap_std2=$("#moncap_std2");
$Omoncap_std2.text=("");
- console.info(data.data[1].MonCapStd);
+ //console.info(data.data[1].MonCapStd);
var arr = new Array();
for(var i=0;i <= data.data.length;i++){
if(i == 0){
diff --git a/gx_tieta/WebRoot/mobil/eleAnalyse.html b/gx_tieta/WebRoot/mobil/eleAnalyse.html
index 72f89e3..97e9625 100644
--- a/gx_tieta/WebRoot/mobil/eleAnalyse.html
+++ b/gx_tieta/WebRoot/mobil/eleAnalyse.html
@@ -21,10 +21,18 @@
<div class="fg-panel-header">绛涢��</div>
<div class="fg-panel-content">
<fieldset data-role="controlgroup">
- <p>缁存姢鍖�</p>
+ <p>鐪�</p>
<select id="mainteArea" data-mini="true">
<option value="">鍏ㄩ儴</option>
</select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
<p>鏈烘埧绔欑偣</p>
<select id="homeName" data-mini="true">
<option value="">鍏ㄩ儴</option>
@@ -394,10 +402,11 @@
alltestDate = new Array(); //鎵�鏈夋祴璇曡褰曠殑鏃堕棿鏁扮粍
var json = JSON.stringify(createSearchForm());
loadshow();
- //console.info(json);
+ console.info(json);
$.post('Batt_Maint_DealarmAction_serchLow',"result="+json,function(data){
arr=new Array();
groupidlist=new Array();
+ console.info(data);
data=data.result;
data=eval("("+data+")");
allDate=new Array();
@@ -526,6 +535,8 @@
},
binf:{
StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
StationName:$('#homeName').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
@@ -555,102 +566,236 @@
return temp;
}
-
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.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");
- 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);
- }
- findStationNamebyStationname1();
- });
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.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){
+ 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();
+ }
+ });
+ }
+
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ 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 = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").val(),
+ StationId: stationid
+ };
- //褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
- $('#mainteArea').change(function(){
- findStationNamebyStationname1();
- });
-
- function findStationNamebyStationname1(){
- var selectvalue=$("#mainteArea 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 = $("#homeName");
- 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].StationName,
- txt: data.data[i].StationName
- });
- //}
- }
- updataSel($select, arr);
- }
- findserchByBattGroupNamebystationname();
- });
- $('#homeName').change(function(){
- findserchByBattGroupNamebystationname();
- });
- }
-
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var station_name1=$("#mainteArea option:selected").val();
- var station_name=$("#homeName 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.length);
- if(data.code==1 && data.data.length>0){
- var $Obattgroup_name = $("#battgroup_name");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++) {
- if(i == 0) {
- arr.push({
- val: "0",
- txt: "鍏ㄩ儴(鍏�"+data.sum+"缁�)"
- });
- }else {
- arr.push({
- val: data.data[i-1].BattGroupId,
- txt: data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"鑺�"
- });
- }
- }
- updataSel($Obattgroup_name, arr);
- }
- });
- }
+ //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();
+ });
//鏌ヨ鐢垫睜瀹归噺
diff --git a/gx_tieta/WebRoot/mobil/mobilJs/base.js b/gx_tieta/WebRoot/mobil/mobilJs/base.js
index 71d2dae..da21447 100644
--- a/gx_tieta/WebRoot/mobil/mobilJs/base.js
+++ b/gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -363,7 +363,7 @@
// 鏍规嵁vals鍜宼xt鍊肩敓鎴恛ption
for(var i = 0; i < opts.length; i++) {
- var opt = $('<option value="'+opts[i].txt+'" stationid="'+opts[i].val+'">'+opts[i].txt+'</option>');
+ var opt = $('<option value="'+opts[i].val+'" stationid="'+opts[i].stationid+'">'+opts[i].txt+'</option>');
element.append(opt);
}
}
diff --git a/gx_tieta/WebRoot/mobil/selectbatt.html b/gx_tieta/WebRoot/mobil/selectbatt.html
index 44911ef..e495026 100644
--- a/gx_tieta/WebRoot/mobil/selectbatt.html
+++ b/gx_tieta/WebRoot/mobil/selectbatt.html
@@ -14,8 +14,8 @@
<!-- 涓夌骇鑿滃崟鍐呭 -->
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="machineroomM.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
- <h1>钃勭數姹犵粍</h1>
+ <a href="selectcounty.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <h1>鏈烘埧</h1>
</div>
<div data-role="content">
--
Gitblit v1.9.1