From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/history.html | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/history.html b/gx_tieta/WebRoot/mobil/history.html
index ab57eec..75ef06f 100644
--- a/gx_tieta/WebRoot/mobil/history.html
+++ b/gx_tieta/WebRoot/mobil/history.html
@@ -63,6 +63,7 @@
var res_list=new Array(); //鐢靛鍐呴樆娴嬭瘯鏁版嵁
var temp = getCookie("batt");
var batt=eval("("+temp+")");
+ console.info(batt);
$(document).ready(function(){
//console.info(batt);
@@ -94,6 +95,10 @@
function searchcharedata(batt){
loadshow();
+ var temp = {
+ num:batt.FBSDeviceId,
+ BattGroupId:batt.BattGroupId
+ };
jieneng_charge_list = new Array(); //鑺傝兘鍏呯數娴嬭瘯鏁版嵁
tingdian_charge_list = new Array(); //鍋滅數鍏呯數娴嬭瘯鏁版嵁
@@ -101,10 +106,10 @@
tingdian_discharge_list = new Array(); //鍋滅數鏀剧數娴嬭瘯鏁版嵁
//jiafu_discharge_list = new Array(); //鍋囪礋杞芥斁鐢垫祴璇曟暟鎹�
$.ajax({
- url : "Batttestdata_infAction!findByInfo",
+ url : "Batttestdata_infAction_searchBattTestInfDataById",
async: true,
type : "POST",
- data : "bti.BattGroupId="+batt.BattGroupId,
+ data : "json="+JSON.stringify(temp),
dataType : "json",
success : function(data){
//console.info(data);
@@ -231,7 +236,10 @@
var batt = JSON.parse(temp);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
+ {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
+ {url: 'selectcounty.html', txt: batt.StationName5 },
+ {url: 'selectbatt.html', txt: batt.StationName3 },
{url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '鍘嗗彶-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
--
Gitblit v1.9.1