From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +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 | 213 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 186 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index d92f858..4891500 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -41,6 +41,7 @@
.ui-select .ui-btn select{
width:77%;
}
+ table tr td{width:1000em;padding-right:1em;}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -97,8 +98,7 @@
<tr>
<td>*鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <textarea id="homeName" data-mini="true"></textarea>
</td>
</tr>
@@ -159,6 +159,13 @@
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
+ <input type="hidden" id="fuchongfazhi0" data-mini="true" />
+
+ <input type="hidden" id="fuchongfazhi1" data-mini="true" />
+
+ <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />
+
+ <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
<td>
@@ -167,6 +174,7 @@
</tr>
<input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="judgeBatt" data-mini="true" />
<tr>
@@ -251,7 +259,7 @@
}
function selectedIndex(index){
- var selected='',
+ /* var selected='',
i=0;
selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
@@ -272,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);
@@ -408,9 +431,6 @@
$(function () {
- //setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
//creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
installstartdata(temp);
});
@@ -470,10 +490,8 @@
var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
- //$('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
- //$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
- fuchongfazhi[index] = chargeVol;
- lixiandianyafazhi[index] = outlineVol;
+ $("#fuchongfazhi"+index).val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $("#lixiandianyafazhi"+index).val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
console.info(vol);
}
@@ -510,7 +528,7 @@
,BattGroupName: '鐢垫睜缁�1'
,FloatVolLevel: 54
,OfflineVolLevel: 42.9
- ,BattFloatCurrent: 10
+ ,BattFloatCurrent: 5
,MonCount: 24
,MonCapStd: 300
,MonVolStd: 2
@@ -565,7 +583,7 @@
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
setFloatAndoutLine(1);
- //setFloatAndoutLine();
+ //setFloatAndoutLine();
}
function getUpdateArr(){
@@ -609,8 +627,8 @@
BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
- FloatVolLevel : fuchongfazhi[i], //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : lixiandianyafazhi[i], //绂荤嚎鐢靛帇闃�鍊�
+ FloatVolLevel : $("#fuchongfazhi"+i).val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#lixiandianyafazhi"+i).val(), //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺
MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺
@@ -635,7 +653,7 @@
console.info(arr);
return arr;
}
-
+
</script>
<script type="text/javascript">
$(function(){
@@ -646,12 +664,10 @@
$("#sure").click(function(){
if(nullOrn()){
creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBattnew(); //鎻愪氦
-
+ JudegeBattIn();//鎻愪氦鍓嶉獙璇佽鐢垫睜缁勫湪BATTINF琛ㄤ腑鏄惁宸插瓨鍦�
+ //addBattnew(); //鎻愪氦
}else{
} //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
- //function backpage(){window.location.href="ele-param1.html";}
- // setTimeout(backpage,500);
});
$("#cancel").click(function(){
window.location.href="ele-param2.html";
@@ -668,8 +684,32 @@
}
}
+ function JudegeBattIn(){
+ var battinff ={
+ StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ }
+ console.info(battinff);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: '../BattInfAction!judgeBatt',
+ data: "json="+JSON.stringify(battinff),
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ console.info(data);
+ if(data.code!=1){
+ addBattnew()
+ }else{
+ alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖淇敼椤甸潰淇敼骞堕噸鏂版彁浜�");
+ SearchParam();
+ }
+ }
+ });
+ }
+
function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
- console.info(getUpdateArr());
+ console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
@@ -692,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