From 3dd540cf10d030f13ab3403d33a1e4ead2fc33a2 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 14:00:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-fault-manage.jsp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index bd2d9ed..b652c62 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -239,7 +239,7 @@
             	var rs = {
             		num: data.num,
             		error_en: 1,
-            		error_dispose: ''
+            		error_dispose: data.error_dispose
             	};
             	
             	return rs;
@@ -475,6 +475,7 @@
 								tmp.note = _data.record_time;
 								tmp.question = _data.error_descript;
 								tmp.error_en = error_en;
+								tmp.error_dispose = _data.error_dispose;
 								tmp.num = _data.num;
 								tmp.county = _data.stationName5;
 								tmp.picture_num = _data.picture_num;

--
Gitblit v1.9.1