From 07ad76ca66cc831264f2b6adbacc502ad484f283 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期五, 23 十一月 2018 15:16:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param.jsp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index cb01b6b..a176289 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -238,7 +238,7 @@
];
defaultArr = [
- '35000001','鐪�','鍩庡競', '鍖哄幙', '鏈烘埧鍚嶇О', '璁惧鍚嶇О', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9600',
+ '35000001','鐪�','鍩庡競', '鍖哄幙', '鏈烘埧鍚嶇О', '璁惧鍚嶇О', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9100',
'0', '1000001', '1', '鏂板缓鐢垫睜缁�1', '2.230', '2.150', '30', '24', '3000',
'2', '0.2', '5000', '0.05',15,0,'', '鍙岀櫥', 'GMF-3000', '2012-05-04', '2012-06-13', ''
];
@@ -452,9 +452,9 @@
var _arr = new Array();
var _tblTr = $('.tbl-body table tbody tr');
_tblTr.eq(_tblTr.length-1).find('td').each(function(i) {
- if(i == 10) {
+ if(i == 12) {
_arr.push(0);
- }else if(i == 11) {
+ }else if(i == 13) {
_arr.push(parseInt($(this).text())+1);
}else {
_arr.push($(this).text());
--
Gitblit v1.9.1