From a37d440d24d0c7da466183f68fdd706689c81b90 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期一, 24 十二月 2018 11:13:25 +0800
Subject: [PATCH] xiugai
---
gx_tieta/WebRoot/mobil/batt-approved.html | 136 ++++++++++++-------
gx_tieta/WebRoot/eleWarnPrmSet.jsp | 1
gx_tieta/WebRoot/mobil/eleWarnPrmSet.html | 242 +++++++++++++++++++++++++++++++---
3 files changed, 307 insertions(+), 72 deletions(-)
diff --git a/gx_tieta/WebRoot/eleWarnPrmSet.jsp b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
index 19169d3..8c9231f 100644
--- a/gx_tieta/WebRoot/eleWarnPrmSet.jsp
+++ b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
@@ -562,6 +562,7 @@
"dev_id":dev_id,
"alm_id":alm_id
};
+ console.info(warmId);
var load = layer.load(1);
//console.log(warmId);
$.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index a588c78..737ce6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -138,17 +138,23 @@
<script type="text/javascript">
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
- function getButIndex(t){
- var index = $(t).attr("but-index");
- // index=(index/33-1);
- console.info(index);
- setcookiedit(index);
- window.location.href="control.html";
- return ;
- }
-
+ function getButIndex(t){
+ var index = $(t).attr("but-index");
+ // index=(index/33-1);
+ console.info(index);
+ setcookiedit(index);
+ window.location.href="control.html";
+ return ;
+ }
+ function getApplyYanshouIndex(t){
+ var index = $(t).attr("but-index");
+ console.info(index);
+ setApplyYanshou(index);
+
+ return ;
+ }
- var arrTd=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
+ var arrTd = new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
pageSize:20, //姣忛〉鐨勮鏁�
@@ -158,7 +164,7 @@
-
+ var arrdata = new Array();
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閫氳璁℃暟','鏄惁楠屾敹',''];
dataArr = [];
var startTime = "1980-01-01";
@@ -190,17 +196,16 @@
});
}
function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
- //id = 0;
- var number = getCookie("numberget");
- number = JSON.parse(number);
- //console.info(number);
- if(number[0].dev_id){
- //console.info(number);
- for(var i =0; i<number.length;i++){
- if(id == number[i].dev_id){
- return number[i].dev_commcount;
- }
- }
+ if(getCookie("numberget")){
+ var number = getCookie("numberget");
+ number = JSON.parse(number);
+ if(number[0]){
+ for(var i =0; i<number.length;i++){
+ if(id == number[i].dev_id){
+ return number[i].dev_commcount;
+ }
+ }
+ }
}
return 0;
}
@@ -227,6 +232,7 @@
var temp = JSON.stringify(getcreatArr());
//console.info(temp);
arrTd = new Array();
+ arrdata = new Array();
getnumber();
var index = 0;
getCookienumber();
@@ -242,6 +248,7 @@
data=data.data
console.info(data);
for(var i=0;i<data.length;i++){
+ arrdata.push(data[i].binf);//瀛樺偍鏁版嵁
arrTd[index++] = data[i].binf.StationId;
arrTd[index++] = data[i].binf.StationName1;
arrTd[index++] = data[i].binf.StationName2;
@@ -277,10 +284,12 @@
arrTd[index++] = data[i].binf.install_user;
arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
arrTd[index++] = yanshou(data[i].check_en);
- arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>'+
+ '<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鐢宠楠屾敹</a>';
}
}
console.info(arrTd);
+ console.info(arrdata);
createTbl(tblCon, arrTh, arrTd);
timeer = window.setTimeout(function() {
searchBattLife();
@@ -289,13 +298,66 @@
});
}
+ function setApplyYanshou(index){
+ //var value = Math.floor(34*index);
+ console.info(arrdata);
+ if(arrdata){
+ creatYanshouObj(arrdata);
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
+
+ function creatYanshouObj(arrdata){
+ for(var i=0;i<tempindex.length;i++){
+ var obj = {
+ binf:{
+ StationId : temp[0], // 鏈烘埧缂栧彿
+ StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :temp[1], // 鐪�
+ StationName2 : temp[2], // 甯�
+ StationName5 : temp[3], // 鍖�/鍘�
+ StationName3 : temp[4], // 鏈烘埧鍚嶇О
+ StationName4 :temp[5], // 璁惧鍚嶇О
+ StationIp : temp[6], //鏈烘埧ip
+ FBSDeviceId : temp[7], //璁惧id
+ FbsDeviceIp : temp[8], //璁惧ip
+ FbsDeviceIp_YM : temp[9], // 璁惧鎺╃爜
+ FbsDeviceIp_WG : temp[10], // 缃戝叧
+ FBSDeviceName : temp[11], //璁惧鍚嶇О
+ GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
+ BattGroupId : tempid[temp[12]], //鐢垫睜缁刬d
+ BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName : temp[15], //鐢垫睜缁勭储寮�
+ FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : temp[17], //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : temp[18], //娴厖鐢垫祦闃�鍊�
+ MonCount : temp[19], //鍗曚綋鏁伴噺
+ MonCapStd : temp[20], //鏍囩О瀹归噺
+ MonVolStd : temp[21], //鏍囩О鐢靛帇
+ MonResStd : temp[22], //鏍囩О鍐呴樆
+ MonSerStd : temp[23], //鏍囩О鐢靛
+ MonVolLowToAvg : temp[24], //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : temp[25], //璐熻浇鐢垫祦
+ DisCurrMax : temp[26], //鏈�澶ф牳瀹圭數娴�
+ station_phone : temp[27], //鍩虹珯鍙风爜
+
+ BattProducer : temp[28], //鐢垫睜鍝佺墝
+ BattModel : temp[29], //鐢垫睜鍨嬪彿
+ BattProductDate : temp[30]+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : temp[31]+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ install_user : temp[32], //瀹夎浜哄憳
+ }
+ }
+ arr.push(obj);
+ }
+ }
function setcookiedit(index){
var arrcookie = new Array();
for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
var value = Math.floor(34*index);
- //console.info(value);
value = Math.floor(value+i);
- //console.info(value);
arrcookie.push(arrTd[value]);
}
console.info(arrcookie);
@@ -367,30 +429,6 @@
}
// 鏌ヨ鍐呭
- /* function searchBattLife(){
-
-
- /* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
-
- /* for(var i=0;i<340;i++){
- if(i%34==33){
- //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
- console.info(i);
- arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
-
- continue;
-
- } if(i==13){
- arrTd[i]=1002102;
- }else{
- arrTd[i]=i*10;
- }
- }
-
- createTbl(tblCon, arrTh, arrTd);
-
- /* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- //}
function getUpdateArr(temp){
var arr = new Array();
diff --git a/gx_tieta/WebRoot/mobil/eleWarnPrmSet.html b/gx_tieta/WebRoot/mobil/eleWarnPrmSet.html
index 1a20226..04923ce 100644
--- a/gx_tieta/WebRoot/mobil/eleWarnPrmSet.html
+++ b/gx_tieta/WebRoot/mobil/eleWarnPrmSet.html
@@ -25,33 +25,46 @@
<body>
<div data-role="page">
<div class="fg-panel">
- <form method="post" id="search_form" enctype="multipart/form-data">
+ <form>
<div class="fg-panel-header">绛涢��</div>
<div class="fg-panel-content">
- <input type="hidden" value="1" name="bmd.page.pageCurr" id="pageCurr" />
- <input type="hidden" value="10" name="bmd.page.pageSize" id="pageSize" />
- <label for="privince"><strong>璁惧</strong></label>
- <select id="equipment-name">
- <option value="">鍏ㄩ儴</option> <!-- 璁惧 -->
- </select>
- <!-- <select id="privince" name="bmd.binf.StationName1" data-mini="true">
- <option value="">鍏ㄩ儴</option>
+ <fieldset data-role="controlgroup">
+ <p>鐪�</p>
+ <select id="mainteArea" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="">涓�鏋㈢航</option>
+ <option value="">浜屾灑绾�</option>
+ <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="equipment-name">
+ <option value="">鍏ㄩ儴</option> <!-- 璁惧 -->
+ </select>
+
+ <p>鍛婅鍚嶇О</p>
- </select> -->
- <label for="city"><strong>鍛婅鍚嶇О</strong></label>
- <select id="alarm-name">
+ <select id="alarm-name"data-mini="true">
<option value="0">鍏ㄩ儴</option> <!-- 鍛婅鍚嶇О -->
- </select>
+ </select>
-
-
-
+ </fieldset>
</div>
<div class="fg-panel-btn">
- <a href="javascript:panel.hide(true);" data-role="button" id="search" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+ <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
</div>
</form>
- </div>
+ </div>
+
+
+
<div data-role="header" data-position="fixed">
@@ -215,7 +228,7 @@
});
$(document).ready(function(){
- $("#search").click(function(){
+ $("#submit").click(function(){
$('#pageCurr').val(1);
Page.pageCurr =1;
searchEquipmentName();
@@ -357,8 +370,10 @@
function findWarmName(){
var dev_id = $("#equipment-name option:selected").val();
+
console.info(dev_id);
- var warmId ={ "dev_id":dev_id
+ var warmId ={
+ "dev_id":dev_id,
};
//console.info(warmId);
//console.info("aa");
@@ -400,9 +415,16 @@
var alm_id = $("#alarm-name option:selected").val();
//console.info(dev_id);
//console.info("1234");
- var warmId ={ "dev_id":dev_id,
- "alm_id":alm_id
+
+ var warmId ={
+ stationName1:$("#mainteArea").val(),
+ stationName2:$("#city").val(),
+ stationName5:$("#equipment-name").val(),
+ stationName: $("#equipment-name").find('option:selected').attr('stationname'),
+ "dev_id":dev_id,
+ "alm_id":alm_id
};
+ console.info(warmId);
$.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){
//console.info(JSON.stringify(warmId));
var data=data.result;
@@ -479,7 +501,181 @@
$('#alm_low_en').attr('checked',obj.alm_low_en==1);
}
}
-
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ 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()
+ };
+ $.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].StationName3,
+ 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();
+ });
+
</script>
</div>
</body>
--
Gitblit v1.9.1