From 9ddd943af4a3b650b5fa877eff8d4f2ce643448a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 19 十一月 2018 16:40:35 +0800
Subject: [PATCH] 视频上传

---
 gx_tieta/WebRoot/index.jsp |  120 +----------------------------------------------------------
 1 files changed, 3 insertions(+), 117 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6d93024..229ea51 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -403,6 +403,7 @@
 	<script type="text/javascript" src="js/loading.js"></script>
 	<script type="text/javascript" src="src/layui.js"></script>
 	<script type="text/javascript" src="src/layui.all.js"></script>
+	<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
 	<script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -2468,7 +2469,8 @@
 					var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
-							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a><a style="margin-left: 20px" href="javascript:showHomeInfo();">鍩虹珯淇℃伅</a></div>'+
+							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a>'+
+							'<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">鍩虹珯淇℃伅</a></div>'+
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
 							'<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
 							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
@@ -2675,122 +2677,6 @@
 	function loadToHomeInfo() {
 		var stationId = $('.ipt-hide').eq(1).val();
 		//window.open('homeinfor.jsp?stationId='+stationId);
-	}
-	
-	// 鏄剧ず鏈烘埧淇℃伅
-	function showHomeInfo() {
-		var sid = $('.ipt-hide.sid').val();
-		var temp = {
-			StationId: sid
-		};
-		
-		// 鏌ヨ鍩虹珯鐨勪俊鎭�
-		$.ajax({
-			type: 'post',
-			async: true,
-			url: 'BattInfAction!serchBattAllInfoByStationId',
-			data: 'json='+JSON.stringify(temp),
-			dataType: 'json',
-			success: function(result) {
-				var rs = JSON.parse(result.result);
-				if(rs.code == 1) {
-					var data = rs.data;
-					console.log(data);
-					var rsData = formatHomeInfo(data);
-					$('#homeInfoIframeData').data('data', rsData);
-					// 鏄剧ず闈㈡澘
-					layer.open({
-						type: 2,
-						title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
-						area: ['960px', '524px'],
-						fixed: false, //涓嶅浐瀹�
-						maxmin: true,
-						content: 'iframe/homeinfo.html'
-					});
-				}else {
-					layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
-				}
-				
-			}
-		});
-	}
-	
-	// 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
-	function formatHomeInfo(data) {
-		var groupDefaults = {
-			homeid: '',
-			homename: '',
-			homeip: '',
-			groupid: '',
-			groupname: '',
-			ordernum: '',
-			brand: '',
-			model: '',
-			monproperty: '',
-			startusetime: '',
-			chargecurr: '',
-			chargevol: '',
-			equipeinfo: '',
-			person: ''
-		};
-		
-		var homeDefaults = {
-			
-		};
-		var rs = {
-			tabc:[]
-		};
-		var tabc = rs.tabc;
-		// 閬嶅巻data鐢熸垚鏈烘埧鐨勫��
-		for(var i=0; i<data.length; i++) {
-			var _data = data[i];
-			var tmp = {};
-			tmp.title = '鐢垫睜缁�'+(i+1)+'淇℃伅';
-			tmp.type = 'group';
-			tmp.content = $.extend({}, groupDefaults);
-			tmp.tshow = '';
-            tmp.cshow = '';
-			if(i==0) {
-				tmp.tshow = 'layui-this';
-            	tmp.cshow = 'layui-show';
-			}
-			// 璁剧疆content鐨勫��
-			var content = tmp.content;
-			content.homeid = _data.StationId;	    		// 鏈烘埧id
-			content.homename = _data.StationName;			// 鏈烘埧鍚嶇О
-			content.homeip = _data.StationIp;				// 鏈烘埧ip
-			content.groupid = _data.BattGroupId;			// 鐢垫睜缁刬d
-			content.groupname = _data.BattGroupName;		// 鐢垫睜缁勫悕绉�
-			content.ordernum = _data.GroupIndexInFBSDevice+1;// 鐢垫睜缁勭紪鍙�
-			content.brand = _data.BattProducer;				// 鐢垫睜鍝佺墝
-			content.model = _data.BattModel;
-			var monproperty = '鏍囩О瀹归噺锛�'+_data.MonCapStd+'AH'+'锛屾爣绉板崟浣撶數鍘嬶細'+_data.MonVolStd+'V'+'锛屾爣绉板唴闃伙細'+_data.MonResStd.toFixed(3)+'m惟'
-							+'锛屾爣绉版俯搴︼細'+_data.MonTmpStd+'鈩�'+'锛屽崟浣撴暟閲忥細'+_data.MonCount+'鑺�'; 
-			content.monproperty = monproperty;
-			content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');
-			content.chargecurr = _data.BattFloatCurrent;
-			content.chargevol = _data.FloatVolLevel;
-			var equipeinfo = '鍨嬪彿锛�'+_data.FBSDeviceName+'锛孖D锛�'+_data.FBSDeviceId
-							+'锛孖P锛�'+_data.FbsDeviceIp+'锛孊Index锛�'+_data.GroupIndexInFBSDevice;
-			content.equipeinfo = equipeinfo;
-			content.person = '';
-			
-			tabc.push(tmp);
-		}
-		
-		var home = data[0].binf_ex;
-		var tmp = {};
-		tmp.title = '鍩虹珯淇℃伅';
-		tmp.type = 'home';
-		tmp.content = $.extend({}, homeDefaults);
-		tmp.tshow = '';
-        tmp.cshow = '';
-        // 璁剧疆content鐨勫��
-		var content = tmp.content;
-		
-		tabc.push(tmp);
-		// 杩斿洖缁撴灉闆�
-		return rs;
 	}
 	
 	// 鑾峰彇echarts瀵硅薄鐨刼pt 

--
Gitblit v1.9.1