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/charge-history.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/charge-history.html b/gx_tieta/WebRoot/mobil/charge-history.html
index 12fd4cc..7115fb1 100644
--- a/gx_tieta/WebRoot/mobil/charge-history.html
+++ b/gx_tieta/WebRoot/mobil/charge-history.html
@@ -257,12 +257,13 @@
var record = -1;
var index = -1;
var flag = false;
+ var start_record_num = list[0].record_num;
for(var i=0;i<list.length;i++){
//console.info(list[i]);
if(list[i].record_num != record){
ALLData[++index] = new Array();
- if(list[i].record_num > 1){
+ if(list[i].record_num > start_record_num){
flag = true;
ALLData[index] = ALLData[index-1].slice(0);
}
--
Gitblit v1.9.1