From db53916414e35580e8f39bc8f7dd1897f8200eda Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期二, 20 十一月 2018 10:00:03 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/index.jsp | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp index 3f21744..229ea51 100644 --- a/gx_tieta/WebRoot/index.jsp +++ b/gx_tieta/WebRoot/index.jsp @@ -387,6 +387,7 @@ </div> </div> <input type="hidden" id="user_logo" value="<%=user_logo %>"> + <div id="homeInfoIframeData"></div> <!--娓呴櫎娴姩--> <div class="clear"></div> <script type="text/javascript" src="pages/js/base.js"></script> @@ -402,6 +403,7 @@ <script type="text/javascript" src="js/loading.js"></script> <script type="text/javascript" src="src/layui.js"></script> <script type="text/javascript" src="src/layui.all.js"></script> + <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script> <script type="text/javascript"> var permits; <% Object obj=session.getAttribute("permits"); @@ -2467,7 +2469,8 @@ var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+ '<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+ '<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+ - '<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a><a style="margin-left: 20px" href="javascript:showHomeInfo();">鍩虹珯淇℃伅</a></div>'+ + '<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a>'+ + '<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">鍩虹珯淇℃伅</a></div>'+ '<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+ '<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+ '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+ @@ -3742,10 +3745,6 @@ } $( "#mapToolSearch" ).autocomplete('option', 'source', homeSource); - } - // 鏄剧ず鏈烘埧淇℃伅 - function showHomeInfo() { - layer.msg('鍔熻兘寮�鍙戜腑...'); } </script> </html> -- Gitblit v1.9.1