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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index e71a217..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 = ["鐞嗗+","鍦i槼","鍙岀櫥","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]){

--
Gitblit v1.9.1