Skip to content

S
SuperMan
Commit 8d4c274b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent dfb3cddd
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 210 deletions
index.html
View file @ 8d4c274b
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
<!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> --> <!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> -->
<script type="text/javascript" src="static/MarkerClusterer.js"></script> <script type="text/javascript" src="static/MarkerClusterer.js"></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&language=zh-CN"></script>
<title>四川和平国际旅行社</title> <title>四川和平国际旅行社</title>
</head> </head>
<body> <body>
......
src/assets/utils/googleMap.js
View file @ 8d4c274b
/** /**
* Created by Administrator on 2018/7/17. * Created by Administrator on 2018/7/17.
*/ */
...@@ -35,8 +34,7 @@ var googleMap = { ...@@ -35,8 +34,7 @@ var googleMap = {
googleMap.initMap(); googleMap.initMap();
if (googleMap.defaultAddress == "") { if (googleMap.defaultAddress == "") {
googleMap.initMapFirst(); googleMap.initMapFirst();
} } else {
else {
googleMap.searchAddress(); googleMap.searchAddress();
} }
googleMap.callback = callback; googleMap.callback = callback;
...@@ -57,7 +55,8 @@ var googleMap = { ...@@ -57,7 +55,8 @@ var googleMap = {
var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng); var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng);
if (data.length > 0) { if (data.length > 0) {
googleMap.map = new google.maps.Map(googleMap.map_id, { googleMap.map = new google.maps.Map(googleMap.map_id, {
zoom: 14, center: LatLng zoom: 14,
center: LatLng
}); });
} }
} }
...@@ -90,9 +89,17 @@ var googleMap = { ...@@ -90,9 +89,17 @@ var googleMap = {
if (googleMap.marker) { if (googleMap.marker) {
googleMap.marker.setMap(null); googleMap.marker.setMap(null);
} }
var imageUrl = googleMap.imageDomain + "/static/img/position_red.png"; var imageUrl = {};
if (isCallBack == 1) { if (isCallBack == 1) {
imageUrl = googleMap.imageDomain + "/static/img/position_blue.png"; imageUrl = {
url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
scaledSize: new google.maps.Size(30, 40),
}
} else {
imageUrl = {
url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
scaledSize: new google.maps.Size(30, 40),
}
} }
googleMap.marker = new google.maps.Marker({ googleMap.marker = new google.maps.Marker({
title: address, title: address,
...@@ -129,16 +136,20 @@ var googleMap = { ...@@ -129,16 +136,20 @@ var googleMap = {
}, },
searchAddress: function () { searchAddress: function () {
var address = googleMap.search_id.value; var address = googleMap.search_id.value;
googleMap.geocoder.geocode({ 'address': address }, function (results, status) { googleMap.geocoder.geocode({
'address': address
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) { if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results,1); googleMap.getAddress(results, 1);
} }
}); });
}, },
placeMarker: function (location) { placeMarker: function (location) {
//地图的点击事件，根据点击的点获取经度，纬度和地址信息 //地图的点击事件，根据点击的点获取经度，纬度和地址信息
if (googleMap.geocoder) { if (googleMap.geocoder) {
googleMap.geocoder.geocode({ 'location': location }, function (results, status) { googleMap.geocoder.geocode({
'location': location
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) { if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results, 1); googleMap.getAddress(results, 1);
} }
...@@ -178,7 +189,10 @@ var googleMap = { ...@@ -178,7 +189,10 @@ var googleMap = {
let _dataList = JSON.parse(JSON.stringify(dataList)); let _dataList = JSON.parse(JSON.stringify(dataList));
let lat = parseFloat(_dataList[0].lat); let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng); let lng = parseFloat(_dataList[0].lng);
let center = {lng: lng, lat: lat} let center = {
lng: lng,
lat: lat
}
//创建地图实例，zoom是缩放比例 //创建地图实例，zoom是缩放比例
_this.map = new google.maps.Map(document.getElementById('map_canvas'), { _this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7, zoom: 7,
...@@ -188,18 +202,18 @@ var googleMap = { ...@@ -188,18 +202,18 @@ var googleMap = {
_this.directionsDisplay.setMap(_this.map); _this.directionsDisplay.setMap(_this.map);
googleMap.calcRoute(_dataList, _this) googleMap.calcRoute(_dataList, _this)
}, },
calcRoute: function(_dataList, _this) { // 创建路径规划 calcRoute: function (_dataList, _this) { // 创建路径规划
// 分解数据 获得起 止 以及中间数据 // 分解数据 获得起 止 以及中间数据
let lat = parseFloat(_dataList[0].lat); let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng); let lng = parseFloat(_dataList[0].lng);
let elat = parseFloat(_dataList[_dataList.length-1].lat); let elat = parseFloat(_dataList[_dataList.length - 1].lat);
let elng = parseFloat(_dataList[_dataList.length-1].lng); let elng = parseFloat(_dataList[_dataList.length - 1].lng);
let start = lat + ',' + lng; let start = lat + ',' + lng;
let end = elat + ',' + elng; let end = elat + ',' + elng;
let waypoints = []; let waypoints = [];
if (_dataList.length > 2) { if (_dataList.length > 2) {
_dataList.forEach((x, index) => { _dataList.forEach((x, index) => {
if (index >= 1 && index !== (_dataList.length-1)) { if (index >= 1 && index !== (_dataList.length - 1)) {
let obj = { let obj = {
location: x.lat + ',' + x.lng location: x.lat + ',' + x.lng
}; };
...@@ -208,8 +222,8 @@ var googleMap = { ...@@ -208,8 +222,8 @@ var googleMap = {
}); });
} }
let request = { // 组装连线数据 let request = { // 组装连线数据
origin:start, // 起 origin: start, // 起
destination:end, // 止 destination: end, // 止
travelMode: google.maps.TravelMode.DRIVING, travelMode: google.maps.TravelMode.DRIVING,
// waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据 // waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据
}; };
...@@ -217,7 +231,7 @@ var googleMap = { ...@@ -217,7 +231,7 @@ var googleMap = {
request.waypoints = waypoints request.waypoints = waypoints
} }
_this.directionsService.route(request, function(result, status) { _this.directionsService.route(request, function (result, status) {
if (status == google.maps.DirectionsStatus.OK) { if (status == google.maps.DirectionsStatus.OK) {
_this.directionsDisplay.setDirections(result); _this.directionsDisplay.setDirections(result);
} }
......
src/plug/index.js
View file @ 8d4c274b
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
domainUrl = "http://192.168.2.66:8025"; domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
...@@ -143,9 +143,9 @@ export default { ...@@ -143,9 +143,9 @@ export default {
//SocketUrl //SocketUrl
WebSocketUrl: "ws://192.168.1.110:8080?account=", WebSocketUrl: "ws://192.168.1.110:8080?account=",
//google地图Url //google地图Url
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN", GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&sensor=false&language=zh-CN",
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com", GoogleMapImageUrl: "http://imgfile.oytour.com",
//上传站点 //上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点 //文件站点
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment