~whychwj/haha.git

			@@ -84,7 +84,7 @@
			<div class="layui-form layui-form-pane layui-form-default mrt5 mrl8 mrr8 mrb10" action="" lay-filter="">
			<div class="layui-row">
			<div class="layui-col-12">
			<button class="layui-btn layui-btn-normal layui-btn-sm" id="videoSelect">视频选择</button>
			<button class="layui-btn layui-btn-normal layui-btn-sm" id="videoSelect">视频选择或拍摄</button>
			<span style="color: #FF0000;">请上传有关机房的视频</span>
			</div>
			<div class="layui-col-12 mrt5">
			@@ -109,7 +109,7 @@
			</div>
			</div>
			<div class="layui-col-12 t-align-right mrt5">
			<span style="color: #FF0000;" class="mrr4">请上传微信拍摄的视频</span><button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">视频上传</button>
			<button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">视频上传</button>
			</div>
			</div>
			</div>
			@@ -119,8 +119,8 @@
			<div class="rel-full">
			<div class="layui-form layui-form-pane layui-form-default mrt5 mrl8 mrr8 mrb10" action="" lay-filter="">
			<div class="layui-col-12">
			<button class="layui-btn layui-btn-normal layui-btn-sm" id="imgsSelect">图片选择</button>
			<span style="color: #FF0000;">请上传有关机房的图片</span>
			<button class="layui-btn layui-btn-normal layui-btn-sm" id="imgsSelect">图片选择或拍照</button>
			<span style="color: #FF0000;">请上传电话卡、机房名称、电池型号、负载电流、bts设备接线、电流接线、整体安装效果图等图片</span>
			</div>
			<div class="layui-col-12">
			<div class="layui-upload">
			@@ -129,7 +129,6 @@
			<thead>
			<tr>
			<th>图片预览</th>
			<th>文件名</th>
			<th>大小</th>
			<th lay-data="{fixed: 'right', sort: true, minWidth: 100, align: 'center'}">操作</th>
			</tr>
			@@ -297,7 +296,7 @@
			data: "json="+temp,
			dataType: 'json',
			success:function(data) {
			console.info(data);
			//console.info(data);
			data = JSON.parse(data.result);
			if(data.code==1){
			layer.msg("申请验收成功!3秒后关闭面板");
			@@ -317,7 +316,7 @@
			setTimeout(function() {
			var lng = $('#lng').val(); // 经度
			var lat = $('#lat').val(); // 纬度
			console.log(lng+'***'+lat);
			//console.log(lng+'***'+lat);
			var point = new BMap.Point(lng, lat);
			delMkByLabel('新机房');
			var mk = new BMap.Marker(point);
			@@ -331,7 +330,7 @@

			// 给mk点添加移动事件
			mk.addEventListener('dragend', function(e) {
			console.log(e.point);
			//console.log(e.point);
			var lat = e.point.lat;
			var lng = e.point.lng;

			@@ -363,7 +362,6 @@


			var footerMenu = new FooterMenu($('#pageFooter')); // 实例化底部导航栏

			// 上传视频模块
			var videoInfoTbl = $('#videoInfoTbl');
			// 渲染并初始化上传按钮
			@@ -380,11 +378,12 @@
			VideoOrImage: 'video'
			})
			}
			,exts: 'mp4\|MOV\|avi\|rmvb'
			,accept: 'video' //视频
			,choose: function(obj) {

			var files = this.files = obj.pushFile();
			console.log(obj.pushFile());
			//console.log(obj.pushFile());
			videoInfoTbl.text('');
			// 遍历
			Object.keys(files).forEach(function(key) {
			@@ -409,7 +408,7 @@
			});
			}
			,progress: function(e , percent) {
			console.log(percent);
			//console.log(percent);
			element.progress('uploadProgress',percent + '%');
			}
			,done: function(res, index, upload) {
			@@ -425,15 +424,10 @@
			var uploadImgsLoad;
			var uploadImgs = upload.render({
			elem: '#imgsSelect'
			,url: 'MyFileAction!uploadStationFile'
			,url: 'MyFileAction!uploadStationFile_mobile'
			,accept: 'image'
			,multiple: true
			,data: {
			json:JSON.stringify( {
			StationId: homeInfo.homeId,
			VideoOrImage: 'image'
			})
			}
			,data:{}
			,auto: false
			,bindAction: '#uploadImgs'
			,choose: function(obj){
			@@ -443,13 +437,17 @@
			obj.preview(function(index, file, result){
			var tr = $(['<tr id="upload-'+ index +'">'
			,'<td><img src="'+result+'">'
			,'<td>'+ file.name +'</td>'
			,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
			,'<td>'
			,'<button class="layui-btn layui-btn-xs imgs-reload layui-hide">重传</button>'
			,'<button class="layui-btn layui-btn-xs layui-btn-danger imgs-delete">删除</button>'
			,'</td>'
			,'</tr>'].join(''));

			// 定义文件名称
			var fileName = 'image&&'+index+'.jpg';

			obj.resetFile(index, file, fileName); //重命名文件名

			//单个重传
			tr.find('.imgs-reload').on('click', function(){
			@@ -466,15 +464,36 @@
			imgsInfo.append(tr);
			});
			}
			,before:function() {
			uploadImgsLoad = layer.load(1);
			}
			,done:function(res) {
			var rs = JSON.parse(res.result);
			if(rs.code == 1) {
			layer.msg('上传成功！');
			,before:function(obj) {
			var isShowLoad = false;
			// 遍历对象查看是否存在文件
			Object.keys(this.files).forEach(function(key) {
			isShowLoad = true;
			});
			if(isShowLoad) {
			uploadImgsLoad = layer.load(1);
			}else {
			layer.msg('上传失败！');
			layer.msg('没有可上传的内容');
			}
			// 设置提交的参数
			this.data.json = JSON.stringify({
			StationId: homeInfo.homeId
			,VideoOrImage: 'image'
			,binfmation: {
			StationId: homeInfo.homeId
			,StationName: $('#homeName').val()
			,latitude: $('#lat').val() // 纬度
			,longitude: $('#lng').val() // 经度
			,Address: $('#addr').val() // 地址
			}
			})
			}
			,allDone: function(obj) {
			console.log(obj);
			if(obj.aborted == 0) {
			layer.msg('上传完成！');
			}else {
			layer.msg('存在'+obj.aborted+'个上传失败,请重新上传！');
			}
			layer.close(uploadImgsLoad);
			}