From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 686e3ad..8a895ed 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -68,6 +68,7 @@
</select>
+
</fieldset>
@@ -271,6 +272,7 @@
}
+
function creatBattView(index){
var count=index+1
,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
@@ -374,7 +376,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 +598,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" 璇︽儏鍒楄〃
}
});
}
--
Gitblit v1.9.1