From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/history.html |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/history.html b/gx_tieta/WebRoot/mobil/history.html
index 69d7432..75ef06f 100644
--- a/gx_tieta/WebRoot/mobil/history.html
+++ b/gx_tieta/WebRoot/mobil/history.html
@@ -236,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