From f196bbea81977c5e0cf5906cba2609a547fd6a3b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期六, 29 十二月 2018 15:30:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 50 +++-----
gx_tieta/WebRoot/js/buildNav.js | 3
gx_tieta/WebRoot/mobil/conductanceM.html | 11 +
gx_tieta/src/global_zh_CN.properties | 7 +
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 111 +++++++-----------
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 7 +
/dev/null | 1
gx_tieta/WebRoot/mobil/batt-approved1.html | 66 ++++++++--
gx_tieta/WebRoot/batt-station-update1.jsp | 2
gx_tieta/WebRoot/mobil/voltageM.html | 27 +++-
gx_tieta/WebRoot/mobil/temperatureM.html | 9
gx_tieta/WebRoot/mobil/control.html | 6
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 10 +
gx_tieta/WebRoot/mobil/iframe/homeinfo1.html | 2
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java | 3
gx_tieta/WebRoot/mobil/internalresistanceM.html | 9
16 files changed, 177 insertions(+), 147 deletions(-)
diff --git a/gx_tieta/.gitignore b/gx_tieta/.gitignore
deleted file mode 100644
index 2d7e4dc..0000000
--- a/gx_tieta/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 83cf6db..f0e0451 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1109,3 +1109,10 @@
################### ex-battinfo.jsp ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
+
+
+################## batch-set-curr.jsp ##############################
+Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
+
+################## batt-station-update1.jsp #########################
+BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index eccb967..a2d5656 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>鏈烘埧绔欑偣鍗囩骇鍔熻兘</title>
+ <title>BTS璁惧鍗囩骇</title>
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
diff --git a/gx_tieta/WebRoot/js/buildNav.js b/gx_tieta/WebRoot/js/buildNav.js
index ba4b747..dcc5cbf 100644
--- a/gx_tieta/WebRoot/js/buildNav.js
+++ b/gx_tieta/WebRoot/js/buildNav.js
@@ -53,6 +53,7 @@
//鐢垫睜鏀剧數娴嬭瘯
{permit_item_name:'batt_test_op_permit',num:58}, //鐢垫睜鏀剧數娴嬭瘯
+ {permit_item_name:'batt_test_op_permit',num:81}, //鎵归噺鐢垫睜鏀剧數娴嬭瘯
{permit_item_name:'batt_discharge_model_permit',num:59}, //璁惧鍏呮斁鐢垫ā鍧楀弬鏁�
{permit_item_name:'batt_discharge_model_permit',num:63}, //鐢垫睜淇℃伅閰嶇疆
@@ -60,6 +61,8 @@
{permit_item_name:'batt_discharge_model_permit',num:64}, //鐢ㄦ埛瀵嗙爜閲嶇疆
{permit_item_name:'batt_discharge_model_permit',num:65}, //鐝粍绠＄悊
{permit_item_name:'batt_discharge_model_permit',num:71}, //鐢垫睜缁勯厤缁勭鐞�
+ {permit_item_name:'batt_discharge_model_permit',num:82}, //鍩虹珯瀹夎瀹℃壒
+ {permit_item_name:'batt_discharge_model_permit',num:83}, //BTS璁惧鍗囩骇
{permit_item_name:'batt_alm_param_query_permit',num:31}, // 鐢垫睜鍛婅鍙傛暟璁剧疆
{permit_item_name:'batt_alm_param_query_permit',num:66} // 璁惧鍛婅鍙傛暟璁剧疆
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 1de45c5..2ac7815 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -27,17 +27,17 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddde0!important;
+ background-color: #ddd!important;
color: #000!important;
}
.ui-btn-icon-right {
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
@@ -145,7 +145,7 @@
<input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
<tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>*鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
@@ -264,15 +264,18 @@
function battnumber(){
var selected=''
- for(var i=1;i<=temp.length;i++){
- selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';
+ console.info(temp);
+ if(temp.length>0){
+ for(var i=0;i<temp.length;i++){
+ selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';
+ }
+ return $('#newbattnum').html(selected);
}
- return $('#newbattnum').html(selected);
}
function creatBattView(index){
var count=index+1
- ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
+ ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupName+'</h1>'+
'<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/
,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>'
@@ -315,8 +318,10 @@
var arr = temp;
function setcookieCreat(i){
- var index=Math.ceil(i-1);
- arrdata = temp[index].binf;
+ console.info(temp);
+ console.info(i)
+ //var index=Math.ceil(i-1);
+ arrdata = temp[i].binf;
//console.info(index);
//console.info(temp);
console.info(arrdata);
@@ -376,7 +381,13 @@
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- installstartdata(temp);
+
+ installstartdata(temp);
+ diubao();
+ timeer = window.setTimeout(function() {
+ diubao();
+ }, 4000); //涓㈠寘鐜囷紝閫氫俊璁℃暟锛�4绉掑埛鏂�1娆°��
+ //4绉掑埛鏂颁竴娆￠〉闈�
});
function applyendyanshou(arr){ //鐢宠楠屾敹
@@ -397,7 +408,7 @@
});
}
- // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
function setFloatAndoutLine(index) {
var monvolstd = "#MonVolStd"+index;
var MonCount = "#MonCount" +index;
@@ -453,8 +464,7 @@
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
- document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
- document.getElementById("diubaonumber").value = getCookiediubao(data.StationId)
+
for(var i=0;i<temp.length;i++){
data=temp[i];
@@ -476,8 +486,15 @@
}
}
+ function diubao(){
+ if(temp.length>0){
+ data=temp[0].binf;
+ document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
+ document.getElementById("diubaonumber").value = getCookiediubao(data.StationId);
+ }
+ }
function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
- //var a = getnumber();
+ var a = getnumber();
//console.info(a);
if(getCookie("numberget")){
var number = getCookie("numberget");
@@ -493,6 +510,25 @@
}
return 0;
}
+ function getnumber(){ //鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!devCommNum',
+ data: null,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ console.info(data.data);
+ var json =JSON.stringify(data.data);
+ setCookie("numberget",json);
+ //return data.data;
+ }
+ }
+ });
+ }
+
function getCookiediubao(id){ //涓㈠寘鐜�
if(getCookie("numberget")){
var number = getCookie("numberget");
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index d4b4fb0..cd8cb34 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -26,17 +26,17 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddd38!important;
- color: #bdbdbdc4!important;
+ background-color: #ddd!important;
+ color: #000!important;
}
.ui-btn-icon-right {
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
@@ -95,8 +95,7 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <textarea id="homeName" class="unable" data-mini="true"></textarea>
</td>
</tr>
@@ -105,30 +104,18 @@
<input type="hidden" id="StationIp" data-mini="true" />
-
-
-
-
-
+
<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
+
<input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
+
<input type="hidden" id="FBSDeviceName" data-mini="true" />
-
-
-
-
-
<input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
-
-
+
<input type="hidden" id="FloatVolLevel" data-mini="true" />
-
-
-
+
<input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
-
-
<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
@@ -144,9 +131,7 @@
<label for="twentyfour">24涓�</label>
<input type="radio" name="battnum" id="twentyfour" value="24">
</fieldset>
-
-
-
+
</td>
</tr>
<tr>
@@ -181,7 +166,7 @@
<tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>*鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" data-mini="true" />
</td>
@@ -323,10 +308,6 @@
});
-
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
@@ -459,7 +440,6 @@
function getUpdateArr(){
mon=$('#MonVolStd').val();
-
var arr = new Array();
for(var i=0;i<temp.length;i++){
@@ -542,7 +522,13 @@
});
function nullOrn(){
+ console.info($("#homeName").val());
+ console.info($("#station_phone").val());
+ if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){
return true;
+ }else{
+ alert("璇峰～鍐�*鍐呭");
+ }
}
function editBatt(){//
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index b528e22..d92f858 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -33,10 +33,10 @@
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
@@ -101,29 +101,22 @@
</td>
</tr>
-
-
+
<input type="hidden" id="StationName4" data-mini="true" />
-
- <input type="hidden" id="StationIp" data-mini="true" />
-
+ <input type="hidden" id="StationIp" data-mini="true" />
<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
+
<input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
+
<input type="hidden" id="FBSDeviceName" data-mini="true" />
-
<input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
-
<input type="hidden" id="FloatVolLevel" data-mini="true" />
-
-
<input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
-
-
<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
@@ -161,7 +154,9 @@
</tr> -->
<input type="hidden" id="MonResStd" data-mini="true" />
+
<input type="hidden" id="MonSerStd" data-mini="true" />
+
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
<tr>
@@ -182,6 +177,7 @@
</tr>
<input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01 00:00:00" />
+
<input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01 00:00:00" />
<tr>
@@ -234,20 +230,10 @@
,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
'<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+'id='+'battproducer'+index+'>'
,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
- ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
-
-
-
-
-
-
-
+ ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>'
- ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
-
-
-
+ ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'
,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+'>'+creatMonCapOpt()+'</select>'
@@ -267,25 +253,25 @@
function selectedIndex(index){
var selected='',
i=0;
- selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
- selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
- selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>';
- selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>';
- selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>';
- selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>';
- selected+= '<option '+'value='+'绉戝＋杈�'+'>'+'绉戝＋杈�'+'</option>';
- selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>';
- selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>';
- selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>';
- selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>';
- selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>';
- selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>';
- selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
- selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>';
- selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
- selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
- selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
- selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
+ selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
+ selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</option>';
+ selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>';
+ selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>';
+ selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>';
+ selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>';
+ selected+= '<option '+'value='+'绉戝＋杈�'+'>'+'绉戝＋杈�'+'</option>';
+ selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>';
+ selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>';
+ selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>';
+ selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>';
+ selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>';
+ selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>';
+ selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+ selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>';
+ selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+ selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
+ selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
+ selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
return selected;
}
var temp = getCookie("eleparm");
@@ -582,7 +568,6 @@
//setFloatAndoutLine();
}
-
function getUpdateArr(){
mon=$('#MonVolStd').val();
var moncount = 0;
@@ -674,13 +659,13 @@
});
function nullOrn(){
- // if($("#BattFloatCurrent").val()&&$("#MonCapStd").val()){
- return true;
- //}else{
- //alert("*椤逛负蹇呭～椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆");
- //return false;
- // }
-
+ console.info($("#homeName").val());
+ console.info($("#station_phone").val());
+ if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){
+ return true;
+ }else{
+ alert("璇峰～鍐�*鍐呭");
+ }
}
function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
@@ -709,24 +694,14 @@
- function creatMonCapOpt(suoyin){
-
- var k,optionStr='',allString;
-
+ function creatMonCapOpt(suoyin){
+ var k,optionStr='',allString
for(var i=1;i<11;i++){
-
- k=i*50;
-
+ k=i*50;
//optionStr+='<option'+' value='+k+'>'+k+'</option>';
optionStr+='<option'+' value='+k+'>'+k+'</option>';
-
-
-
}
return allString=optionStr+'<option'+' selected = selected '+' value='+1000+'>'+1000+'</option>';
-
-
-
}
function getRadioValue(na){
@@ -748,8 +723,7 @@
if($(this).find("option:selected").val()==4){$(vol).val(12);}
if($(this).find("option:selected").val()==24){$(vol).val(2);}
})
- })(u)
-
+ })(u)
}
}
setchangedMonVolStd(suoyin);
@@ -757,8 +731,7 @@
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
$(s).val(12);
- }
-
+ }
}
/* 鎿嶄綔鎴愬姛
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index bbf408b..e3af823 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -26,17 +26,17 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddde0!important;
+ background-color: #ddd!important;
color: #000!important;
}
.ui-btn-icon-right {
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
@@ -241,8 +241,9 @@
});
}
function creatBattView(index){
+ if(temp.length>0){
var count=index+1
- ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
+ ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupNamet+'</h1>'+
'<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/
,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>'
@@ -257,6 +258,7 @@
,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>'
,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName;
+ }
}
function selectedNum(index){
var selected='';
diff --git a/gx_tieta/WebRoot/mobil/conductanceM.html b/gx_tieta/WebRoot/mobil/conductanceM.html
index 735eeb4..5203883 100644
--- a/gx_tieta/WebRoot/mobil/conductanceM.html
+++ b/gx_tieta/WebRoot/mobil/conductanceM.html
@@ -65,7 +65,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
- <h1>鐢靛</h1>
+ <h1 id="biaoti">鐢靛</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style="padding-bottom:-0.7em; padding-top:-0.7em;" >
<h1 id="alwaysRight">鏇村</h1>
<div class="clear" ></div>
@@ -89,9 +89,9 @@
<div data-role="main" class="ui-content">
<div class="ui-grid-b">
- <div class="ui-block-a">MAX <span class="max"> </span></div>
- <div class="ui-block-b">MIN <span class="min"> </span></div>
- <div class="ui-block-c">AVG <span class="avg"> </span></div>
+ <div class="ui-block-a">鏈�澶у�� <span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏忓�� <span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎鍊� <span class="avg"> </span></div>
</div>
<table data-role="table" class="ui-responsive" data-mode="">
<thead>
@@ -145,7 +145,8 @@
function findtmp(){
var temp=getCookie("batt");
if(temp.length>0){
- var batt=eval("("+temp+")");
+ var batt=eval("("+temp+")");
+ $("#biaoti").text("鐢靛("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
async: true,
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index f7861fb..ec9d6b4 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -19,7 +19,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a id= "return" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
- <h1>瀹炴椂鈥旀娴嬫暟鎹�</h1>
+ <h1 id="biaoti">瀹炴椂鈥旀娴嬫暟鎹�</h1>
</div>
<div data-role="content">
@@ -46,7 +46,7 @@
</li> -->
</ul>
<div data-role="collapsible" data-collapsed="false">
- <h1>鐢垫睜缁勭姸鎬�</h1>
+ <h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
<div class="tbl-container"></div>
</div>
</div>
@@ -151,7 +151,7 @@
}else{
arrTd.push("------");
}
-
+ $("#zhuangtai").find("a").text("鐢垫睜缁勭姸鎬�("+batt.BattGroupName+")");
createTbl(tbl, arrTh, arrTd);
window.clearTimeout(timeer);
timeer = window.setTimeout(function() {
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index c6baa45..630c67d 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -109,7 +109,7 @@
</div>
</div>
<div class="layui-col-12 t-align-right mrt5">
- <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
+ <span style="color: #FF0000;" class="mrr4">璇蜂笂浼犲井淇℃媿鎽勭殑瑙嗛</span><button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
</div>
</div>
</div>
diff --git a/gx_tieta/WebRoot/mobil/internalresistanceM.html b/gx_tieta/WebRoot/mobil/internalresistanceM.html
index 5e21664..5b9f00e 100644
--- a/gx_tieta/WebRoot/mobil/internalresistanceM.html
+++ b/gx_tieta/WebRoot/mobil/internalresistanceM.html
@@ -56,7 +56,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
- <h1>鍐呴樆</h1>
+ <h1 id="biaoti">鍐呴樆</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style="padding-bottom:-0.7em; padding-top:-0.7em;" >
<h1 id="alwaysRight">鏇村</h1>
@@ -81,9 +81,9 @@
<div data-role="main" class="ui-content">
<div class="ui-grid-b">
- <div class="ui-block-a">MAX <span class="max"> </span></div>
- <div class="ui-block-b">MIN <span class="min"> </span></div>
- <div class="ui-block-c">AVG <span class="avg"> </span></div>
+ <div class="ui-block-a">鏈�澶у�� <span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏忓�� <span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎鍊� <span class="avg"> </span></div>
</div>
<table data-role="table" data-mode="" class="ui-responsive" id="myTable">
<thead>
@@ -138,6 +138,7 @@
if(temp.length>0){
var batt=eval("("+temp+")");
//console.info(batt);
+ $("#biaoti").text("鍐呴樆("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
async: true,
diff --git a/gx_tieta/WebRoot/mobil/temperatureM.html b/gx_tieta/WebRoot/mobil/temperatureM.html
index de82ea2..902b561 100644
--- a/gx_tieta/WebRoot/mobil/temperatureM.html
+++ b/gx_tieta/WebRoot/mobil/temperatureM.html
@@ -56,7 +56,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
- <h1>娓╁害</h1>
+ <h1 id="biaoti">娓╁害</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style="padding-bottom:-0.7em; padding-top:-0.7em;" >
<h1 id="alwaysRight">鏇村</h1>
<h1 class="full-width">
@@ -79,9 +79,9 @@
<div data-role="main" class="ui-content">
<div class="ui-grid-b">
- <div class="ui-block-a">MAX <span class="max"> </span></div>
- <div class="ui-block-b">MIN <span class="min"> </span></div>
- <div class="ui-block-c">AVG <span class="avg"> </span></div>
+ <div class="ui-block-a">鏈�澶у�� <span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏忓�� <span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎鍊� <span class="avg"> </span></div>
</div>
<table data-role="table" class="ui-responsive" data-mode="">
<thead>
@@ -171,6 +171,7 @@
if(temp.length>0){
var batt=eval("("+temp+")");
//console.info(batt);
+ $("#biaoti").text("娓╁害("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
async: true,
diff --git a/gx_tieta/WebRoot/mobil/voltageM.html b/gx_tieta/WebRoot/mobil/voltageM.html
index d2cb3e5..72c6133 100644
--- a/gx_tieta/WebRoot/mobil/voltageM.html
+++ b/gx_tieta/WebRoot/mobil/voltageM.html
@@ -49,6 +49,13 @@
height:1px;
clear:both;
}
+ .ui-grid-c>.ui-block-a, .ui-grid-c>.ui-block-b, .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {
+ width: 20%;
+ font-size: 0.9em;
+ }
+ .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {
+ width:30%;
+ }
</style>
@@ -57,7 +64,7 @@
<div data-role="page">
<div data-role="header" data-position="fixed">
<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
- <h1>鐢靛帇</h1>
+ <h1 id="biaoti">鐢靛帇</h1>
<div data-role="collapsible" data-type="horizontal" class="ui-btn-right" style="padding-bottom:-0.7em; padding-top:-0.7em;" >
<h1 id="alwaysRight">鏇村</h1>
@@ -80,10 +87,11 @@
</div>
<div data-role="main" class="ui-content">
- <div class="ui-grid-b">
- <div class="ui-block-a">MAX <span class="max"> </span></div>
- <div class="ui-block-b">MIN <span class="min"> </span></div>
- <div class="ui-block-c">AVG <span class="avg"> </span></div>
+ <div class="ui-grid-c">
+ <div class="ui-block-a">鏈�澶у��<span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏忓��<span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎鍊�<span class="avg"> </span></div>
+ <div class="ui-block-d">绱姞鍜�<span class="leijiasum"> </span></div>
</div>
<table data-role="table" data-mode="" class="ui-responsive" id="myTable">
<thead>
@@ -135,8 +143,10 @@
function findtmp(){
var temp=getCookie("batt");
+ console.info(temp);
if(temp.length>0){
var batt=eval("("+temp+")");
+ $("#biaoti").text("鐢靛帇("+batt.BattGroupName+")");//鏍囬娣诲姞鐢垫睜缁勭紪鍙�
//console.info(batt);
$.ajax({
url : "Batt_rtdataAction_serchByCondition",
@@ -215,6 +225,7 @@
function createCount(datas){
var temp=new Array();
var sum=0;
+ console.info(datas);
for(var i=0;i<datas.length;i++){
temp.push((datas[i].mon_vol).toFixed(3));
sum+=parseFloat(temp[i]);
@@ -222,11 +233,11 @@
var max=Math.max.apply(null, temp);
var min=Math.min.apply(null, temp);
var avg=(sum/temp.length).toFixed(3);
-
-
+ sum=(sum).toFixed(2);
$(".max").text(max+'V');
$(".min").text(min+'V');
- $(".avg").text(avg+'V');
+ $(".avg").text(avg+'V');
+ $(".leijiasum").text(sum+'V');
}
function isMax(datas,flag){
diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index d26e059..edf71b6 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -77,6 +77,7 @@
{"taskchange_query_permit","37"}, //浣滀笟鍙樻洿鏌ヨ
{"batt_test_op_permit","58"}, //鐢垫睜鏀剧數娴嬭瘯
+ {"batt_test_op_permit","81"}, //鎵归噺鐢垫睜鏀剧數娴嬭瘯
//瓒呯骇绠＄悊鍛樼晫闈�
{"batt_discharge_model_permit","59"}, //璁惧鍏呮斁鐢垫ā鍧楀弬鏁�
@@ -85,6 +86,8 @@
{"batt_discharge_model_permit","64"}, //鐢ㄦ埛瀵嗙爜閲嶇疆
{"batt_discharge_model_permit","65"}, //鐝粍绠＄悊
{"batt_discharge_model_permit","71"}, //鐢垫睜缁勯厤缁勭鐞�
+ {"batt_discharge_model_permit","82"}, //鍩虹珯瀹夎瀹℃壒
+ {"batt_discharge_model_permit","83"}, //BTS璁惧鍗囩骇
{"batt_alm_param_query_permit","31"}, //鍛婅鍙傛暟璁剧疆
{"batt_alm_param_query_permit","66"}, //璁惧鍛婅鍙傛暟璁剧疆
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 83cf6db..f0e0451 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1109,3 +1109,10 @@
################### ex-battinfo.jsp ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
+
+
+################## batch-set-curr.jsp ##############################
+Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
+
+################## batt-station-update1.jsp #########################
+BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
\ No newline at end of file
--
Gitblit v1.9.1