From 35fd1cfc84fd97990ba86d4cbb0a6ff0c45c2d78 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.18>
Date: 星期三, 12 十二月 2018 15:47:49 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-unapproved.html | 218 ++++++++++++++++++++++++-----------------------------
1 files changed, 99 insertions(+), 119 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 03432da..1324d55 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -91,6 +91,9 @@
.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
width:35%;
}
+ .tbl-container td {
+ color: #fb0909a3;
+ }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -113,8 +116,19 @@
</table>
</div>
-
-
+ <div data-role="footer" data-position="fixed" data-theme="a">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
+ <li><a href="batt-approved.html" target="_top" data-role="button" data-icon="check" data-transition="slide">宸查�氳繃</a></li>
+ </ul>
+ </div>
+ </div>
+ <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
+ <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+ <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
+ <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
+ </div>
</div>
</div>
@@ -148,7 +162,7 @@
$("#edit").click(function(){
- window.location.href="batt-infor-conf-temp.html";
+ window.location.href="batt-infor-unapproved-edit.html";
});
$("#delete").click(function(){ //鍒犻櫎鐢垫睜缁�
var temp = getCookie("eleparm");
@@ -159,7 +173,7 @@
// window.location.href="batt-infor-conf-delete.html";
});
- var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏈�氳繃鍘熷洜'];
+ var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏈�氳繃鍘熷洜','鎿嶄綔'];
dataArr = [];
var startTime = "1980-01-01";
var endTime = new Date().format('yyyy-MM-dd');
@@ -167,136 +181,102 @@
createTbl(tbl, arrTh, dataArr);
$(document).ready(function(){
setPage();
-
- Page.pageCurr=1;
- searchBattLife();
-
+ Page.pageCurr=1;
+ searchBattLife();
});
- function setcookiedit(index){
+ function getcreatArr(){
+ obj = {
+ apply_en : 0,
+ 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
+ console.info(data);
+ for(var i=0;i<data.length;i++){
+ arrTd[index++] = data[i].binf.StationId;
+ arrTd[index++] = data[i].binf.StationName1;
+ arrTd[index++] = data[i].binf.StationName2;
+ arrTd[index++] = data[i].binf.StationName5;
+ arrTd[index++] = data[i].binf.StationName3;
+ arrTd[index++] = data[i].binf.StationName4;
+ arrTd[index++] = data[i].binf.StationIp;
+ arrTd[index++] = data[i].binf.FBSDeviceId;
+ arrTd[index++] = data[i].binf.FbsDeviceIp;
+ arrTd[index++] = data[i].binf.FbsDeviceIp_YM;
+ arrTd[index++] = data[i].binf.FbsDeviceIp_WG;
+ arrTd[index++] = data[i].binf.FBSDeviceName;
+ arrTd[index++] = data[i].binf.GroupIndexInFBSDevice;
+ arrTd[index++] = data[i].binf.BattGroupId;
+ arrTd[index++] = data[i].binf.BattGroupNum;
+ arrTd[index++] = data[i].binf.BattGroupName;
+ arrTd[index++] = data[i].binf.FloatVolLevel;
+ arrTd[index++] = data[i].binf.OfflineVolLevel;
+ arrTd[index++] = data[i].binf.BattFloatCurrent;
+ arrTd[index++] = data[i].binf.MonCount;
+ arrTd[index++] = data[i].binf.MonCapStd;
+ arrTd[index++] = data[i].binf.MonVolStd;
+ arrTd[index++] = data[i].binf.MonResStd;
+ arrTd[index++] = data[i].binf.MonSerStd;
+ arrTd[index++] = data[i].binf.MonVolLowToAvg;
+ arrTd[index++] = data[i].binf.Load_curr;
+ arrTd[index++] = data[i].binf.DisCurrMax;
+ arrTd[index++] = data[i].binf.station_phone;
+ arrTd[index++] = data[i].binf.BattProducer;
+ arrTd[index++] = data[i].binf.BattModel;
+ arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
+ arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
+ arrTd[index++] = data[i].binf.install_user;
+ arrTd[index++] = "";
+ arrTd[index++] = '<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼鎴栧垹闄�</a>';continue;
+ }
+ }
+
+ setPage();
+ createTbl(tblCon, arrTh, arrTd);
+
+ }
+ });
+ }
+
+ function setcookiedit(index){
var arrcookie = new Array();
- for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
- var value = Math.floor(34*index);
- //console.info(value);
- value = Math.floor(value+i);
- //console.info(value);
- arrcookie.push(arrTd[value]);
- }
- var json=window.JSON.stringify(arrcookie);
- setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
- }
-
- function setcookieCreat(index){
- var arrcookie = new Array();
- for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
- var value = Math.floor(34*index);
- //console.info(value);
+ for(var i=0;i<33;i++){//鍏�35椤� ,33鏁版嵁鏈夌敤
+ var value = Math.floor(35*index); //35
+ console.info(value);
value = Math.floor(value+i);
if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
var groupid = Math.floor(arrTd[value]+1);
console.info(groupid);
arrcookie.push(groupid);
}else{
- //console.info(value);
+ console.info(value);
arrcookie.push(arrTd[value]);
}
}
- arrcookie.push("new");
+ console.info($("#newbattnum").val());
+ arrcookie.push($("#newbattnum").val());
//console.info(arrcookie);
var json=window.JSON.stringify(arrcookie);
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
}
-
- // 鏌ヨ鍐呭
- function searchBattLife(){
-
-
- /* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
-
- for(i=0;i<340;i++){
-
-
- arrTd[i]=i*10;
- }
-
- createTbl(tblCon, arrTh, arrTd);
-
- /* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- }
- function getUpdateArr(temp){
- var arr = new Array();
- var obj = new Object();
- obj.StationId = temp[0]; // 鏈烘埧缂栧彿
- obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]); // 鎷兼帴鏈烘埧鍚嶇О
- obj.StationName1 = temp[1]; // 鐪�
- obj.StationName2 = temp[2]; // 甯�
- obj.StationName5 = temp[3]; // 鍖�/鍘�
- obj.StationName3 = temp[4]; // 鏈烘埧鍚嶇О
- obj.StationName4 = temp[5]; // 璁惧鍚嶇О
- obj.StationIp = temp[6]; //鏈烘埧ip
- obj.FBSDeviceId = temp[7]; //璁惧id
- obj.FbsDeviceIp = temp[8]; //璁惧ip
- obj.FbsDeviceIp_YM = temp[9]; // 璁惧鎺╃爜
- obj.FbsDeviceIp_WG = temp[10]; // 缃戝叧
- obj.FBSDeviceName = temp[11]; //璁惧鍚嶇О
- obj.GroupIndexInFBSDevice = temp[12]; //fbs璁惧绱㈠紩
- obj.BattGroupId = temp[13]; //鐢垫睜缁刬d
- obj.BattGroupNum = temp[14]; //鏈烘埧鍐呯數姹犵粍缂栧彿
- obj.BattGroupName = temp[15]; //鐢垫睜缁勫悕绉�
- obj.FloatVolLevel = temp[16]; //娴厖鐢靛帇闃�鍊�
- obj.OfflineVolLevel = temp[17]; //绂荤嚎鐢靛帇闃�鍊�
- obj.BattFloatCurrent = temp[18]; //娴厖鐢垫祦闃�鍊�
- obj.MonCount = temp[19]; //鍗曚綋鏁伴噺
- obj.MonCapStd = temp[20]; //鏍囩О瀹归噺
- obj.MonVolStd = temp[21]; //鏍囩О鐢靛帇
- obj.MonResStd = temp[22]; //鏍囩О鍐呴樆
- obj.MonSerStd = temp[23]; //鏍囩О鐢靛
- obj.MonVolLowToAvg = temp[24]; //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-
-
- obj.Load_curr = temp[25]; //璐熻浇鐢垫祦
- obj.DisCurrMax = temp[26]; //鏈�澶ф牳瀹圭數娴�
- obj.station_phone = temp[27]; //鍩虹珯鍙风爜
-
- obj.BattProducer = temp[28]; //鐢垫睜鍝佺墝
- obj.BattModel = temp[29]; //鐢垫睜鍨嬪彿
- obj.BattProductDate = temp[30]; //鐢垫睜鐢熶骇鏃ユ湡
- obj.BattInUseDate = temp[31]; //鐢垫睜浣跨敤鏃ユ湡
- obj.install_user = temp[32]; //瀹夎浜哄憳
- arr.push(obj);
- console.info(arr);
- return arr;
- }
-
-
-
- function createSearchForm(){
- var temp={
- page:Page,
- StationName1:$('#mainteArea').val(),
- StationName2:$('#city').val(),
- StationName5:$('#country').val(),
- StationName:$('#homeName').val(),
-
- };
- return temp;
- }
-
-
- //鏋勯�犳煡璇㈡潯浠�
- function createSearchParam(){
- var temp = {
- page:Page,
- binf:{
- StationName1:$('#mainteArea').val(),
- StationName2:$('#city').val(),
- StationName5: $('#country').val(),
- StationName:$('#homeName').val(),
- },
- };
- console.info(temp);
- return temp;
-
- }
$(function() {
//鐐瑰嚮涓婁竴椤�
--
Gitblit v1.9.1