From de072c451bdf8b49efea074e86d129e043e9df6b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 08:50:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 48 +++
gx_tieta/WebRoot/bat-set-test.jsp | 6
gx_tieta/WebRoot/js/buildNav.js | 4
gx_tieta/WebRoot/mobil/batt-approved.html | 4
gx_tieta/src/global_zh_CN.properties | 3
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 39 ++
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 3
gx_tieta/WebRoot/batt-apprvedAccept-index.html | 233 ++++++++++++++++
gx_tieta/WebRoot/mobil/batt-unapproved-index.html | 51 +++
gx_tieta/WebRoot/batch-set-curr.jsp | 6
gx_tieta/WebRoot/mobil/batt-approved1.html | 2
gx_tieta/WebRoot/power.jsp | 61 ++++
gx_tieta/WebRoot/mobil/approvalBatt.html | 10
gx_tieta/WebRoot/mobil/index.html | 3
gx_tieta/WebRoot/mobil/checkAccept-index.html | 39 ++
gx_tieta/WebRoot/mobil/batt-approve-index.html | 81 ++++-
gx_tieta/WebRoot/mobil/approvalBatt-index.html | 233 ++++++++++++++++
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 3
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java | 2
19 files changed, 776 insertions(+), 55 deletions(-)
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 eb58994..49e5d5f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1111,7 +1111,8 @@
################### ex-battinfo.jsp ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
-
+Audit = \u5ba1\u6838
+Acceptance = \u9a8c\u6536
################## batch-set-curr.jsp ##############################
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index c633f5f..9768896 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -707,15 +707,15 @@
// 澶勭悊娣诲姞鏈烘埧淇℃伅鐨勭粨鏋�
function formatSearchData(data) {
+ console.log(data);
var rs = [];
// 閬嶅巻data鐨�
for(var i=0; i<data.length; i++) {
var _data = data[i];
- if(!_data.obj) {
- continue;
- }
+
var obj = _data.obj[0];
var tmp = {};
+ tmp.num = _data.num; // 鍒ゆ柇鏄惁璇诲彇鎴愬姛
tmp.key_id = i;
tmp.dev_id = obj.dev_id; // 璁惧ID
tmp.dev_ip = obj.dev_ip; // 璁惧IP
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 5e5e0ec..3f3015e 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -813,9 +813,11 @@
}
var trIndex = getSetCurrIndex(data, tOptions.data);
+ //console.log(trIndex);
// 琚缃弬鏁扮殑鏈烘埧
for(var i=0; i<trIndex.length; i++) {
var _data = data[i];
+ console.log(_data);
var _trIndex = trIndex[i];
var _temp = {'doThings':''};
if(_data.num==1) {
@@ -1059,12 +1061,14 @@
for(var i=0; i<setData.length; i++) {
var _setData = setData[i];
var setDevId = _setData.dev_id;
+ //console.log(setDevId);
// 閬嶅巻allData
for(var k=0; k<allData.length; k++) {
- var _allData = allData[i];
+ var _allData = allData[k];
var allDevId = _allData.FBSDeviceId;
if(setDevId == allDevId) {
rs.push(k);
+ break;
}
}
diff --git a/gx_tieta/WebRoot/batt-apprvedAccept-index.html b/gx_tieta/WebRoot/batt-apprvedAccept-index.html
new file mode 100644
index 0000000..2f693f9
--- /dev/null
+++ b/gx_tieta/WebRoot/batt-apprvedAccept-index.html
@@ -0,0 +1,233 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title></title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+ <body>
+ <div data-role="page" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="index.html" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <h1>寰呭鎵瑰垪琛�</h1>
+ </div>
+
+ <div data-role="content">
+ <ul class="breadcrumb"></ul>
+ <div id="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-content">
+ <div class="set-option">
+ <p>璇疯缃寘鏈虹粍</p>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div data-role="footer" data-position="fixed">
+ <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+ </div>
+ </div>
+ </body>
+ <script type="text/javascript" src="js/battNav.js"></script>
+ <script type="text/javascript">
+ var stationlist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("station",null);
+ setCookie("batt",null);
+ searchBattLife();
+ });
+
+ // 鐐瑰嚮鏈烘埧浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ console.info(aLi);
+ station = getbatt(stationlist,aLi);
+ var arr=setarrbatt(arrdata,station);
+ console.info(arr);
+ window.location.href="batt-approved1.html";
+ });
+ });
+
+ var arrTd = new Array();
+ var arrdata = new Array();
+
+ var Page = {
+ pageSize:20, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+
+ function getcreatArr(){
+ obj = {
+ apply_en :0,
+ check_en:100,
+ binf : {
+ page:Page,
+ }
+ }
+ return obj;
+ }
+ // 鏌ヨ鍐呭
+ function searchBattLife(){
+ var temp = JSON.stringify(getcreatArr());
+ console.info(temp);
+ arrTd = new Array();
+ var index = 0;
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!serchByCondition',
+ data: "json="+temp,
+ dataType: 'json',
+ success:function(data) {
+ console.info(data);
+ data = JSON.parse(data.result);
+ if(data.code!=0&&data.data.length>0){
+ data=data.data
+ var model = new Array();
+ console.info(data);
+ for(var i=0;i<data.length;i++){
+ if(data[i].check_en!=1){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
+ if(model.length==0){
+ model.push(data[i].binf.StationName);
+ }else{
+ if(model[model.length-1]!=data[i].binf.StationName){//鑻ヤ笉閲嶅锛屽垯PUSH杩涘幓
+ model.push(data[i].binf.StationName);
+ }
+ }
+ console.info(model);
+ stationlist=model;
+ }
+ }
+ createUl($('#battList'),model);
+ }
+ }
+ });
+ }
+
+ function setarrbatt(arrdata,station){
+ console.info(arrdata);
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ var arr= creatYanshouObj(arrdata,station);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
+ function creatYanshouObj(arrdata,station){ //閫氳繃鐐瑰嚮鏈烘埧淇℃伅锛坰tationid锛夛紝鑾峰彇璇ユ満鎴跨數姹犵粍
+ //var StationId = arrdata[index].binf.StationId;
+ //console.info(StationId);
+ var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+ console.info(station);
+ console.info(arrdata);
+ for(var i=0;i<arrdata.length;i++){//涓�娆￠獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+ if(station == arrdata[i].binf.StationName){
+ var obj = {
+ num :arrdata[i].num,
+ check_en:arrdata[i].check_en,
+ binf:{
+ StationId : arrdata[i].binf.StationId, // 鏈烘埧缂栧彿
+ StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :arrdata[i].binf.StationName1, // 鐪�
+ StationName2 : arrdata[i].binf.StationName2, // 甯�
+ StationName5 : arrdata[i].binf.StationName5, // 鍖�/鍘�
+ StationName3 : arrdata[i].binf.StationName3, // 鏈烘埧鍚嶇О
+ StationName4 : arrdata[i].binf.StationName4, // 璁惧鍚嶇О
+ StationIp :arrdata[i].binf.StationIp, //鏈烘埧ip
+ FBSDeviceId : arrdata[i].binf.FBSDeviceId, //璁惧id
+ FbsDeviceIp : arrdata[i].binf.FbsDeviceIp, //璁惧ip
+ FbsDeviceIp_YM : arrdata[i].binf.FbsDeviceIp_YM, // 璁惧鎺╃爜
+ FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG , // 缃戝叧
+ FBSDeviceName : arrdata[i].binf.FBSDeviceName, //璁惧鍚嶇О
+ GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice, //fbs璁惧绱㈠紩
+ BattGroupId : arrdata[i].binf.BattGroupId, //鐢垫睜缁刬d
+ BattGroupNum : arrdata[i].binf.BattGroupNum , //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName :arrdata[i].binf.BattGroupName, //鐢垫睜缁勭储寮�
+ FloatVolLevel : arrdata[i].binf.FloatVolLevel, //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : arrdata[i].binf.OfflineVolLevel, //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : arrdata[i].binf.BattFloatCurrent, //娴厖鐢垫祦闃�鍊�
+ MonCount : arrdata[i].binf.MonCount, //鍗曚綋鏁伴噺
+ MonCapStd : arrdata[i].binf.MonCapStd, //鏍囩О瀹归噺
+ MonVolStd : arrdata[i].binf.MonVolStd, //鏍囩О鐢靛帇
+ MonResStd : arrdata[i].binf.MonResStd, //鏍囩О鍐呴樆
+ MonSerStd : arrdata[i].binf.MonSerStd, //鏍囩О鐢靛
+ MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg, //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : arrdata[i].binf.Load_curr, //璐熻浇鐢垫祦
+ DisCurrMax : arrdata[i].binf.DisCurrMax, //鏈�澶ф牳瀹圭數娴�
+ station_phone : arrdata[i].binf.station_phone, //鍩虹珯鍙风爜
+
+ BattProducer : arrdata[i].binf.BattProducer, //鐢垫睜鍝佺墝
+ BattModel : arrdata[i].binf.BattModel, //鐢垫睜鍨嬪彿
+ BattProductDate : arrdata[i].binf.BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].binf.BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
+ install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳
+ }
+
+ }
+ arr.push(obj);
+ }
+ }
+ console.info(arr);
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ var json=window.JSON.stringify(arr);
+ setCookie("eleparm1",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ return arr;
+ }
+
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑ul
+ ulCon.find('ul').remove();
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刡att
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index a17b80b..4eac20f 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -139,6 +139,13 @@
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
+ var permits;
+ <% Object obj=session.getAttribute("permits");
+ if(obj!=null){
+ String permits =obj.toString(); %>
+ permits=<%=permits%>;
+ //console.info(json);
+ <% } %>
layui.use(['form', 'table', 'layer', 'element'], function() {
/* 椤甸潰瀵煎叆layui妯″潡 */
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
@@ -248,6 +255,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ // 妫�娴嬫槸鍚﹀彲浠ュ鏍告潈闄�
+ var apprPermit = isHasPermit('install_appr_permit', permits);
+ changeApprTbl(apprPermit, tOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptOptions = {
@@ -310,6 +320,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 妫�娴嬮獙鏀剁殑鏉冮檺
+ var checkPermit = isHasPermit('install_check_permit', permits);
+ changeCheckTbl(checkPermit, acceptOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptedOptions = {
@@ -663,9 +676,10 @@
}
// 鏇存柊瀹℃煡琛ㄦ牸
+ var updateSearchTimer;
function updateSearch() {
var temp = createSearchParam();
- clearInterval(updateSearch.timer);
+ clearInterval(updateSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -686,8 +700,8 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = formaterResData(_data);
+ resData.push(_tmp);
if(_data.apply_note &&_data.apply_note != Page.all) {
- resData.push(_tmp);
Page.setAll(_data.apply_note);
isUpdateTbl = true;
}
@@ -704,7 +718,7 @@
}
// console.log(456);
// 瀹炴椂鍥炶皟
- updateSearch.timer = setTimeout(updateSearch, 4000);
+ updateSearchTimer = setTimeout(updateSearch, 4000);
}
});
}
@@ -824,9 +838,10 @@
}
// 鏇存柊楠屾敹琛ㄦ牸
+ var updateAcceptSearchTimer;
function updateAcceptSearch() {
var temp = acceptSearchParam();
- clearInterval(updateAcceptSearch.timer);
+ clearInterval(updateAcceptSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -850,7 +865,7 @@
}else {
acceptPage.setAll(0);
}
-
+ layuiTbl.setCache(table.cache.acceptTbl);
// 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
for(var i=0; i<resData.length; i++) {
var _resData = resData[i];
@@ -859,7 +874,7 @@
}
//console.log(123);
// 瀹炴椂鍥炶皟
- updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
+ updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
}
});
}
@@ -898,6 +913,27 @@
return num;
}
+
+ // 淇敼瀹℃壒琛ㄦ牸鏍峰紡
+ function changeApprTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ col.length = col.length-1;
+ }
+ }
+
+ // 淇敼楠屾敹琛ㄦ牸鏍峰紡
+ function changeCheckTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ doThings.width = 200;
+ doThings.toolbar = '#acceptedBattGroupTools';
+ }
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/js/buildNav.js b/gx_tieta/WebRoot/js/buildNav.js
index fa2f490..aa37cb8 100644
--- a/gx_tieta/WebRoot/js/buildNav.js
+++ b/gx_tieta/WebRoot/js/buildNav.js
@@ -61,7 +61,7 @@
{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:'install_look_permit',num:82}, //鍩虹珯瀹夎瀹℃壒
{permit_item_name:'batt_discharge_model_permit',num:83}, //BTS璁惧鍗囩骇
{permit_item_name:'batt_alm_param_query_permit',num:31}, // 鐢垫睜鍛婅鍙傛暟璁剧疆
@@ -76,7 +76,7 @@
'server_param_query_permit','batt_alm_query_permit',
'dev_alm_query_permit','battfault_query_permit','usrtaskcheck_query_permit',
'taskchange_query_permit','batt_discharge_model_permit',
- 'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit'
+ 'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit'
];
diff --git a/gx_tieta/WebRoot/mobil/approvalBatt-index.html b/gx_tieta/WebRoot/mobil/approvalBatt-index.html
new file mode 100644
index 0000000..71f126e
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/approvalBatt-index.html
@@ -0,0 +1,233 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title></title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+ <body>
+ <div data-role="page" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="index.html" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <h1>宸插鎵归�氳繃鏈烘埧鍒楄〃</h1>
+ </div>
+
+ <div data-role="content">
+ <ul class="breadcrumb"></ul>
+ <div id="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-content">
+ <div class="set-option">
+ <p>璇疯缃寘鏈虹粍</p>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div data-role="footer" data-position="fixed">
+ <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+ </div>
+ </div>
+ </body>
+ <script type="text/javascript" src="js/battNav.js"></script>
+ <script type="text/javascript">
+ var stationlist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("station",null);
+ setCookie("batt",null);
+ searchBattLife();
+
+ });
+
+ // 鐐瑰嚮鏈烘埧浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ console.info(aLi);
+ station = getbatt(stationlist,aLi);
+ var arr=setarrbatt(arrdata,station);
+ console.info(arr);
+ window.location.href="batt-approved1.html";
+ });
+ });
+
+ var arrTd = new Array();
+ var arrdata = new Array();
+
+ var Page = {
+ pageSize:20, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+
+ function getcreatArr(){
+ obj = {
+ apply_en : 1,
+ binf : {
+ page:Page,
+ }
+ }
+ return obj;
+ }
+
+ // 鏌ヨ鍐呭
+ function searchBattLife(){
+ var temp = JSON.stringify(getcreatArr());
+ console.info(temp);
+ arrTd = new Array();
+ var index = 0;
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!serchByInfo',
+ data: "json="+temp,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ if(data.code!=0&&data.data.length>0){
+ data=data.data
+ var model = new Array();
+ console.info(data);
+ for(var i=0;i<data.length;i++){
+ if(data[i].check_en!=1){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
+ if(model.length==0){
+ model.push(data[i].binf.StationName);
+ }else{
+ if(model[model.length-1]!=data[i].binf.StationName){//鑻ヤ笉閲嶅锛屽垯PUSH杩涘幓
+ model.push(data[i].binf.StationName);
+ }
+ }
+ console.info(model);
+ stationlist=model;
+ }
+ }
+ createUl($('#battList'),model);
+ }
+ }
+ });
+ }
+
+ function setarrbatt(arrdata,station){
+ console.info(arrdata);
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ var arr= creatYanshouObj(arrdata,station);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
+ function creatYanshouObj(arrdata,station){ //閫氳繃鐐瑰嚮鏈烘埧淇℃伅锛坰tationid锛夛紝鑾峰彇璇ユ満鎴跨數姹犵粍
+ //var StationId = arrdata[index].binf.StationId;
+ //console.info(StationId);
+ var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+ console.info(station);
+ console.info(arrdata);
+ for(var i=0;i<arrdata.length;i++){//涓�娆￠獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+ if(station == arrdata[i].binf.StationName){
+ var obj = {
+ num :arrdata[i].num,
+ check_en:arrdata[i].check_en,
+ binf:{
+ StationId : arrdata[i].binf.StationId, // 鏈烘埧缂栧彿
+ StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :arrdata[i].binf.StationName1, // 鐪�
+ StationName2 : arrdata[i].binf.StationName2, // 甯�
+ StationName5 : arrdata[i].binf.StationName5, // 鍖�/鍘�
+ StationName3 : arrdata[i].binf.StationName3, // 鏈烘埧鍚嶇О
+ StationName4 : arrdata[i].binf.StationName4, // 璁惧鍚嶇О
+ StationIp :arrdata[i].binf.StationIp, //鏈烘埧ip
+ FBSDeviceId : arrdata[i].binf.FBSDeviceId, //璁惧id
+ FbsDeviceIp : arrdata[i].binf.FbsDeviceIp, //璁惧ip
+ FbsDeviceIp_YM : arrdata[i].binf.FbsDeviceIp_YM, // 璁惧鎺╃爜
+ FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG , // 缃戝叧
+ FBSDeviceName : arrdata[i].binf.FBSDeviceName, //璁惧鍚嶇О
+ GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice, //fbs璁惧绱㈠紩
+ BattGroupId : arrdata[i].binf.BattGroupId, //鐢垫睜缁刬d
+ BattGroupNum : arrdata[i].binf.BattGroupNum , //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName :arrdata[i].binf.BattGroupName, //鐢垫睜缁勭储寮�
+ FloatVolLevel : arrdata[i].binf.FloatVolLevel, //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : arrdata[i].binf.OfflineVolLevel, //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : arrdata[i].binf.BattFloatCurrent, //娴厖鐢垫祦闃�鍊�
+ MonCount : arrdata[i].binf.MonCount, //鍗曚綋鏁伴噺
+ MonCapStd : arrdata[i].binf.MonCapStd, //鏍囩О瀹归噺
+ MonVolStd : arrdata[i].binf.MonVolStd, //鏍囩О鐢靛帇
+ MonResStd : arrdata[i].binf.MonResStd, //鏍囩О鍐呴樆
+ MonSerStd : arrdata[i].binf.MonSerStd, //鏍囩О鐢靛
+ MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg, //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : arrdata[i].binf.Load_curr, //璐熻浇鐢垫祦
+ DisCurrMax : arrdata[i].binf.DisCurrMax, //鏈�澶ф牳瀹圭數娴�
+ station_phone : arrdata[i].binf.station_phone, //鍩虹珯鍙风爜
+
+ BattProducer : arrdata[i].binf.BattProducer, //鐢垫睜鍝佺墝
+ BattModel : arrdata[i].binf.BattModel, //鐢垫睜鍨嬪彿
+ BattProductDate : arrdata[i].binf.BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].binf.BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
+ install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳
+ }
+
+ }
+ arr.push(obj);
+ }
+ }
+ console.info(arr);
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ var json=window.JSON.stringify(arr);
+ setCookie("eleparm1",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ return arr;
+ }
+
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑ul
+ ulCon.find('ul').remove();
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刡att
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/approvalBatt.html b/gx_tieta/WebRoot/mobil/approvalBatt.html
new file mode 100644
index 0000000..81a57b4
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/approvalBatt.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index 1c493a4..d3efff4 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -45,6 +45,16 @@
</div>
</div>
</body>
+ <div data-role="main" class="ui-content">
+ <div class="tbl-container"></div>
+ </div>
+ <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+ <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+ <script type="text/javascript" src="js/tbl.js"></script>
+ <script type="text/javascript" src="js/panel.js"></script>
+ <script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
var stationlist = new Array();
@@ -54,7 +64,7 @@
setCookie("station",null);
setCookie("batt",null);
searchBattLife();
- getnumber();//鏌ヨ鎵�鏈夌殑閫氳鎶�鏈苟鏀惧叆缂撳瓨銆�
+
});
// 鐐瑰嚮鏈烘埧浜嬩欢
@@ -70,6 +80,24 @@
});
});
+ // 鐩戞祴椤甸潰婊氬姩鍒版枃妗ｇ殑搴曢儴
+ $(document).on('scrollstop', function() {
+ var tblCont = $('.tbl-container');
+ var loading = $('.ui-loading');
+ var scrollTop = $(this).scrollTop();
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ //console.info(pageNum);
+ if(loading.length == 0 ) {
+ var winHt = $(window).height();
+ var docHt = $(this).height();
+ var shiftHt = docHt - winHt;
+ if(shiftHt < scrollTop || shiftHt == scrollTop) {
+ Page.pageCurr++;
+ searchBattLife();
+ }
+ }
+ });
+
var arrTd = new Array();
var arrdata = new Array();
@@ -82,30 +110,14 @@
function getcreatArr(){
obj = {
apply_en : 1,
+ check_en:0,
binf : {
page:Page,
}
}
return obj;
}
- 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 searchBattLife(){
var temp = JSON.stringify(getcreatArr());
@@ -119,13 +131,14 @@
data: "json="+temp,
dataType: 'json',
success:function(data) {
+ console.info(data);
data = JSON.parse(data.result);
if(data.code!=0&&data.data.length>0){
data=data.data
var model = new Array();
console.info(data);
for(var i=0;i<data.length;i++){
- if(data[i].check_en!=1){
+ //if(data[i].check_en!=1){
arrdata.push(data[i]);//瀛樺偍鏁版嵁
if(model.length==0){
model.push(data[i].binf.StationName);
@@ -136,9 +149,13 @@
}
console.info(model);
stationlist=model;
- }
+ // }
+ }
+ if(Page.pageCurr==1){
+ createUl($('#battList'),model);
+ }else{
+ addUl($('#battList'),model);
}
- createUl($('#battList'),model);
}
}
});
@@ -237,6 +254,26 @@
ulCon.append(_ul).trigger('create');
loadclose();
}
+ function addUl(ulCon, dataList) {
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
//鑾峰彇褰撳墠閫変腑鐨刡att
function getbatt(arr,index){
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index e4333e5..f39a91b 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -269,8 +269,8 @@
if(id == number[i].dev_id){
var errorCount = number[i].dev_errcommcount;
var allCount = number[i].dev_commcount+errorCount;
- var parcent = (allCount==0?0:errCount/allCount*100)
- return parcent;
+ //var parcent = (allCount==0?0:errCount/allCount*100)
+ //return parcent;
}
}
}
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index f0dc700..66cf1d5 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -89,7 +89,7 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" class="unable" data-mini="true">
+ <textarea id="homeName" class="unable" data-mini="true"></textarea>
</td>
</tr>
<tr>
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 20a59c3..1e55d78 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -41,6 +41,7 @@
.ui-select .ui-btn select{
width:77%;
}
+ table tr td{width:1000em;padding-right:1em;}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -97,8 +98,7 @@
<tr>
<td>*鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <textarea id="homeName" data-mini="true"></textarea>
</td>
</tr>
@@ -174,6 +174,7 @@
</tr>
<input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="judgeBatt" data-mini="true" />
<tr>
@@ -415,9 +416,6 @@
$(function () {
- //setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
//creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
installstartdata(temp);
});
@@ -651,12 +649,10 @@
$("#sure").click(function(){
if(nullOrn()){
creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBattnew(); //鎻愪氦
-
+ JudegeBattIn();//鎻愪氦鍓嶉獙璇佽鐢垫睜缁勫湪BATTINF琛ㄤ腑鏄惁宸插瓨鍦�
+ //addBattnew(); //鎻愪氦
}else{
} //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
- //function backpage(){window.location.href="ele-param1.html";}
- // setTimeout(backpage,500);
});
$("#cancel").click(function(){
window.location.href="ele-param2.html";
@@ -673,8 +669,31 @@
}
}
+ function JudegeBattIn(){
+ var battinff ={
+ StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ }
+ console.info(battinff);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: '../BattInfAction!judgeBatt',
+ data: "json="+JSON.stringify(battinff),
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ console.info(data);
+ if(data.code!=1){
+ addBattnew()
+ }else{
+ alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖涓婁竴椤垫悳绱㈡淇敼");
+ }
+ }
+ });
+ }
+
function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
- console.info(getUpdateArr());
+ console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 95a4e56..5bd23af 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -92,8 +92,7 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" class="unable" class="unable" id="homeName" data-mini="true">
-
+ <textarea id="homeName" class="unable" data-mini="true"></textarea>
</td>
</tr>
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
index cbd6e4f..608540d 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
@@ -83,6 +83,7 @@
function getcreatArr(){
obj = {
apply_en : 0,
+ check_en:0,
binf : {
page:Page,
}
@@ -103,6 +104,7 @@
dataType: 'json',
success:function(data) {
data = JSON.parse(data.result);
+ console.info(data);
if(data.code!=0&&data.data.length>0){
data=data.data
var model = new Array();
@@ -119,13 +121,60 @@
console.info(model);
stationlist=model;
}
- createUl($('#battList'),model);
+ if(Page.pageCurr==1){
+ createUl($('#battList'),model);
+ }else{
+ addUl($('#battList'),model);
+ }
}
}
});
}
+
+ // 鐩戞祴椤甸潰婊氬姩鍒版枃妗ｇ殑搴曢儴
+ $(document).on('scrollstop', function() {
+ var tblCont = $('.tbl-container');
+ var loading = $('.ui-loading');
+ var scrollTop = $(this).scrollTop();
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ console.info(pageNum);
+ console.info(loading.length);
+ console.info(scrollTop);
+ console.info("$(window).height()"+$(window).height());
+ console.info(" $(this).height()"+ $(this).height());
+ if(loading.length == 0) {
+ var winHt = $(window).height();
+ var docHt = $(this).height();
+ var shiftHt = docHt - winHt;
+ if(shiftHt < scrollTop || shiftHt == scrollTop) {
+ Page.pageCurr++;
+ searchBattLife()
+ }
+ }
+ });
+
+ function addUl(ulCon, dataList) {
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
function setarrbatt(arrdata,station){
console.info(arrdata);
if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
diff --git a/gx_tieta/WebRoot/mobil/checkAccept-index.html b/gx_tieta/WebRoot/mobil/checkAccept-index.html
new file mode 100644
index 0000000..2dacdc9
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/checkAccept-index.html
@@ -0,0 +1,39 @@
+<!doctype html>
+ <html>
+ <head>
+ <meta charset="utf-8">
+ <title>鎵瑰噯瀹℃壒鍙婇獙鏀�</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+
+ </head>
+ <body>
+ <div data-role="page">
+ <div data-role="header" data-position="fixed">
+ <a href="index.html" 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>
+
+ </div>
+ <div data-role="content">
+ <ul data-role="listview" data-inset="true">
+ <li>
+ <a href="batt-approve-index.html" target="_top">寰呭鎵�</a>
+ </li>
+ <li>
+ <a href="batt-apprvedAccept-index.html" target="_top">寰呴獙鏀�</a>
+ </li>
+ <li>
+ <a href="batt-unapproved-index.html" target="_top">宸查獙鏀�</a>
+ </li>
+ </ul>
+
+ </div>
+ <!-- <div data-role="footer" data-position="fixed">
+ <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1>
+ </div> -->
+
+ </div>
+ </body>
+ </html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index c8217f7..75824ac 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -46,6 +46,9 @@
<li>
<a href="map.html" target="_top" data-i18n="main.usermanagement">鏈烘埧瀹氫綅</a>
</li>
+ <li>
+ <a href="checkAccept-index.html" target="_top" data-i18n="main.usermanagement">鎵瑰噯瀹℃壒鍙婇獙鏀�</a>
+ </li>
<!-- <li>
<a href="batt-home-info.html" target="_top" data-i18n="main.usermanagement">鏈烘埧淇℃伅</a>
</li> -->
diff --git a/gx_tieta/WebRoot/power.jsp b/gx_tieta/WebRoot/power.jsp
index 68ec1b3..7d24994 100644
--- a/gx_tieta/WebRoot/power.jsp
+++ b/gx_tieta/WebRoot/power.jsp
@@ -241,7 +241,7 @@
</div>
<div class="list-con">
<div class="list list1">
- <span><s:text name="Batt_configuration_information"/><s:text name="Permit"/></span> <!-- 浣滀笟鍙樻洿绠＄悊鏉冮檺 -->
+ <span><s:text name="Batt_configuration_information"/><s:text name="Permit"/></span> <!-- 鐢垫睜淇℃伅閰嶇疆鏉冮檺 -->
<table>
<tr>
<td><input type="checkbox" id="battcfg_query_permit"><s:text name="Search"/></td> <!-- 鏌ヨ -->
@@ -251,7 +251,16 @@
</tr>
</table>
</div>
-
+ <div class="list list2">
+ <span><s:text name='Approval_station_install'/><s:text name="Permit"/></span> <!-- 鍩虹珯瀹夎瀹℃壒鏉冮檺 -->
+ <table>
+ <tr>
+ <td><input type="checkbox" id="install_look_permit"><s:text name="Search"/></td> <!-- 鏌ヨ -->
+ <td><input type="checkbox" id="install_appr_permit"><s:text name="Audit"/></td> <!-- 瀹℃牳 -->
+ <td><input type="checkbox" id="install_check_permit"><s:text name="Acceptance"/></td> <!-- 楠屾敹 -->
+ </tr>
+ </table>
+ </div>
</div>
<!-- 璁剧疆褰撳墠瀹瑰櫒閬僵灞� -->
<div class="mask"></div>
@@ -1314,6 +1323,27 @@
$('#battcfg_del_permit').prop('checked',true);
}
}
+
+ //48鍩虹珯瀹夎瀹℃壒 鏌ヨ
+ if(list[i].permit_item_name == 'install_look_permit'){
+ if(list[i].permit_item_value == 1){
+ $('#install_look_permit').prop('checked',true);
+ }
+ }
+
+ //49鍩虹珯瀹夎瀹℃壒 瀹℃牳
+ if(list[i].permit_item_name == 'install_appr_permit'){
+ if(list[i].permit_item_value == 1){
+ $('#install_appr_permit').prop('checked',true);
+ }
+ }
+
+ //50绔欏畨瑁呭鎵� 楠屾敹
+ if(list[i].permit_item_name == 'install_check_permit'){
+ if(list[i].permit_item_value == 1){
+ $('#install_check_permit').prop('checked',true);
+ }
+ }
}
}
}
@@ -1811,6 +1841,33 @@
list[i].permit_item_value = 0;
}
}
+
+ //48鍩虹珯瀹夎瀹℃壒 鏌ヨ
+ if (list[i].permit_item_name == 'install_look_permit') {
+ if($('#install_look_permit').is(':checked')){
+ list[i].permit_item_value = 1;
+ }else{
+ list[i].permit_item_value = 0;
+ }
+ }
+
+ //49鍩虹珯瀹夎瀹℃壒 瀹℃牳
+ if (list[i].permit_item_name == 'install_appr_permit') {
+ if($('#install_appr_permit').is(':checked')){
+ list[i].permit_item_value = 1;
+ }else{
+ list[i].permit_item_value = 0;
+ }
+ }
+
+ //50鍩虹珯瀹夎瀹℃壒 楠屾敹
+ if (list[i].permit_item_name == 'install_check_permit') {
+ if($('#install_check_permit').is(':checked')){
+ list[i].permit_item_value = 1;
+ }else{
+ list[i].permit_item_value = 0;
+ }
+ }
}
}
}
diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index f615f85..4367b80 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -86,7 +86,7 @@
{"batt_discharge_model_permit","64"}, //鐢ㄦ埛瀵嗙爜閲嶇疆
{"batt_discharge_model_permit","65"}, //鐝粍绠＄悊
{"batt_discharge_model_permit","71"}, //鐢垫睜缁勯厤缁勭鐞�
- {"batt_discharge_model_permit","82"}, //鍩虹珯瀹夎瀹℃壒
+ {"install_look_permit","82"}, //鍩虹珯瀹夎瀹℃壒
{"batt_discharge_model_permit","83"}, //BTS璁惧鍗囩骇
{"batt_alm_param_query_permit","31"}, //鍛婅鍙傛暟璁剧疆
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index eb58994..49e5d5f 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1111,7 +1111,8 @@
################### ex-battinfo.jsp ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
-
+Audit = \u5ba1\u6838
+Acceptance = \u9a8c\u6536
################## batch-set-curr.jsp ##############################
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
--
Gitblit v1.9.1