From edbafe463bdaa51f7b466a1491943e0bdcd4dd13 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 17:42:33 +0800
Subject: [PATCH] bug
---
gx_tieta/WebRoot/mobil/batt-approved.html | 29 ++++++
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 168 +++++++++++++-----------------------------
2 files changed, 78 insertions(+), 119 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 3572a83..bb11edc 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -209,7 +209,7 @@
var arrdata = new Array();
- 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');
@@ -233,16 +233,21 @@
success:function(data) {
data = JSON.parse(data.result);
if(data.code==1){
+ console.info(data.data);
var json =JSON.stringify(data.data);
setCookie("numberget",json);
+ //return data.data;
}
}
});
}
function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+ //var a = getnumber();
+ //console.info(a);
if(getCookie("numberget")){
var number = getCookie("numberget");
number = JSON.parse(number);
+ console.info(number);
if(number[0]){
for(var i =0; i<number.length;i++){
if(id == number[i].dev_id){
@@ -253,7 +258,24 @@
}
return 0;
}
-
+ function getCookiediubao(id){
+ if(getCookie("numberget")){
+ var number = getCookie("numberget");
+ number = JSON.parse(number);
+ console.info(number);
+ if(number[0]){
+ for(var i =0; i<number.length;i++){
+ if(id == number[i].dev_id){
+ var errorCount = number[i].dev_errcommcount;
+ var allCount = number[i].dev_commcount+errorCount;
+
+ return number[i].dev_commcount;
+ }
+ }
+ }
+ }
+ return 0;
+ }
function getcreatArr(){
obj = {
apply_en : 1,
@@ -269,7 +291,7 @@
return "鏈獙鏀�";
}else if(check_en==2){
return "宸茬敵璇烽獙鏀�";
- }else if(check==1){
+ }else if(check_en==1){
return"宸插畬鎴愰獙鏀�";s
}
}
@@ -330,6 +352,7 @@
arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
arrTd[index++] = data[i].binf.install_user;
arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
+ arrTd[index++] = getCookiediubao(data[i].binf.FBSDeviceId);
arrTd[index++] = yanshou(data[i].check_en);
arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>'+
'<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鐢宠楠屾敹</a>';
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index e4a8391..b0e55d7 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -13,7 +13,7 @@
<script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<style type="text/css">
-
+ input{-webkit-appearance: none;}
table {
margin-top:.5em;
border-collapse:separate;
@@ -61,7 +61,25 @@
<tr>
<td>鏈烘埧缂栧彿</td>
<td>
- <input type="text" id="StationId" class="unable" data-mini="true" />
+ <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" />
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧IP(閲嶈)</td>
+ <td>
+ <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>鐢垫睜缁処D</td>
+ <td>
+ <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
</td>
</tr>
<tr>
@@ -94,9 +112,8 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <select id="homeName" data-mini="true">
- <option value="">鍏ㄩ儴</option>
- </select>
+ <input type="text" id="homeName" data-mini="true">
+
</td>
</tr>
@@ -107,18 +124,7 @@
<input type="hidden" id="StationIp" data-mini="true" />
- <tr>
- <td>FBS璁惧ID(閲嶈)</td>
- <td>
- <input type="text" id="FBSDeviceId" class="unable" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>FBS璁惧IP(閲嶈)</td>
- <td>
- <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
- </td>
- </tr>
+
<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
@@ -127,12 +133,7 @@
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
- </td>
- </tr>
+
<input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
@@ -202,22 +203,10 @@
<input type="text" id="station_phone" data-mini="true" />
</td>
</tr>
- <tr>
- <td>鐢垫睜鍝佺墝</td>
- <td>
- <input type="text" id="BattProducer" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>*鐢垫睜鍨嬪彿</td>
- <td>
- <input type="text" id="BattModel" data-mini="true" />
- </td>
- </tr>
-
- <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" />
+
+ <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" />
- <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" />
+ <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" />
<tr>
<td>*瀹夎浜哄憳</td>
@@ -431,61 +420,10 @@
}
}
updataSel($Ostation_name1, arr);
- }
- findStationNamebyStationname1();
+ }
}
});
}
-
- //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
- function findStationNamebyStationname1(){
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val()
- };
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName3",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#homeName");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:"",
- stationid:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].StationName3,
- stationid:data.data[i-1].StationId,
- txt:data.data[i-1].StationName3,
- });
- }
- }
- //console.info(111111111111111);
- updataSelStation($Ostation_name1, arr);
- }
-
-
- }
- });
- }
-
-
//褰撶渷鏀瑰彉鏃舵洿鏂板競
$('#mainteArea').change(function(){
@@ -495,30 +433,24 @@
$('#city').change(function(){
findCounty();
});
- //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
- $('#country').change(function(){
- findStationNamebyStationname1();
- });
+
//鏋勯�犳煡璇㈡潯浠�
- 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 createSearchParam(){
+ var temp = {
+ page:Page,
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ },
+ };
+ console.info(temp);
+ return temp;
+
+ }
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
@@ -668,11 +600,11 @@
document.getElementById("DisCurrMax").value = data.DisCurrMax;
// document.getElementById("station_phone").value = data.station_phone;
// document.getElementById("BattProducer").value = data.BattProducer;
- document.getElementById("BattModel").value = data.BattModel;
+ // document.getElementById("BattModel").value = data.BattModel;
//document.getElementById("startTestrecord").value = temp[30];
//document.getElementById("endTestrecord").value = temp[31];
- setTimes($("#startTestrecord"),data.productDate);
- setTimes($("#endTestrecord"),data.useDate);
+ //setTimes($("#startTestrecord"),data.productDate);
+ //setTimes($("#endTestrecord"),data.useDate);
// document.getElementById("install_user").value = data.install_user;
}else{
document.getElementById("StationId").value = temp[0];
@@ -821,6 +753,9 @@
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
+ $(function(){
+ alert(333);
+ })
$("#sure").click(function(){
if(nullOrn()){
if(temp[34]!="edit"){
@@ -912,12 +847,13 @@
});
function creatMonCapOpt(){
- var k,optionStr='';
+ var k,optionStr='',allString;
for(var i=1;i<11;i++){
k=i*50;
optionStr+='<option'+' value='+k+'>'+k+'</option>';
}
- $("#MonCapStd").html(optionStr);
+ allString=optionStr+'<option'+' value='+1000+'>'+1000+'</option>'
+ $("#MonCapStd").html(allString);
}
creatMonCapOpt();
/* 鎿嶄綔鎴愬姛
--
Gitblit v1.9.1