From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 8455d36..1c398f4 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -205,6 +205,14 @@
// 鏌ョ湅澶勭悊鏂规鎻忚堪
function viewSolveDetails(data) {
+ //console.log(data.error_en_num);
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄨВ鍐虫柟妗�
+ if(!data.error_en_num) {
+ layer.msg('鏆傛棤瑙ｅ喅鏂规');
+ return;
+ }
+
+
var imgOpts = setDelDetailsOpts(data);
$('#detailImgs').data('data', imgOpts);
layer.open({
@@ -286,7 +294,7 @@
uploadIframe = layer.open({
type: 2,
title: '<span style="font-weight:bold">>>鏁呴殰鎺掗櫎鏂规</span>',
- area: ['700px', '560px'],
+ area: ['1200px', '600px'],
fixed: false, //涓嶅浐瀹�
resize: false,
maxmin: false,
@@ -533,6 +541,7 @@
tmp.stationName3 = _data.stationName;
tmp.note = _data.record_time;
tmp.question = _data.error_descript;
+ tmp.error_en_num = _data.error_en;
tmp.error_en = error_en;
tmp.error_dispose = _data.error_dispose;
tmp.num = _data.num;
--
Gitblit v1.9.1