From eef944bd37bbe7227d439341c7eea3455d7516c3 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 07 一月 2019 19:33:11 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 2
gx_tieta/WebRoot/mobil/approvalBatt.html | 10 ++
gx_tieta/WebRoot/mobil/batt-approved.html | 4
gx_tieta/WebRoot/mobil/index.html | 3
gx_tieta/WebRoot/mobil/approvalBatt-index.html | 233 ++++++++++++++++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 3
gx_tieta/WebRoot/mobil/batt-unapproved-index.html | 1
7 files changed, 251 insertions(+), 5 deletions(-)
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-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-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..44556bf 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,
}
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> -->
--
Gitblit v1.9.1