From 8950b527f88b682913c4c05a5e1cdd8f18e7d468 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 15:18:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/equiphistwarn.html | 325 +++++++++++++++++++++--------------------------------
1 files changed, 129 insertions(+), 196 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/equiphistwarn.html b/gx_tieta/WebRoot/mobil/equiphistwarn.html
index 751ac24..b911856 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,10 +149,10 @@
//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);
+ console.info(data);
if(model.code==1){
var dev_no = (Page.pageCurr-1)*Page.pageSize+1;
for(var i=0;i<model.data.length;i++){
@@ -165,7 +161,7 @@
newArrTd.push(model.data[i].dev_name); //璁惧鍚嶇О
newArrTd.push(model.data[i].dev_ip); //璁惧ip
newArrTd.push(model.data[i].stationName); //鏈烘埧鍚嶇О
- newArrTd.push("閫氳鏁呴殰"); //閫氳鏁呴殰
+ newArrTd.push(getAlarmTypeByAlmType(model.data[i].alm_type)); //閫氳鏁呴殰
newArrTd.push(getAlarmLevel(model.data[i].alm_level)); //鍛婅绛夌骇
if(model.data[i].alm_is_confirmed == 1){
newArrTd.push('鏄�');
@@ -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() {
@@ -499,6 +413,25 @@
}
return "";
}
+
+ //鑾峰彇璁惧鐨勫憡璀︾被鍨�
+ function getAlarmTypeByAlmType(alm_type){
+ if(alm_type>0){
+ switch(alm_type){
+ case 618501:return "缁х數鍣↘1鍛婅";
+ case 618502:return "閫氳鍛婅";
+ case 618503:return "璁惧杩囨俯鍛婅";
+ case 618504:return "浜屾瀬绠1鍛婅";
+ case 119023:return "缁埅涓嶈冻鍛婅";
+ case 119024:return "鍩虹珯鍋滅數鍛婅";
+ case 119025:return "鍩虹珯鍙戠數鍛婅";
+ case 119026:return "鍩虹珯鎺夌珯鍛婅";
+ case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+ case 119028:return "璁惧楂樻俯鍛婅";
+ }
+ }
+ return "閫氫俊鏁呴殰";
+ }
</script>
</div>
</body>
--
Gitblit v1.9.1