From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 2d90d2e..6d44d6a 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>
@@ -162,19 +162,7 @@
</td>
</tr>
- <tr>
- <td>*閫氳璁℃暟</td>
- <td>
- <input type="text" id="tongxunnumber" class="unable" data-mini="true" />
- </td>
- </tr>
-
- <tr>
- <td>*涓㈠寘鐜�</td>
- <td>
- <input type="text" id="diubaonumber" class="unable" data-mini="true" />
- </td>
- </tr>
+
<tr>
<td>*鏄惁楠屾敹</td>
@@ -318,8 +306,8 @@
var arr = temp;
function setcookieCreat(i){
- console.info(temp);
- console.info(i)
+ console.info(temp);
+ console.info(i)
//var index=Math.ceil(i-1);
arrdata = temp[i].binf;
console.info(arrdata);
@@ -336,7 +324,7 @@
}
// 瀛樺偍鎵�鏈夌殑鏁版嵁
- $('#homeInfoIframeAll').data('allData', temp);
+ $('#homeInfoIframeAll').data('allData', temp);
var _data = temp[0];
var _temp = {
homeId: _data.binf.StationId
@@ -347,7 +335,7 @@
}
// 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
- $('#homeInfoIframe').data('homeInfo', _temp);
+ $('#homeInfoIframe').data('homeInfo', _temp);
iframePopup = layer.open({
type: 2
@@ -357,6 +345,12 @@
,full: true
,anim: 4
,content: 'iframe/homeinfo1.html'
+ ,success: function() {
+ $('div[data-role=page]').hide();
+ }
+ ,end: function() {
+ $('div[data-role=page]').show();
+ }
});
layer.full(iframePopup);
})
@@ -379,7 +373,7 @@
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
- getnewnumber(temp[0].binf.FBSDeviceId);
+ //getnewnumber(temp[0].binf.FBSDeviceId);
updateinstalldata();
});
var timeer = '';
--
Gitblit v1.9.1