From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/zzlogin1.jsp | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index 27d87d2..3572c01 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -5,6 +5,11 @@
%>
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%
+ ServletContext context = getServletContext();
+ String serverInfo = context.getServerInfo();
+ System.out.println(serverInfo);
+ %>
<!DOCTYPE HTML123>
<html>
<head>
@@ -72,6 +77,7 @@
<source src="" type="audio/wav"></source>
</audio>
</div>
+ <pre id="code"></pre>
</body>
<script type="text/javascript" src="js/base.js"></script>
<script type="text/javascript">
@@ -97,13 +103,15 @@
dev_id:910000001
};
console.info(JSON.stringify(temp));
- getDeviceThreadInfo(temp,function(data){
+ SendDeviceThreadInfo(temp,function(data){
console.info(data);
+
+ searchDeviceThreadInfo({dev_id:910000001});
});
//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
- function getDeviceThreadInfo(param,callback){
+ function SendDeviceThreadInfo(param,callback){
$.ajax({
type:"post",
url: "Bts_gprs_stateAction_action_update_bts_task_inf",
@@ -129,6 +137,34 @@
});
}
+ //鏌ヨ璁惧鐨勮繘绋嬩俊鎭�
+ function searchDeviceThreadInfo(param,callback){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_serchByCondition",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ $('#code').text(model.data[0].bts_task_inf);
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
function searchStationSignal(param,callback){
--
Gitblit v1.9.1