keke
parent: 4abd3227 | 补丁 | 提交 | ignore whitespace
chenjingjing
2018-12-28 00ee1e49cac2ec8a8a1f476b48dd7e60166bccbe 
未审批详情添加删除，修改界面
4个文件已修改
94 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/batt-approved1.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-edit2.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 gx_tieta/WebRoot/mobil/batt-approved1.html


@@ -27,8 +27,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;



@@ -220,7 +220,7 @@


            <div data-role="navbar">



                <ul>



                  <li><a href="" id="applyyanshou"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="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">实时数据</a></li>



                  <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="star" data-role="button">实时数据</a></li>



                </ul>



            </div>        



        </div>





 gx_tieta/WebRoot/mobil/batt-edit2.html


@@ -374,7 +374,7 @@


                        //console.info(dev_id);



                        document.getElementById("FBSDeviceId").value = dev_id;



                        var ip = getDevIp(dev_id);



                        //console.info(ip);



                        console.info(ip);



                        document.getElementById("FbsDeviceIp").value = ip;



                    }else{



                        alert("groupid生成失败");



@@ -596,15 +596,15 @@


                    var model =data;



                    if(model.code ==1){



                        alert("修改成功");



                        window.location.href="batt-unapproved.html"



                        window.location.href="batt-unapproved-index.html"



                    }else{



                        alert("修改失败!");



                        window.location.href="batt-unapproved.html"



                        window.location.href="batt-unapproved-index.html"



                    }        



                },



                error:function(){



                    alert("修改电池组失败!");



                    //window.location.href="batt-unapproved.html"



                    //window.location.href="batt-unapproved.html"  详情列表



                }



         });



     }





 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html


@@ -698,17 +698,14 @@


                 console.info(data);



                 if(data.code==1){



                     alert("添加成功");



                     window.location.href="batt-unapproved.html";



                     window.location.href="batt-unapproved-index.html"



                 }else{



                     alert("添加失败");



                     window.location.href="batt-unapproved.html";



                     window.location.href="batt-unapproved-index.html";



                 }



             }



         });



     }



   


   


   


   



   



   





 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;



@@ -56,7 +56,7 @@


        <!-- 头部内容 -->



        <div data-role="header" data-position="fixed">



            <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>



            <h1>未审批通过机房详情</h1>



            <fieldset data-role="controlgroup" class="ptr0" >             



                    </fieldset>            



        </div>



@@ -68,6 +68,9 @@


                                            <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>



@@ -100,8 +103,11 @@


                                                <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="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" />



@@ -172,7 +178,7 @@


            <div data-role="navbar">



                <ul>



                  <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="batt-unapproved-index.html"  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="#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>   



@@ -180,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>







@@ -196,7 +208,38 @@


     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>'+



@@ -339,8 +382,8 @@


            document.getElementById("homeName").value = data.StationName3;   //机房名称



            document.getElementById("StationName4").value = data.StationName4;    //设备名称



            document.getElementById("StationIp").value = data.StationIp;        //设备IP



            //document.getElementById("FBSDeviceId").value = data.FBSDeviceId;	


            // document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;



            document.getElementById("FBSDeviceId").value = data.FBSDeviceId;	


            document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;



            document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;



            document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;



            document.getElementById("FBSDeviceName").value = data.FBSDeviceName;



@@ -348,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;



@@ -405,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(),    // 机房编号



@@ -439,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(),            //电池使用日期