From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 07e5b31..b461fb5 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -47,7 +47,7 @@
</ul>
<div data-role="collapsible" data-collapsed="false">
<h1 id="jifangzhuangtai">鏈烘埧鐘舵��</h1>
- <div class="tbl-container1"></div>
+ <div class="tbl-container"></div>
</div>
<div data-role="collapsible" data-collapsed="false">
<h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
@@ -67,9 +67,9 @@
<script type="text/javascript" src="js/battNav.js"></script>
<script>
var arrTh = ['鐢垫睜鐘舵�侊細', '绔數鍘嬶細', '鐢垫睜鐢垫祦锛�', '娴嬭瘯鏃ユ湡锛�', '娴嬭瘯鏃堕暱锛�', '娴嬭瘯瀹归噺锛�', '鍓╀綑瀹归噺锛�', '缁埅鏃堕棿锛�'];
- var tbl = $('.tbl-container').eq(0);
+ var tbl = $('.tbl-container').eq(1);
var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','淇″彿寮哄害']
- var tbl1 = $('.tbl-container1').eq(0);
+ var tbl1 = $('.tbl-container').eq(0);
var arrtdjifangstate = new Array;
var temp = getCookie("batt");
var batt = JSON.parse(temp);
@@ -82,7 +82,7 @@
//searchdiubao();
createTbl(tbl1, jifangarrTh, arrTd1);
//searchJifangInfo();
- searchSysData();
+ //searchSysData();
});
$("#return").click(function(){
var temp = getCookie("batt");
@@ -107,11 +107,11 @@
$("#signalqual").click(function(){
searchStationSignal();
})
- $("battparm").click(function(){
- console.info("aaa")
+ $("#battparm").click(function(){
+ searchBattparm();
})
- $("sysparm").click(function(){
- console.info("aaa")
+ $("#sysparm").click(function(){
+ //console.info("aaa")
searchSysData();
})
@@ -205,7 +205,39 @@
});
}
-
+ function searchBattparm() {
+ //console.info(temp);
+ var temp={
+ dev_id:batt.FBSDeviceId,
+ }
+ loadshow();
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_serchByCondition'
+ ,data: 'json='+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ console.log(rs);
+ if(rs.code==1){
+ var data = rs.data[0];
+ var json=window.JSON.stringify(data);
+ setCookie("control_battparm",json);
+ window.location.href="control_battparm.html"
+ }else{
+ alert("鏌ヨ澶辫触");
+ }
+ loadclose();
+ }
+ ,complete: function() {
+ loadclose();
+ }
+ });
+
+ }
+
function searchdiubao(arrTd1){
$.ajax({
type: "post",
@@ -273,6 +305,7 @@
AT_cmd:"CSQ",
dev_id:batt.FBSDeviceId,
}
+ loadshow();
console.info(param);
$.ajax({
type:"post",
@@ -290,6 +323,7 @@
console.info(data.ack_inf);
var msg=formatSignal(data.ack_inf);
console.info(msg.signal);
+ loadclose();
alert(msg.signal);
}
},error:function(e){
@@ -331,6 +365,7 @@
// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
function searchSysData() {
// 寮�鍚瓑寰呮
+ loadshow();
var temp = {
num:128,
dev_id:batt.FBSDeviceId,
@@ -350,17 +385,20 @@
var data = rs.data[0];
console.info(data);
//if(showSU) {
- alert('璇诲彇鎴愬姛', true);
+ //alert('璇诲彇鎴愬姛', true);
var json=window.JSON.stringify(data);
setCookie("control_parm",json);
-
+ window.location.href="control_sysparm.html"
+ loadclose();
//}
}else{
noContent.showNoContent('鏌ヨ澶辫触!');
+ loadclose();
}
},
error: function() {
noContent.showNoContent('鏌ヨ澶辫触!');
+ loadclose();
// 鍏抽棴绛夊緟
}
});
--
Gitblit v1.9.1