From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index b8d9cdf..5b58311 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -68,7 +68,7 @@
<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");
@@ -258,7 +258,8 @@
arrTd1.push(jishu);
var diubao=(data.dev_commcount==0?0:(data.dev_errcommcount*100/data.dev_commcount)).toFixed(2);
arrTd1.push(diubao);
- arrTd1.push(workstate(data.dev_workstate))
+ arrTd1.push("鐢垫睜缁�"+data.dev_testgroupnum);
+ arrTd1.push(workstate(data.dev_workstate));
createTbl(tbl1, jifangarrTh, arrTd1);
}else{
var arrTd2 = new Array();
--
Gitblit v1.9.1