From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/ele-param.jsp | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 52ebfe6..a176289 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -19,6 +19,7 @@
<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css" media="screen">
.revise{
color: #293EF6;
@@ -212,6 +213,7 @@
<script type="text/javascript" src="js/popup.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -232,13 +234,13 @@
'<s:text name="Computer_room"/><s:text name="Number"/>', '鐪�','<s:text name="City"/>', '<s:text name="County"/>', '<s:text name="Computer_name"/>', '<s:text name="Equipment"/><s:text name="Name"/>', '<s:text name="Computer_room"/>IP', 'FBS<s:text name="Equipment"/>ID(<s:text name="Important"/>)',
'FBS<s:text name="Equipment"/>IP(<s:text name="Important"/>)','瀛愮綉鎺╃爜','缃戝叧', 'FBS<s:text name="Equipment"/><s:text name="Name"/>', 'FBS<s:text name="Batt"/><s:text name="Indexes"/>(0-3)', '<s:text name="Batt_group"/>ID', '<s:text name="Computer_room"/><s:text name="Within"/><s:text name="Batt_group"/><s:text name="Number"/>', '<s:text name="Battery_name"/>', '<s:text name="Floate_charge"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)',
'<s:text name="Offline"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)', '<s:text name="Floate_charge"/><s:text name="Current"/><s:text name="Threshold"/>(A)', '<s:text name="Monomer_All"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Nomina_voltage_monomer"/>(V)', '<s:text name="Nominal"/><s:text name="Monomer_resistance"/>(m惟)', '<s:text name="Nominal"/><s:text name="Monomer_conductance"/>',
- '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>'
+ '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>', '瀹夎浜哄憳'
];
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'
+ '2', '0.2', '5000', '0.05',15,0,'', '鍙岀櫥', 'GMF-3000', '2012-05-04', '2012-06-13', ''
];
// 鐢熸垚琛ㄦ牸
$(function() {
@@ -450,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());
@@ -586,7 +588,10 @@
container.addClass('revise-sel-active').removeClass('revise-sel');
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("BattInfAction!serchAllStation_all",null,function(data){
data=data.result;
@@ -610,10 +615,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -644,12 +653,15 @@
}
// 鏌ヨ鍖�/鍘�
- function findCounty() {
+ function findCounty(isLoad) {
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -684,26 +696,30 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findCounty();
+ findCounty(true);
});
//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#county').change(function(){
- findStationNamebyStationname1();
+ findStationNamebyStationname1(true);
});
//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
StationName5: $("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3_all","json="+JSON.stringify(tmp),function(data){
@@ -727,6 +743,9 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
+ layer.close(filterLoad);
+
searchBatt();
});
}
@@ -754,7 +773,7 @@
});
arrTd = new Array();
allData = new Array();
- loading.showLoading($('#main'));
+ var load = layer.load();
$.ajax({
type: "post",
url: "BattInfAction!searchInform",
@@ -764,7 +783,7 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code ==1){
for(var i=0;i<model.data.length;i++){
allData.push(model.data[i]);
@@ -803,6 +822,7 @@
arrTd.push(model.data[i].BattModel); //鐢垫睜鍨嬪彿
arrTd.push(model.data[i].BattProductDate.substr(0,10)); //鐢垫睜鐢熶骇鏃ユ湡
arrTd.push(model.data[i].BattInUseDate.substr(0,10)); //鎶曞叆浣跨敤鏃ユ湡
+ arrTd.push(model.data[i].install_user); // 璁惧瀹夎浜哄憳
/* arrTd.push("");
arrTd.push("");
arrTd.push(model.data[i].StationId_ex); //鎶曞叆浣跨敤鏃ユ湡 */
@@ -818,11 +838,11 @@
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
- loading.hideLoading($('#main'));
+ layer.close(load);
},
error:function(){
noContent.showNoContent("鏌ヨ澶辫触");
- loading.hideLoading($('#main'));
+ layer.close(load);
}
});
}
@@ -992,9 +1012,10 @@
obj.BattModel = $(this).find('td').eq(29).text(); //鐢垫睜鍨嬪彿
obj.BattProductDate = $(this).find('td').eq(30).text(); //鐢垫睜鐢熶骇鏃ユ湡
obj.BattInUseDate = $(this).find('td').eq(31).text(); //鐢垫睜浣跨敤鏃ユ湡
+ obj.install_user = $(this).find('td').eq(32).text(); //瀹夎浜哄憳
_arr.push(obj);
});
- //console.info(_arr);
+ console.info(_arr);
return _arr;
}
--
Gitblit v1.9.1