From a37d440d24d0c7da466183f68fdd706689c81b90 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期一, 24 十二月 2018 11:13:25 +0800
Subject: [PATCH] xiugai

---
 gx_tieta/WebRoot/pages/js/pages/homeInfo.js |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index d6ab551..d262d4d 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -15,7 +15,7 @@
 			var rs = JSON.parse(result.result);
 			if(rs.code == 1) {
 				var data = rs.data;
-				//console.log(data);
+				console.log(data);
 				var rsData = formatHomeInfo(data);
 				$('#homeInfoIframeData').data('data', rsData);
 				// 鏄剧ず闈㈡澘
@@ -23,9 +23,13 @@
 					type: 2,
 					title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
 					area: ['960px', '524px'],
-					fixed: false, //涓嶅浐瀹�
+					btn:['閲嶇疆闈㈡澘'],
+					fixed: true, //涓嶅浐瀹�
 					maxmin: true,
-					content: 'iframe/homeinfo.html'
+					content: 'iframe/homeinfo.html',
+					yes:function(index) {
+						layer.iframeSrc(index, 'iframe/homeinfo.html');
+					}
 				});
 			}else {
 				layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
@@ -37,6 +41,7 @@
 
 // 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
 function formatHomeInfo(data) {
+	//console.log(data);
 	var groupDefaults = {
 		homeid: '',
 		homename: '',
@@ -51,7 +56,8 @@
 		chargecurr: '',
 		chargevol: '',
 		equipeinfo: '',
-		person: ''
+		person: '',
+		install_user: ''
 	};
 	
 	var homeDefaults = {
@@ -96,10 +102,12 @@
 						+'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
 		content.equipeinfo = equipeinfo;
 		content.person = '';
+		content.install_user = _data.install_user;
 		
 		tabc.push(tmp);
 	}
 	var StationId_ex = data[0].StationId_ex;
+	var install_user = data[0].install_user;
 	var homeData = data[0].binf_ex;
 	var tmp = {};
 	tmp.title = '鍩虹珯淇℃伅';
@@ -158,6 +166,7 @@
 	content.distance = homeData.upperStationRoute;
 	content.degree = homeData.upperStationDifficult;
 	content.repair = homeData.clienteleErrorService;
+	content.install_user = install_user;
 	
 	// 鏄惁娣诲姞鍩虹珯淇℃伅
 	if(content.stationid != '0') {
@@ -168,14 +177,33 @@
 	var tmp = {};
 	tmp.type = 'env';
 	tmp.title = '鍩虹珯鐜鐭棰�';
+	tmp.tshow = '';
+    tmp.cshow = '';
 	tabc.push(tmp);
 	
 	// 涓婁紶瑙嗛
 	var tmp = {};
 	tmp.type = 'upload';
 	tmp.title = '涓婁紶鐭棰�';
+	tmp.tshow = '';
+    tmp.cshow = '';
 	tabc.push(tmp);
 	
+	// 鏈烘埧鍥剧墖妯″潡
+	var tmp = {};
+	tmp.type = 'envImg';
+	tmp.title = '鍩虹珯鐜鍥鹃泦';
+	tmp.tshow = '';
+    tmp.cshow = '';
+	tabc.push(tmp);
+	
+	// 鏈烘埧鍥剧墖涓婁紶
+	var tmp = {};
+	tmp.type = 'envImgUpload';
+	tmp.title = '涓婁紶鍩虹珯鐜鍥剧墖';
+	tmp.tshow = '';
+    tmp.cshow = '';
+	tabc.push(tmp);
 	
 	// 杩斿洖缁撴灉闆�
 	return rs;

--
Gitblit v1.9.1