From 5c313a0bf62887f20d1f01754b1b07d983905d66 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 29 十二月 2018 14:42:37 +0800
Subject: [PATCH] bug

---
 gx_tieta/WebRoot/mobil/batt-approved1.html   |   19 ++++++++++++++-----
 gx_tieta/WebRoot/mobil/iframe/homeinfo1.html |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 5512701..2ac7815 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -381,9 +381,12 @@
 		//setTimes($("#startTestrecord"),'2000-01-01');
 		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
 		
-		timeer = window.setTimeout(function() {
-							installstartdata(temp);
-						}, 4000);	
+		
+	installstartdata(temp);
+	diubao();
+	timeer = window.setTimeout(function() {
+			diubao();						
+						}, 4000);	//涓㈠寘鐜囷紝閫氫俊璁℃暟锛�4绉掑埛鏂�1娆°��
 		//4绉掑埛鏂颁竴娆¢〉闈�
 	});
     
@@ -461,8 +464,7 @@
 			//setTimes($("#startTestrecord"),data.productDate);
 			//setTimes($("#endTestrecord"),data.useDate);
 				document.getElementById("install_user").value = data.install_user;
-			document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
-			document.getElementById("diubaonumber").value = getCookiediubao(data.StationId)
+			
 				
 			for(var i=0;i<temp.length;i++){
 				data=temp[i];		
@@ -484,6 +486,13 @@
 			}
 	}
 	
+	function diubao(){
+		if(temp.length>0){
+			data=temp[0].binf;
+			document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
+			document.getElementById("diubaonumber").value = getCookiediubao(data.StationId);
+		}	
+	}
 	 function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
 	 	var a = getnumber();
 	 	//console.info(a);
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index c6baa45..630c67d 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -109,7 +109,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-col-12 t-align-right mrt5">
-                                    <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
+                                    <span style="color: #FF0000;" class="mrr4">璇蜂笂浼犲井淇℃媿鎽勭殑瑙嗛</span><button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
                                 </div>
                             </div>
                         </div>

--
Gitblit v1.9.1