From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-state-manage.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-state-manage.html b/gx_tieta/WebRoot/mobil/batt-state-manage.html
index 16f8b8f..177ea32 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-manage.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-manage.html
@@ -312,11 +312,11 @@
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
- arrTd[index++] = '寮�闂�';
+ arrTd[index++] = '鍏抽棬';
arrTd[index++] = _data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
arrTd[index++] = StringtoData(_data.station_dooropen_start_time);
}else {
- arrTd[index++] = '鍏抽棬';
+ arrTd[index++] = '寮�闂�';
arrTd[index++] = "-";//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
arrTd[index++] = formartTime(0);
}
--
Gitblit v1.9.1