From 147ca8a43baae381f430b3b58bdbb6cd707d1436 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 17:04:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved.html | 88 ++++++++++++++++++++---------
gx_tieta/WebRoot/mobil/batt-unapproved.html | 40 ++++++++++--
2 files changed, 93 insertions(+), 35 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 9389868..9054ed2 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -140,7 +140,8 @@
function getButIndex(t){
//console.warn($(t).attr("but-index"));
var index = $(t).attr("but-index");
- setcookiedit(index);
+ console.info(index);
+ setcookiedit(index);
return ;
}
@@ -154,17 +155,7 @@
};
- $("#edit").click(function(){
- window.location.href="batt-infor-conf-temp.html";
- });
- $("#delete").click(function(){ //鍒犻櫎鐢垫睜缁�
- var temp = getCookie("eleparm");
- temp = JSON.parse(temp);
- console.info(temp);
- var parm = getUpdateArr(temp);
- delBatt(parm);
- // 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)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏌ョ湅鐢垫睜缁勫疄鏃舵暟鎹�'];
dataArr = [];
@@ -190,7 +181,7 @@
return obj;
}
// 鏌ヨ鍐呭
- function searchBattLife(){
+/* function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
@@ -247,7 +238,7 @@
createTbl(tblCon, arrTh, arrTd);
}
});
- }
+ }*/
function setcookiedit(index){
var arrcookie = new Array();
@@ -258,8 +249,51 @@
//console.info(value);
arrcookie.push(arrTd[value]);
}
+ console.info(arrcookie);
+ var temp = arrcookie;
+ var battarr = {
+ StationId : temp[0], // 鏈烘埧缂栧彿
+ StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :temp[1], // 鐪�
+ StationName2 : temp[2], // 甯�
+ StationName5 : temp[3], // 鍖�/鍘�
+ StationName3 : temp[4], // 鏈烘埧鍚嶇О
+ StationName4 :temp[5], // 璁惧鍚嶇О
+ StationIp : temp[6], //鏈烘埧ip
+ FBSDeviceId : temp[7], //璁惧id
+ FbsDeviceIp : temp[8], //璁惧ip
+ FbsDeviceIp_YM : temp[9], // 璁惧鎺╃爜
+ FbsDeviceIp_WG : temp[10], // 缃戝叧
+ FBSDeviceName : temp[11], //璁惧鍚嶇О
+ GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
+ BattGroupId : temp[13], //鐢垫睜缁刬d
+ BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName : temp[15], //鐢垫睜缁勭储寮�
+ FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : temp[17], //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : temp[18], //娴厖鐢垫祦闃�鍊�
+ MonCount : temp[19], //鍗曚綋鏁伴噺
+ MonCapStd : temp[20], //鏍囩О瀹归噺
+ MonVolStd : temp[21], //鏍囩О鐢靛帇
+ MonResStd : temp[22], //鏍囩О鍐呴樆
+ MonSerStd : temp[23], //鏍囩О鐢靛
+ MonVolLowToAvg : temp[24], //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : temp[25], //璐熻浇鐢垫祦
+ DisCurrMax : temp[26], //鏈�澶ф牳瀹圭數娴�
+ station_phone : temp[27], //鍩虹珯鍙风爜
+
+ BattProducer : temp[28], //鐢垫睜鍝佺墝
+ BattModel : temp[29], //鐢垫睜鍨嬪彿
+ BattProductDate : temp[30]+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : temp[31]+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ install_user : temp[32], //瀹夎浜哄憳
+ }
+ var json1 = window.JSON.stringify(battarr);
+ console.info(battarr);
var json=window.JSON.stringify(arrcookie);
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ setCookie("batt",json1);
}
function setcookieCreat(index){
@@ -283,28 +317,28 @@
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
}
-/* // 鏌ヨ鍐呭
+ // 鏌ヨ鍐呭
function searchBattLife(){
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- /* for(i=0;i<340;i++){
- if(i%34==33){
- //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
- arrTd[i]='<a href="" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
- console.warn(i);
- continue;
+ for(var i=0;i<340;i++){
+ if(i%34==33){
+ //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ console.info(i);
+ arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ console.warn(i);
+ continue;
- }
-
- arrTd[i]=i*10;
- }
+ }
+ arrTd[i]=i*10;
+ }
- createTbl(tblCon, arrTh, arrTd);
+ createTbl(tblCon, arrTh, arrTd);
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- //}
+ }
function getUpdateArr(temp){
var arr = new Array();
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 7b503aa..6579a86 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -87,12 +87,16 @@
margin: 0;
padding-top: 0.1em;
padding-bottom: 0.1em;
+ background-color: #dddddd4d!important;
}
.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
width:35%;
}
.tbl-container td {
color: #fb0909a3;
+ }
+ .fr{
+ float:right;
}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
@@ -126,8 +130,8 @@
</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>
+ <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a>
+ <a href="" id="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍙栨秷鍒犻櫎</a>
</div>
</div>
@@ -144,10 +148,17 @@
<script type="text/javascript">
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
- function getButIndex(t){
- //console.warn($(t).attr("but-index"));
+ function getDeleteButIndex(t){
+ console.warn($(t).attr("but-index")+' 鍒犻櫎');
var index = $(t).attr("but-index");
- setcookiedit(index);
+ //setcookiedit(index);
+ return ;
+ }
+ function getEditButIndex(t){
+ console.warn($(t).attr("but-index")+' 淇敼');
+ var index = $(t).attr("but-index");
+ //setcookiedit(index);
+ //window.location.href="batt-infor-unapproved-edit.html";
return ;
}
@@ -172,7 +183,7 @@
//window.location.href="batt-unapproved.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');
@@ -194,7 +205,7 @@
}
// 鏌ヨ鍐呭
function searchBattLife(){
- var temp = JSON.stringify(getcreatArr());
+ /* var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
var index = 0;
@@ -250,7 +261,20 @@
setPage();
createTbl(tblCon, arrTh, arrTd);
}
- });
+ }); */
+
+ for(i=0;i<340;i++){
+ if(i%34==33){
+ arrTd[i]='<a onclick="getEditButIndex(this)" id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>'+'<a onclick="getDeleteButIndex(this)" href="#myPopup" id="" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鍒犻櫎</a>';
+
+ continue;
+
+ }
+
+ arrTd[i]=i*10;
+ }
+
+ createTbl(tblCon, arrTh, arrTd);
}
function searchHomeInfoByName(id) {
--
Gitblit v1.9.1