From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/zzlogin1.jsp | 130 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index 12a727f..e06c62f 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -72,6 +72,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">
@@ -86,27 +87,140 @@
var test = new Date('2018-09-03 14:49:00');
console.info((now.getTime()-test.getTime())/1000);
- //鏍规嵁璁惧id淇敼璁惧鐨勫瓙缃戞帺鐮�,缃戝叧鍜岃澶噄p
- var temp = {
- media_text:"123"
- };
- createBroadcast(temp);
- function createBroadcast(param){
+ var CMD_GETGPRSPARAM = 145; //鍙戦�佸懡浠ょ粰gprs
+ var CMD_GETSTATIONSIGNAL = "CSQ";
+
+ var CMD_GETDEVICETHREADINFO = 0x17;
+
+ var temp = {
+ num:CMD_GETDEVICETHREADINFO,
+ dev_id:910000001
+ };
+ console.info(JSON.stringify(temp));
+ SendDeviceThreadInfo(temp,function(data){
+ console.info(data);
+
+ searchDeviceThreadInfo({dev_id:910000001});
+ });
+
+
+ //缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ function SendDeviceThreadInfo(param,callback){
$.ajax({
type:"post",
- url: "BroadcastAction_media_createBroadcast",
+ url: "Bts_gprs_stateAction_action_update_bts_task_inf",
async:true,
dataType:'json',
data:'json='+JSON.stringify(param),
success: function(data){
var model = eval('('+data.result+')');
console.info(model);
- setWarnAudio(model.data.media_name);
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
}
});
}
+ //鏌ヨ璁惧鐨勮繘绋嬩俊鎭�
+ 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){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_update",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
+
+ //鐢ㄦ埛瑕佽缃殑閰嶇疆椤�
+ var temp = {
+ echarts1_enable:0,
+ echarts2_enable:0,
+ echarts3_enable:0,
+ echarts4_enable:0,
+ echarts5_enable:0,
+ echarts6_enable:0,
+ echarts7_enable:0,
+ echarts8_enable:0,
+ echarts9_enable:0,
+ echarts10_enable:0
+ };
+
+ //updateUserBieState(temp);
+ //鏌ヨ褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
+ function updateUserBieState(temp){
+ $.ajax({
+ type:"post",
+ url: "Echarts_usrAction!add",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(temp),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ }
+ });
+ }
+
+
+
function setWarnAudio(filename) {
var src = '../mediafiles/'+filename;
$('#warnAudio source').prop('src', src);
--
Gitblit v1.9.1