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 | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp index fb122c1..b652c62 100644 --- a/gx_tieta/WebRoot/batt-fault-manage.jsp +++ b/gx_tieta/WebRoot/batt-fault-manage.jsp @@ -102,6 +102,8 @@ <div id="detailsOpts"></div> <!-- 瀛樺偍鏄剧ず鍥剧墖璇︽儏鐨勪俊鎭� --> <div id="detailImgs"></div> + <!-- 瀛樺偍瑙e喅鏂规鐨勪俊鎭� --> + <div id="subPlan"></div> <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script> <script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script> <script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script> @@ -131,6 +133,7 @@ ,element = layui.element ,$=layui.jquery ,form = layui.form; + var uploadIframe; // 闈㈡澘 // 琛ㄦ牸鏁版嵁閰嶇疆椤� var tOptions = { elem: '#eleInfoTbl' @@ -160,6 +163,9 @@ switch(ev) { case 'details': faultDetails(obj.data); + break; + case 'delError': + addSubPlan(obj.data); break; default: layer.msg('鍔熻兘寮�鍙戜腑...'); @@ -211,9 +217,38 @@ return rs; } + // 娣诲姞瑙e喅鏂规 + function addSubPlan(data) { + var subPlanData = setSubPlanData(data); + + $('#subPlan').data('data', subPlanData); + + uploadIframe = layer.open({ + type: 2, + title: '<span style="font-weight:bold">>>鏁呴殰鎺掗櫎鏂规</span>', + area: ['700px', '560px'], + fixed: false, //涓嶅浐瀹� + resize: false, + maxmin: false, + content: 'iframe/batt-fault-manage-del.html' + }); + } + + // 鏋勯�犺В鍐虫柟妗堢殑缁撴灉 + function setSubPlanData(data) { + var rs = { + num: data.num, + error_en: 1, + error_dispose: data.error_dispose + }; + + return rs; + } + + function getData(a,b){ var arr=[]; - for(i=0;i<a;i++){ + for(var i=0;i<a;i++){ arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i}); } return arr; @@ -222,7 +257,7 @@ $(document).on('click','.addbtn',function(){ searchStationHistRecord(); }); - var uploadIframe; + // 娣诲姞鏁呴殰淇℃伅 function searchStationHistRecord(){ // 鏄剧ず闈㈡澘 uploadIframe = layer.open({ @@ -440,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