From 00ee1e49cac2ec8a8a1f476b48dd7e60166bccbe Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 11:24:41 +0800
Subject: [PATCH] 未审批详情添加删除，修改界面
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 237 +++++++++++++++++++++++-----------------------------------
1 files changed, 94 insertions(+), 143 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 9c9fa62..bbf408b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>淇敼鐢垫睜缁勪俊鎭厤缃�</title>
+ <title>鏈鎵归�氳繃鏈烘埧璇︽儏</title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1.0,user-scalable=0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -26,8 +26,8 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddd38!important;
- color: #bdbdbdc4!important;
+ background-color: #dddddde0!important;
+ color: #000!important;
}
.ui-btn-icon-right {
padding-right: 8.5em;
@@ -47,9 +47,6 @@
right: 0;
margin:0!important;
}
- #newbattnum-button{
- padding: 1em 1.9em;
- }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -58,49 +55,22 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <a href="ele-param2.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>
- <h1>淇敼鐢垫睜缁勪俊鎭厤缃�</h1>
- <fieldset data-role="controlgroup" class="ptr0" >
-
-
- <select id="newbattnum" data-mini="true">
- <option value=0>鏂板缓鐢垫睜缁�</option>
-
- </select>
-
-
- </fieldset>
-
+ <a href="batt-unapproved-index.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>
+ <h1>鏈鎵归�氳繃鏈烘埧璇︽儏</h1>
+ <fieldset data-role="controlgroup" class="ptr0" >
+ </fieldset>
</div>
<!-- 涓讳綋鍐呭 -->
<div data-role="main">
<!-- <div class="set-option"> -->
<table class="layout-set">
<tbody>
- <tr>
- <td>鏈烘埧缂栧彿</td>
- <td>
- <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>FBS璁惧ID(閲嶈)</td>
- <td>
- <input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>FBS璁惧IP(閲嶈)</td>
- <td>
- <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
+ <input type="hidden" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+ <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
+
+ <input type="hidden" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
+ <input type="hidden" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()"/>
+
<tr>
<td>鐪�</td>
<td>
@@ -122,46 +92,23 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
+ <input type="text" class="unable" class="unable" id="homeName" data-mini="true">
</td>
</tr>
-
- <input type="hidden" id="StationName4" data-mini="true" />
-
-
- <input type="hidden" id="StationIp" data-mini="true" />
-
-
-
-
-
+ <input type="hidden" id="StationName4" 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" />
-
-
-
-
+ <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="FloatVolLevel0" data-mini="true" />
+ <input type="hidden" id="OfflineVolLevel0" class="unable" data-mini="true" />
+ <input type="hidden" id="FloatVolLevel1" data-mini="true" />
+ <input type="hidden" id="OfflineVolLevel1" class="unable" data-mini="true" />
+
+ <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
<input type="hidden" id="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
@@ -169,17 +116,17 @@
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
<td>
- <input type="text" id="Load_curr" data-mini="true" />
+ <input type="text" id="Load_curr" class="unable" data-mini="true" />
</td>
</tr>
- <input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
<tr>
<td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
- <input type="text" id="station_phone" data-mini="true" />
+ <input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
</tr>
@@ -190,7 +137,7 @@
<tr>
<td>*瀹夎浜哄憳</td>
<td>
- <input type="text" id="install_user" data-mini="true" />
+ <input type="text" id="install_user" class="unable" data-mini="true" />
</td>
</tr>
</tbody>
@@ -230,8 +177,8 @@
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
- <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">纭畾</a></li>
- <li><a href="" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
+ <li><a href="batt-approve-index.html" target="_top" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">宸插鏍�</a></li>
+ <li><a href="#myPopup" data-rel="popup" id="deletemyPopup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍒犻櫎</a></li>
</ul>
</div>
</div>
@@ -239,7 +186,13 @@
<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="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
<a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
- </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="delete" value="" 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>
</body>
@@ -255,43 +208,64 @@
return $("#battdata").html(allString);
}
-
+ $("#delete").click(function(delindex){ //鍒犻櫎鐢垫睜缁�
+ var delindex = $("#delete").val();
+ //console.info($("#delete").val());
+ //console.info(delindex);
+ battDeleteparm();
+ });
+
+ function battDeleteparm(){
+ var parm = getUpdateArr();
+ console.info(parm);
+ delBatt(parm);
+ }
+ function delBatt(parm){
+ $.ajax({
+ type: "post",
+ url: "Battinf_applyAction!del",
+ async:true,
+ dataType:'json',
+ data:"json="+JSON.stringify(parm),
+ success: function(data){
+ console.info(data);
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ alert("鍒犻櫎鎴愬姛");
+ window.location.href="batt-unapproved-index.html";
+ }else{
+ alert("鍒犻櫎澶辫触");
+ window.location.href="batt-unapproved-index.html";
+ }
+ }
+ });
+ }
function creatBattView(index){
var count=index+1
,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>'
- ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>'
- ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+ '<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>'
+ ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
+ ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCount'+index+' data-mini="true"'+'value='+'鍗曚綋鏁伴噺'+count+' />'+'</td>'+'</tr>'
+ //,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'
+ //,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(i)+'</select>'
- +'</fieldset>'+'</td>'+'</tr>'
- ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' />'+'</tr>'
- ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
- return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
+ //,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
+ // +'</fieldset>'+'</td>'+'</tr>'
+ ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCapStd'+index+' data-mini="true"'+'value='+'鏍囩О瀹归噺'+count+' />'+'</td>'+'</tr>'
+ ,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='';
if(temp[index].binf.MonCount==4){
return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
}else{
- return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
-
+ return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
}
- }
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
-
+ }
function selectedIndex(index){
var selected='',
@@ -322,13 +296,8 @@
$(function(){
creatAllView(temp.length).trigger('create');
setMonVolStd(temp.length);
- creatBa(temp.length).trigger('create');
});
-
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
@@ -401,17 +370,7 @@
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
+
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
@@ -432,8 +391,8 @@
document.getElementById("BattGroupId").value = data.BattGroupId;
document.getElementById("BattGroupNum").value = data.BattGroupNum;
//document.getElementById("BattGroupName").value = temp[15];
- document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
- document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
+ //document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
+ //document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
//document.getElementById("MonCount").value = data.MonCount;
//document.getElementById("MonCapStd").value = data.MonCapStd;
@@ -459,7 +418,8 @@
$("#MonCount"+i).find("option:selected").val(data.MonCount);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
- var battproducer = "#battproducer"+i
+ var battproducer = "#battproducer"+i;
+ $('#MonCount'+i).val(data.MonCount);
//var battproducer ="#battproducer"+i;
$(battString).val(data.BattGroupName);
$(battModel).val(data.BattModel);
@@ -488,7 +448,7 @@
var index = String(i);
console.info(battString);
var obj = {
- apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
+ //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
num : temp[i].num,
binf:{
StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
@@ -522,7 +482,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
+ BattProducer : $("#battproducer"+i).val(), //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -623,6 +583,7 @@
function creatMonCapOpt(index){
var selected='',
i=0;
+ //console.info(temp[index.binf.MonCapStd]);
var battproducer = ["50","100","150","200","250","300","350","400","450","500","1000"];
selected+= '<option '+'value='+temp[index].binf.MonCapStd+'>'+temp[index].binf.MonCapStd+'</option>';
for(var i=0;i<battproducer.length;i++){
@@ -632,16 +593,6 @@
}
return selected;
}
- $('#newbattnum').change(function(){
- var numbattnum = parseInt($('#newbattnum').val());
- var index =parseInt(tempindex.length);
- addbattnum=Math.floor((numbattnum)+(tempindex.length));
- console.warn(addbattnum);
- creatAllView(addbattnum).trigger('create');
- creatBattGroupId(addbattnum);
- });
-
-
function getSelected(id){
/* var s;
@@ -655,7 +606,7 @@
var s=$(id).find("option:selected").val();
return s;
}
- function creatMonCapOpt(suoyin){
+ /* function creatMonCapOpt(suoyin){
var optionStr,allString;
for(var i=1;i<11;i++){
@@ -672,7 +623,7 @@
return allString;
- }
+ }*/
function setMonVolStd(suoyin){
for(var u=0;u<suoyin;u++){
var id='';
--
Gitblit v1.9.1