From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index b461fb5..911f6ce 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -46,13 +46,13 @@
</li> -->
</ul>
<div data-role="collapsible" data-collapsed="false">
- <h1 id="jifangzhuangtai">鏈烘埧鐘舵��</h1>
+ <h1 id="jifangzhuangtai">bts璁惧鐘舵��</h1>
<div class="tbl-container"></div>
</div>
<div data-role="collapsible" data-collapsed="false">
<h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
<div class="tbl-container"></div>
- </div>
+ </div>
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
@@ -61,14 +61,15 @@
<li><a href="" id="signalqual" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-check" data-icon="check" data-role="button">淇″彿璐ㄩ噺</a></li>
</ul>
</div>
- </div>
+ </div>
+ </div>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/battNav.js"></script>
<script>
var arrTh = ['鐢垫睜鐘舵�侊細', '绔數鍘嬶細', '鐢垫睜鐢垫祦锛�', '娴嬭瘯鏃ユ湡锛�', '娴嬭瘯鏃堕暱锛�', '娴嬭瘯瀹归噺锛�', '鍓╀綑瀹归噺锛�', '缁埅鏃堕棿锛�'];
var tbl = $('.tbl-container').eq(1);
- var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','淇″彿寮哄害']
+ var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','娴嬭瘯缁勫彿','璁惧宸ヤ綔鐘舵��']
var tbl1 = $('.tbl-container').eq(0);
var arrtdjifangstate = new Array;
var temp = getCookie("batt");
@@ -250,7 +251,7 @@
success: function(data){
data=JSON.parse(data);
data = JSON.parse(data.result);
- //console.info(data);
+ console.info(data);
if(data.code==1&&data.data.length>0){
data = data.data[0];
var jishu = data.dev_commcount;
@@ -258,12 +259,42 @@
arrTd1.push(jishu);
var diubao=(data.dev_commcount==0?0:(data.dev_errcommcount*100/data.dev_commcount)).toFixed(2);
arrTd1.push(diubao);
+ arrTd1.push("鐢垫睜缁�"+data.dev_testgroupnum);
+ arrTd1.push(workstate(data.dev_workstate));
createTbl(tbl1, jifangarrTh, arrTd1);
+ }else{
+ var arrTd2 = new Array();
+ arrTd2.push("璁惧鏈繛鎺�")
+ var jifangzhuangtai=["璁惧鐘舵��"]
+ createTbl(tbl1,jifangzhuangtai,arrTd2);
}
}
});
}
-
+ function workstate(data){
+ switch (data){
+ case 0:
+ return "鍦ㄧ嚎娴厖";
+ break;
+ case 1:
+ return "鏀剧數鐘舵��";
+ break;
+ case 2:
+ return "鍏呯數鐘舵��";
+ break;
+ case 3:
+ return "鍐呴樆娴嬭瘯";
+ break;
+ case 4:
+ return "鏈煡"
+ break;
+ default:{
+ //鏈繛鎺�
+ return "鏈繛鎺�";
+ }
+ break;
+ }
+ }
//鏌ヨ璁惧鐨凷D鍗＄姸鎬�
function searchDevSDState(){
arrTd1=new Array();
@@ -278,7 +309,7 @@
success: function(result) {
//console.info(result);
var rs = JSON.parse(result.result);
- //console.info(rs);
+ console.info(rs);
var sdStatus = (rs.data == 0)?'姝ｅ父': '<span style="color: #FF0000">鏁呴殰</span>';
arrtdjifangstate .push(sdStatus);
//console.log(sdStatus);
@@ -392,12 +423,12 @@
loadclose();
//}
}else{
- noContent.showNoContent('鏌ヨ澶辫触!');
+ alert('鏌ヨ澶辫触!');
loadclose();
}
},
error: function() {
- noContent.showNoContent('鏌ヨ澶辫触!');
+ alert('鏌ヨ澶辫触!');
loadclose();
// 鍏抽棴绛夊緟
}
@@ -427,14 +458,15 @@
var temp = getCookie("batt");
var batt = JSON.parse(temp);
var data = [
- {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: batt.StationName1}, // 鐪�
- {url: 'selectcity.html' , txt:batt.StationName2},//甯�
- {url: 'selectcounty.html' , txt:batt.StationName5},
- {url: 'battM.html', txt: batt.StationName3}, // 鐢垫睜缁�
- {url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 褰撳墠椤甸潰
- {url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'}
- ];
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
+ {url: 'selectcounty.html', txt: batt.StationName5 },
+ {url: 'selectbatt.html', txt: batt.StationName3 },
+ {url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
+ {url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 褰撳墠椤甸潰
+ {url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'}
+ ];
/*var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
{url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
--
Gitblit v1.9.1