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 | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index c012ae3..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,9 +280,21 @@
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);
--
Gitblit v1.9.1