From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/mobil/iframe/homeinfo.html | 115 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
index 1c3a220..bea7de6 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
@@ -21,7 +21,7 @@
<div class="layui-col-xs3 layui-col-md1 full-height line-height40 t-align-right"></div>
</div>
</div>
- <div class="page-content abs abs-top40 abs-bottom45">
+ <div class="page-content abs abs-top40 abs-bottom60">
<div class="rel-full">
<div class="abs footer-menu-content-show" id="homeInfo">
<div class="rel-full">
@@ -29,30 +29,30 @@
<div class="layui-form-item">
<label class="layui-form-label">缁忓害</label>
<div class="layui-input-block">
- <input type="text" disabled="" name="title" autocomplete="off" class="layui-input layui-bg-gray">
+ <input type="text" disabled="" name="title" autocomplete="off" class="layui-input gray1" id="lng">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">绾害</label>
<div class="layui-input-block">
- <input type="text" disabled="" name="title" autocomplete="off" class="layui-input layui-bg-gray">
+ <input type="text" disabled="" name="title" autocomplete="off" class="layui-input gray1" id="lat">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">鍦板潃淇℃伅</label>
<div class="layui-input-block">
- <textarea class="layui-textarea"></textarea>
+ <textarea class="layui-textarea" id="addr"></textarea>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">鏈烘埧鍚嶇О</label>
<div class="layui-input-block">
- <textarea class="layui-textarea layui-bg-gray" disabled=""></textarea>
+ <textarea class="layui-textarea gray1" disabled="" id="homeName"></textarea>
</div>
</div>
<div class="layui-row">
<div class="layui-col-*-12 t-align-right">
- <button class="layui-btn layui-btn-normal layui-btn-sm">鎻愪氦鏈烘埧淇℃伅</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="addHome">鎻愪氦鏈烘埧淇℃伅</button>
</div>
</div>
</div>
@@ -64,6 +64,7 @@
<div class="layui-row">
<div class="layui-col-12">
<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">
<div class="layui-upload">
@@ -82,12 +83,12 @@
</div>
</div>
<div class="layui-col-12 mrt5">
- <div class="layui-progress layui-progress-big" lay-showpercent="true">
- <div class="layui-progress-bar" lay-percent="70%"></div>
+ <div class="layui-progress layui-progress-big" lay-showpercent="yes" lay-filter="uploadProgress">
+ <div class="layui-progress-bar" lay-percent="0%"></div>
</div>
</div>
<div class="layui-col-12 t-align-right mrt5">
- <button class="layui-btn layui-btn-normal layui-btn-sm">瑙嗛涓婁紶</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
</div>
</div>
</div>
@@ -98,6 +99,7 @@
<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>
</div>
<div class="layui-col-12">
<div class="layui-upload">
@@ -117,46 +119,67 @@
</div>
</div>
<div class="layui-col-12 t-align-right mrt5">
- <button class="layui-btn layui-btn-normal layui-btn-sm">鍥剧墖涓婁紶</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadImgs">鍥剧墖涓婁紶</button>
</div>
</div>
</div>
</div>
</div>
</div>
- <div id="pageFooter" class="page-footer" style="position:absolute; bottom: 0;width: 100%; height: 44px; background-color: #FFFFFF; border-top: 1px solid #eeeeee">
+ <div id="pageFooter" class="page-footer" style="position:absolute; bottom: 0;width: 100%; height: 59px; background-color: #FFFFFF; border-top: 1px solid #eeeeee">
<div class="layui-row">
<div class="layui-col-xs4 layui-col-md4">
<div class="hdw-btn">
- <a href="javascript:;" class="this-active h44" data-href="#homeInfo"><i class="fa fa-home mrt4"></i><br><span>鏈烘埧淇℃伅</span></a>
+ <a href="javascript:;" class="this-active h59" data-href="#homeInfo"><i class="fa fa-home mrt8 mrb4"></i><br><span>鏈烘埧淇℃伅</span></a>
</div>
</div>
<div class="layui-col-xs4 layui-col-md4">
<div class="hdw-btn">
- <a href="javascript:;" class="h44" data-href="#videoUpload"><i class="fa fa-video-camera mrt4"></i><br><span>瑙嗛涓婁紶</span></a>
+ <a href="javascript:;" class="h59" data-href="#videoUpload"><i class="fa fa-video-camera mrt8 mrb4"></i><br><span>瑙嗛涓婁紶</span></a>
</div>
</div>
<div class="layui-col-xs4 layui-col-md4">
<div class="hdw-btn">
- <a href="javascript:;" class="h44" data-href="#imgUpload"><i class="fa fa-image mrt4"></i><br><span>鍥剧墖涓婁紶</span></a>
+ <a href="javascript:;" class="h59" data-href="#imgUpload"><i class="fa fa-image mrt8 mrb4"></i><br><span>鍥剧墖涓婁紶</span></a>
</div>
</div>
</div>
</div>
</div>
+ <input type="hidden" id="homeId">
<script type="text/html" id="homeInfoTpl">
</script>
<script src="../js/jquery-1.8.3.js"></script>
- <script src="../src/layui.js"></script>
+ <script src="../../src/layui.js"></script>
<script src="../app/js/common.js"></script>
+ <script src="../../pages/js/GPS.js"></script>
<script type="text/javascript">
// layui妯″潡
- layui.use(['layer', 'laytpl', 'form', 'upload'], function() {
+ layui.use(['layer', 'laytpl', 'form', 'upload', 'element'], function() {
var layer = layui.layer; // 鑾峰彇layer妯″潡
var laytpl = layui.laytpl; // 鑾峰彇laytpl妯″潡
var form = layui.form; // 鑾峰彇form妯″潡
var upload = layui.upload; // 鑾峰彇upload妯″潡
+ var element = layui.element; // 鑾峰彇element妯″潡
+
+ var homeInfo = parent.$('#homeInfoIframe').data('homeInfo');
+ setHomeInfo(homeInfo);
+ // 璁剧疆鏈烘埧淇℃伅鐨勫唴瀹�
+ function setHomeInfo(data) {
+ $('#lng').val(data.lng); // 缁忓害
+ $('#lat').val(data.lat); // 绾害
+ $('#addr').val(data.addr); // 鍦板潃
+ $('#homeName').val(data.homeName); // 鏈烘埧鍚嶇О
+ $('#homeId').val(data.homeId);
+ console.log(data);
+ }
+
+ // 鐐瑰嚮璁剧疆鏈烘埧
+ $('#addHome').click(function() {
+ getAddHomeInfo(homeInfo);
+ });
+
// 鍏抽棴form
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -173,11 +196,14 @@
elem: '#videoSelect'
,url: 'MyFileAction!uploadStationFile'
,auto: false
- ,bindAction: '#upload'
+ ,bindAction: '#uploadVideo'
,multiple: true
,number: 1
,data: {
-
+ json:JSON.stringify( {
+ StationId: homeInfo.homeId,
+ VideoOrImage: 'video'
+ })
}
,accept: 'video' //瑙嗛
,choose: function(obj) {
@@ -207,10 +233,14 @@
});
}
,progress: function(e , percent) {
-
+ console.log(percent);
+ element.progress('uploadProgress',percent + '%');
}
,done: function(res, index, upload) {
-
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ element.progress('uploadProgress', '涓婁紶鎴愬姛锛�');
+ }
}
});
@@ -223,7 +253,10 @@
,accept: 'image'
,multiple: true
,data: {
-
+ json:JSON.stringify( {
+ StationId: homeInfo.homeId,
+ VideoOrImage: 'image'
+ })
}
,auto: false
,bindAction: '#uploadImgs'
@@ -264,13 +297,51 @@
var rs = JSON.parse(res.result);
if(rs.code == 1) {
layer.msg('涓婁紶鎴愬姛锛�');
- searchCarouselImgs(sid, homeEnvImgs, imgCarouselopts, imgsContainer);
}else {
layer.msg('涓婁紶澶辫触锛�');
}
layer.close(uploadImgsLoad);
}
});
+
+
+ // 鑾峰彇娣诲姞鏈烘埧鐨勬満鎴夸俊鎭�
+ function getAddHomeInfo(data) {
+ var lng = data.lng; // 鑾峰彇缁忓害
+ var lat = data.lat; // 鑾峰彇绾害
+ var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
+ var addr = $('#addr').val(); // 鑾峰彇鍦板潃
+ var homeName = data.homeName; // 鏈烘埧鍚嶇О
+ var homeId = data.homeId; // 鏈烘埧ID
+ if(homeId !=0 && confirm("纭灏�"+homeName+"鏈烘埧璁剧疆鍒拌浣嶇疆鍚楋紵")){
+ var temp = {
+ StationId:homeId, //鏈烘埧缂栧彿
+ StationName:homeName, //鏈烘埧鍚嶇О
+ Address:addr, //鏈烘埧鐗╃悊淇℃伅
+ longitude: wgsPoint.lon, // 缁忓害
+ latitude: wgsPoint.lat, // 绾害
+ information:"", //澶囨敞
+ };
+ var json = JSON.stringify(temp);
+ //console.info(json);
+ $.ajax({
+ type: "post",
+ url: "BattMap_informationAction!add",
+ async:true,
+ dataType:'text',
+ data:"json="+json,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ if(model.code == 1){
+ alert("璁剧疆鎴愬姛");
+ }else{
+ alert("璁剧疆澶辫触");
+ }
+ }
+ });
+ }
+ }
});
</script>
</body>
--
Gitblit v1.9.1