From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 153 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 144 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 1e55d78..4891500 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -259,7 +259,7 @@
}
function selectedIndex(index){
- var selected='',
+ /* var selected='',
i=0;
selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
@@ -280,18 +280,33 @@
selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
+ selected+= '<option '+'value='+'鐑界伀'+'>'+' 鐑界伀'+'</option>';*/
+ var battproducer = getCookie("producer");
+ battproducer = JSON.parse(battproducer);
+ var selected='',
+ i=0;
+ for(var i=1;i<battproducer.length;i++){
+ console.info(battproducer[i]);
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
return selected;
}
var temp = getCookie("eleparm");
+ var test=getCookie("eleparm2newbatt");
+ //jifangname = JSON.parse(jifangname);
+ console.info(test);
//console.info(temp);
temp=JSON.parse(temp);
console.info(temp);
- console.info(temp[30]);
- console.info(temp[33]);
- console.info(temp[34]);
- var suoyin = temp[33];
- var fuchongfazhi = [0,0,0,0];
- var lixiandianyafazhi = [0,0,0,0];
+ //console.info(temp[30]);
+ //console.info(temp[33]);
+ //console.info(temp[34]);
+ var suoyin = temp[33];//鐢垫睜缁勪釜鏁�
+ var Page = {
+ pageSize:20, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
$(function(){
creatAllView(suoyin).trigger('create');
creatMonCapOpt(suoyin);
@@ -686,7 +701,8 @@
if(data.code!=1){
addBattnew()
}else{
- alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖涓婁竴椤垫悳绱㈡淇敼");
+ alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖淇敼椤甸潰淇敼骞堕噸鏂版彁浜�");
+ SearchParam();
}
}
});
@@ -716,8 +732,127 @@
});
}
+ function SearchParam(){
+ var temp = {
+ page:Page,
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#county').val(),
+ StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ },
+ };
+ console.info(temp);
+ searchBattLife(temp);
+ }
+ // 鏌ヨ鍐呭
+ function searchBattLife(temp){
+ //var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ var num =new Array();
+ var groupId = new Array();
+ var groupName = new Array();
+ var arrdata = new Array();
+ console.info(json);
+ arrTd = new Array();
+ var load;
+ $.ajax({
+ type:"post",
+ url:"BattInfAction!searchInform",
+ async:true,
+ datatype:'text',
+ data:"json="+json,
+ success:function(data){
+ console.info(data);
+ var data = JSON.parse(data.result);
+ //layer.close(load);
+ console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data=data.data;
+ var index = 0;
+ var ArryTb= new Array();
+ for(var i=0;i<data.length;i++){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
+ }
+ seteditparm(0,arrdata);
+ window.location.href="batt-edit2.html";
+ }else{
+ Page.pageAll = 0;
+ }
+ //createTbl(tblCon, arrTh, arrTd);
+ //getEditButIndex(0);
+ }
+ });
+ }
+
+ function seteditparm(index,arrdata){
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ console.info(arrdata);
+ var arr= creatYanshouObj(arrdata,index);
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
-
+ function creatYanshouObj(arrdata,index){
+ console.info(arrdata[0]);
+ console.info(index);
+ var StationId = arrdata[index].StationId;
+ //console.info(StationId);
+ var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+ for(var i=0;i<arrdata.length;i++){//涓�娆￠獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+ if(StationId == arrdata[i].StationId){
+ var obj = {
+ binf:{
+ StationId : arrdata[i].StationId, // 鏈烘埧缂栧彿
+ StationName : (arrdata[i].StationName1+"-"+ arrdata[i].StationName2+"-"+arrdata[i].StationName5+"-"+arrdata[i].StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :arrdata[i].StationName1, // 鐪�
+ StationName2 : arrdata[i].StationName2, // 甯�
+ StationName5 : arrdata[i].StationName5, // 鍖�/鍘�
+ StationName3 : arrdata[i].StationName3, // 鏈烘埧鍚嶇О
+ StationName4 : arrdata[i].StationName4, // 璁惧鍚嶇О
+ StationIp :arrdata[i].StationIp, //鏈烘埧ip
+ FBSDeviceId : arrdata[i].FBSDeviceId, //璁惧id
+ FbsDeviceIp : arrdata[i].FbsDeviceIp, //璁惧ip
+ FbsDeviceIp_YM : arrdata[i].FbsDeviceIp_YM, // 璁惧鎺╃爜
+ FbsDeviceIp_WG : arrdata[i].FbsDeviceIp_WG , // 缃戝叧
+ FBSDeviceName : arrdata[i].FBSDeviceName, //璁惧鍚嶇О
+ GroupIndexInFBSDevice : arrdata[i].GroupIndexInFBSDevice, //fbs璁惧绱㈠紩
+ BattGroupId : arrdata[i].BattGroupId, //鐢垫睜缁刬d
+ BattGroupNum : arrdata[i].BattGroupNum , //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName :arrdata[i].BattGroupName, //鐢垫睜缁勭储寮�
+ FloatVolLevel : arrdata[i].FloatVolLevel, //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : arrdata[i].OfflineVolLevel, //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : arrdata[i].BattFloatCurrent, //娴厖鐢垫祦闃�鍊�
+ MonCount : arrdata[i].MonCount, //鍗曚綋鏁伴噺
+ MonCapStd : arrdata[i].MonCapStd, //鏍囩О瀹归噺
+ MonVolStd : arrdata[i].MonVolStd, //鏍囩О鐢靛帇
+ MonResStd : arrdata[i].MonResStd, //鏍囩О鍐呴樆
+ MonSerStd : arrdata[i].MonSerStd, //鏍囩О鐢靛
+ MonVolLowToAvg : arrdata[i].MonVolLowToAvg, //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : arrdata[i].Load_curr, //璐熻浇鐢垫祦
+ DisCurrMax : arrdata[i].DisCurrMax, //鏈�澶ф牳瀹圭數娴�
+ station_phone : arrdata[i].station_phone, //鍩虹珯鍙风爜
+
+ BattProducer : arrdata[i].BattProducer, //鐢垫睜鍝佺墝
+ BattModel : arrdata[i].BattModel, //鐢垫睜鍨嬪彿
+ BattProductDate : arrdata[i].BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
+ install_user : arrdata[i].install_user, //瀹夎浜哄憳
+ }
+ }
+ arr.push(obj);
+ }
+ }
+ console.info(arr);
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ var json=window.JSON.stringify(arr);
+ setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ return arr;
+ }
+
function creatMonCapOpt(suoyin){
var k,optionStr='',allString
for(var i=1;i<11;i++){
--
Gitblit v1.9.1