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-edit2.html | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index b2f1c92..e6a930b 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -279,10 +279,12 @@
function selectedIndex(index){
+ var battproducer = getCookie("producer");
+ battproducer = JSON.parse(battproducer);
+ console.info(battproducer);
var selected='',
i=0;
- var battproducer = ["鐞嗗＋","鍦ｉ槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝＋杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
- "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
+ //onsole.info(inde)
selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
for(var i=0;i<battproducer.length;i++){
if(temp[index].binf.BattProducer!=battproducer[i]){
@@ -406,7 +408,8 @@
//document.getElementById("BattGroupName").value = temp[15];
//document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
//document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
- document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+ //document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+ document.getElementById("BattFloatCurrent").value = 5;
//document.getElementById("MonCount").value = data.MonCount;
//document.getElementById("MonCapStd").value = data.MonCapStd;
document.getElementById("MonResStd").value = data.MonResStd;
--
Gitblit v1.9.1