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/control_battparm.html | 67 ++-------
gx_tieta/WebRoot/mobil/batt-edit2.html | 6
gx_tieta/WebRoot/mobil/ele-param2.html | 38 +++++
gx_tieta/WebRoot/mobil/batt-approved1.html | 16 --
gx_tieta/WebRoot/mobil/iframe/searchBatt.html | 15 +
gx_tieta/WebRoot/mobil/control_sysparm.html | 181 +++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 14 +
gx_tieta/WebRoot/mobil/control.html | 52 ++++++-
8 files changed, 305 insertions(+), 84 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7d8308c..6d44d6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -162,19 +162,7 @@
</td>
</tr>
- <tr>
- <td>*閫氳璁℃暟</td>
- <td>
- <input type="text" id="tongxunnumber" class="unable" data-mini="true" />
- </td>
- </tr>
-
- <tr>
- <td>*涓㈠寘鐜�</td>
- <td>
- <input type="text" id="diubaonumber" class="unable" data-mini="true" />
- </td>
- </tr>
+
<tr>
<td>*鏄惁楠屾敹</td>
@@ -385,7 +373,7 @@
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
- getnewnumber(temp[0].binf.FBSDeviceId);
+ //getnewnumber(temp[0].binf.FBSDeviceId);
updateinstalldata();
});
var timeer = '';
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 = ["鐞嗗＋","鍦ｉ槼","鍙岀櫥","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]){
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);
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 024b474..b461fb5 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -82,7 +82,7 @@
//searchdiubao();
createTbl(tbl1, jifangarrTh, arrTd1);
//searchJifangInfo();
- searchSysData();
+ //searchSysData();
});
$("#return").click(function(){
var temp = getCookie("batt");
@@ -107,11 +107,11 @@
$("#signalqual").click(function(){
searchStationSignal();
})
- $("battparm").click(function(){
- console.info("aaa")
+ $("#battparm").click(function(){
+ searchBattparm();
})
- $("sysparm").click(function(){
- console.info("aaa")
+ $("#sysparm").click(function(){
+ //console.info("aaa")
searchSysData();
})
@@ -205,7 +205,39 @@
});
}
-
+ function searchBattparm() {
+ //console.info(temp);
+ var temp={
+ dev_id:batt.FBSDeviceId,
+ }
+ loadshow();
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_serchByCondition'
+ ,data: 'json='+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ console.log(rs);
+ if(rs.code==1){
+ var data = rs.data[0];
+ var json=window.JSON.stringify(data);
+ setCookie("control_battparm",json);
+ window.location.href="control_battparm.html"
+ }else{
+ alert("鏌ヨ澶辫触");
+ }
+ loadclose();
+ }
+ ,complete: function() {
+ loadclose();
+ }
+ });
+
+ }
+
function searchdiubao(arrTd1){
$.ajax({
type: "post",
@@ -273,6 +305,7 @@
AT_cmd:"CSQ",
dev_id:batt.FBSDeviceId,
}
+ loadshow();
console.info(param);
$.ajax({
type:"post",
@@ -290,6 +323,7 @@
console.info(data.ack_inf);
var msg=formatSignal(data.ack_inf);
console.info(msg.signal);
+ loadclose();
alert(msg.signal);
}
},error:function(e){
@@ -331,6 +365,7 @@
// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
function searchSysData() {
// 寮�鍚瓑寰呮
+ loadshow();
var temp = {
num:128,
dev_id:batt.FBSDeviceId,
@@ -353,14 +388,17 @@
//alert('璇诲彇鎴愬姛', true);
var json=window.JSON.stringify(data);
setCookie("control_parm",json);
-
+ window.location.href="control_sysparm.html"
+ loadclose();
//}
}else{
noContent.showNoContent('鏌ヨ澶辫触!');
+ loadclose();
}
},
error: function() {
noContent.showNoContent('鏌ヨ澶辫触!');
+ loadclose();
// 鍏抽棴绛夊緟
}
});
diff --git a/gx_tieta/WebRoot/mobil/control_battparm.html b/gx_tieta/WebRoot/mobil/control_battparm.html
index d900fb4..577ce25 100644
--- a/gx_tieta/WebRoot/mobil/control_battparm.html
+++ b/gx_tieta/WebRoot/mobil/control_battparm.html
@@ -143,13 +143,10 @@
pageAll:0,
};
- var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿',
- '鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','缁忓害','缁村害','鍦板潃','鐢宠鏃堕棿','鐢宠鐘舵��','鐢宠浜�','瀹℃牳浜�'];
+ var arrTh = [ '璁惧ID', '鏈烘埧鍚嶇О', '鐢垫睜鏍囩О瀹归噺','鐢垫睜鏍囩О鍐呴樆','鐢垫睜缁勬暟','姣忕粍鐢垫睜鍗曚綋鏁伴噺','鍗曚綋鏍囩О鐢靛帇','鐢垫睜缁勭鏍囩О鐢靛帇','鐢垫睜鏍囩О娓╁害','鐢垫睜娴厖鐢靛帇闃堝��','鐢垫睜娴厖鐢垫祦闃堝��','鍦ㄧ嚎鐢靛帇浣庨槇鍊�','鐢垫睜缁勮繛鎺ョ被鍨�'];
dataArr = [];
- var startTime = "1980-01-01";
- var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
- var temp = getCookie("wapproval");
+ var temp = getCookie("control_battparm");
temp = JSON.parse(temp);
console.info(temp);
createTbl(tbl, arrTh, dataArr);
@@ -157,58 +154,26 @@
Page.pageCurr=1;
console.info(temp);
setBattLife();
- battnumber();
//searchBattLife();
//console.info($("#getnumber").val());
});
function setBattLife(){
data = temp;
- var index = 0;
- for(var i=0;i<data.length;i++){
- arrTd[index++] = data[i].binf.StationId;
- arrTd[index++] = data[i].binf.StationName1;
- arrTd[index++] = data[i].binf.StationName2;
- arrTd[index++] = data[i].binf.StationName5;
- arrTd[index++] = data[i].binf.StationName3;
- arrTd[index++] = data[i].binf.StationName4;
- arrTd[index++] = data[i].binf.StationIp;
- arrTd[index++] = data[i].binf.FBSDeviceId;
- arrTd[index++] = data[i].binf.FbsDeviceIp;
- arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
- arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
- arrTd[index++] = data[i].binf.FBSDeviceName;
- arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
- arrTd[index++] = data[i].binf.BattGroupId;
- arrTd[index++] = data[i].binf.BattGroupNum;
- arrTd[index++] = data[i].binf.BattGroupName;
- arrTd[index++] = data[i].binf.FloatVolLevel;
- arrTd[index++] = data[i].binf.OfflineVolLevel;
- arrTd[index++] = data[i].binf.BattFloatCurrent;
- arrTd[index++] = data[i].binf.MonCount;
- arrTd[index++] = data[i].binf.MonCapStd;
- arrTd[index++] = data[i].binf.MonVolStd;
- arrTd[index++] = data[i].binf.MonResStd;
- arrTd[index++] = data[i].binf.MonSerStd;
- arrTd[index++] = data[i].binf.MonVolLowToAvg;
- arrTd[index++] = data[i].binf.Load_curr;
- arrTd[index++] = data[i].binf.DisCurrMax;
- arrTd[index++] = data[i].binf.station_phone;
- arrTd[index++] = data[i].binf.BattProducer;
- arrTd[index++] = data[i].binf.BattModel;
- arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
- arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
- arrTd[index++] = data[i].binf.install_user;
- arrTd[index++] = data[i].longitude;//缁忓害
- arrTd[index++] = data[i].latitude;//绾害
- arrTd[index++] = data[i].address;//鍦板潃
- arrTd[index++] = data[i].apply_date;
- arrTd[index++] = check(data[i].check_en);
- arrTd[index++] = data[i].apply_name;
- arrTd[index++] = data[i].confirm_name;
- //arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>瀹℃牳</a>';
- }
-
+ var index=0;
+ arrTd[index++] = data.dev_id;
+ arrTd[index++] = data.StationName;
+ arrTd[index++] = data.STD_CAP;
+ arrTd[index++] = data.STD_RES;
+ arrTd[index++] = data.BattGroupCount;
+ arrTd[index++] = data.EachGroupBattCount;
+ arrTd[index++] = data.MonomerVol;
+ arrTd[index++] = data.GroupVol;
+ arrTd[index++] = data.BattTemp;
+ arrTd[index++] = data.FloatChargeVol;
+ arrTd[index++] = data.FloatChargeCurr;
+ arrTd[index++] = data.OnlineVolLow;
+ arrTd[index++] = data.GroupConnType;
createTbl(tblCon, arrTh, arrTd);
}
diff --git a/gx_tieta/WebRoot/mobil/control_sysparm.html b/gx_tieta/WebRoot/mobil/control_sysparm.html
index 81a57b4..b463100 100644
--- a/gx_tieta/WebRoot/mobil/control_sysparm.html
+++ b/gx_tieta/WebRoot/mobil/control_sysparm.html
@@ -1,10 +1,183 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
+ <meta charset="UTF-8">
+ <title>绯荤粺鍙傛暟</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="apple-mobile-web-app-status-bar-style" content="black">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <link rel="stylesheet" type="text/css" href="src/css/layui.css">
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+ <style type="text/css">
+
+ /*瑙勫畾闈㈡澘鐨勬牱寮�*/
+ .ui-panel {
+ width: 80%;
+ }
+ .ui-panel-dismiss{
+ width: 20%;
+ }
+ .ui-panel-inner{
+ padding:0 !important;
+ }
+ .ui-collapsible-heading-toggle{
+ padding-left: 1em !important;
+ }
+ .panel-header{
+ padding: 8px 0;
+ font-size: 1.2em;
+ text-indent: 1em;
+ background-color: #DFDCDC;
+ }
+ /*瑙勫畾寮�鍏崇殑浣嶇疆*/
+ .ui-flipswitch {
+ margin-left: 0.5em;
+ }
+
+ .ui-field-contain{
+ padding: 0 0.6em ;
+ }
+ .ui-field-contain {
+ border-bottom-color: #828282;
+ border-bottom-color: rgba(0,0,0,.15);
+ border-bottom-width: 1px;
+ border-bottom-style: none;
+ }
+ .sicon{
+ display:inline-block;width:4%;margin:1em 0;float:left;
+ }
+ .checkdata{
+ display:inline-block;width:48%;margin:0 0 0 0;float:left;
+ }
+
+ .next-page, .pre-page {
+ position: fixed;
+ width: 40px;
+ height: 40px;
+ top: 50%;
+ margin-top: -15px;
+ }
+ .next-page {
+ right: 0;
+ }
+ .pre-page {
+ left: 0;
+ }
+
+
+ table {
+ margin-top:.5em;
+ border-collapse:separate;
+ border-spacing:0 .5em;
+ }
+
+ tbody tr td{
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+ }
+ .bg-line{
+ background-color:#ddd;
+ }
+ .operat-but{
+ margin: 0;
+ padding-top: 0.1em;
+ padding-bottom: 0.1em;
+
+ }
+ .ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
+ width:35%;
+ }
+ .fr{
+ float:right;
+ }
+ </style>
+ <link rel="stylesheet" href="css/fgpanel.css">
</head>
<body>
+ <div data-role="page">
+
+ <!-- 澶撮儴鍐呭 -->
+ <div data-role="header" data-position="fixed">
+ <a href="control.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <h1>绯荤粺鍙傛暟</h1>
+
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <!-- 琛ㄦ牸瀹瑰櫒 -->
+ <div class="tbl-container"></div>
+ <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+
+ </table>
+ </div>
+
+ </div>
+ <!-- 瀛樺偍homeinfo鐨勫�� -->
+ <div id="homeInfoIframe"></div>
+ <div id="homeInfoIframeAll"></div>
</body>
-</html>
\ No newline at end of file
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
+
+ <script type="text/javascript">
+ /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
+
+ var arrTd = new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
+ var tblCon = $('.tbl-container');
+ var Page = {
+ pageSize:20, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+
+ var arrTh = [ '璁惧ID', '璁惧鍚嶇О', '鎬荤画鑸椂闂�','淇濅竴娆′笅鐢电画鑸椂闂�','鐢垫祦閽抽噺绋�','涓�娆′笅鐢电數鍘�','浜屾涓嬬數鐢靛帇','DCDC妯″潡鏁伴噺','鍗曚綋鏁版嵁鏉ユ簮绫诲瀷','鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺','鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�','鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�','鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�','鑳屽厜鏃堕暱','鍋滅數鍏呯數鐢垫祦'];
+ dataArr = [];
+ var tbl = $('.tbl-container');
+ var temp = getCookie("control_parm");
+ temp = JSON.parse(temp);
+ console.info(temp);
+ createTbl(tbl, arrTh, dataArr);
+ $(document).ready(function(){
+ Page.pageCurr=1;
+ console.info(temp);
+ setBattLife();
+ //searchBattLife();
+ //console.info($("#getnumber").val());
+ });
+
+ function setBattLife(){
+ data = temp;
+ var index=0;
+ arrTd[index++] = data.dev_id;
+ arrTd[index++] = data.stationName;
+ arrTd[index++] = data.GroupVolRange;
+ arrTd[index++] = data.GroupVolSorce;
+ arrTd[index++] = data.CurrentRange;
+ arrTd[index++] = Math.ceil(data.CurrentTyte/10);
+ arrTd[index++] = Math.ceil(data.MonomerOrder/10);
+ arrTd[index++] = data.LoaderCount;//DC鏁伴噺
+ arrTd[index++] = data.DtCardCount;
+ arrTd[index++] = data.POF_BG_Boost_Cnt;
+ arrTd[index++] = data.POF_BG_Boost_VolStop;
+ arrTd[index++] = data.POF_BG_Boost_VolStart;
+ arrTd[index++] = data.MajorBattGroupNum;
+ arrTd[index++] = data.BackLightTime;
+ arrTd[index++] = data.PowerBreakChargeCurr;
+ createTbl(tblCon, arrTh, arrTd);
+ }
+
+ </script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index f7778ab..68d8bfe 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -224,6 +224,7 @@
<!-- 瀛樺湪鏈烘埧淇℃伅 -->
<div id="homeInfoIframe"></div>
<input id="handle_status" value="" type="hidden">
+ <input id="jifangname" value="" type="hidden">
<script src="src/layui.all.js"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
@@ -365,6 +366,11 @@
}else{
setcookieCreat(Page.pageSize-1);
}
+ var test=getCookie("eleparm2newbatt");
+ console.info(test);
+ var jiafangname = $("#jifangname").val();
+ console.info($("#jifangname").val());
+ console.info(test);
window.location.href="batt-infor-conf-temp1.html";
});
@@ -375,6 +381,7 @@
var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
createTbl(tbl, arrTh, dataArr);
+ serchProducer();
$(document).ready(function(){
setPage();
//newbattnum;
@@ -555,6 +562,7 @@
getEditButIndex(0);
}
});
+
}
//鏋勯�犳煡璇㈡潯浠�
@@ -816,9 +824,33 @@
}
-
-
-
+ function serchProducer(){
+ var battproducer = new Array();
+ $.ajax({
+ type: 'post'
+ ,async: false
+ ,url: 'BattInfAction!serchByBattProducer'
+ ,data: null
+ ,dataType: 'json'
+ ,success:function(res) {
+ //console.info(res);
+ data = JSON.parse(res.result);
+ console.info(data.data);
+ if(data.code==1&&data.data.length>0){
+ data = data.data;
+ for(var i=0;i<data.length;i++){
+ //console.info(data);
+ battproducer.push(data[i].BattProducer);
+ }
+ }
+ var json = window.JSON.stringify(battproducer);
+ setCookie("producer",json);
+ //var battproduce = getCookie("producer");
+ //battproduce1 = JSON.parse(battproduce);
+ //console.info(battproduce1);
+ }
+ });
+ }
diff --git a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
index f8d9ce0..f80efd7 100644
--- a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
+++ b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
@@ -96,11 +96,22 @@
if(data.length>0){
layer.msg('璇烽�夋嫨涓嬫柟鐨勬満鎴�');
}else{
+ var json = window.JSON.stringify(input);
+ setCookie("eleparm2newbatt",json);
layer.confirm('鎮ㄨ緭鍏ョ殑鏈烘埧涓嶅瓨鍦紒鏄惁瑕佽鏂板缓鏈烘埧锛�',{btn:['鏂板缓','鍙栨秷']},function(){
setV();
+ var json = window.JSON.stringify(input);
+ //setCookie("eleparm2newbatt",json);
+ // $("#jifangname").val(input);
+ //console.info(input);
+ // var test=getCookie("eleparm2newbatt");
+ //console.info(test);
});
- input = window.JSON.stringify(input);
- setCookie("ele_parm2_newbatt",input);
+ //var test=getCookie("eleparm2newbatt");
+ //console.info(test);
+ //console.info(input);
+ //var json = window.JSON.stringify(input);
+ //setCookie("ele_parm2_newbatt",json);
}
}
});
--
Gitblit v1.9.1