From 1433a1520db13d09108c1a086f953145d91233e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 10:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/webapp/static/home.js | 55 ++++++++++++---------------
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 4 +-
ManagementOKTravel/guns-admin/src/main/webapp/static/js/track2.js | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html | 42 ++------------------
4 files changed, 32 insertions(+), 71 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index 4dc5037..584319b 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -110,8 +110,8 @@
.eq("userId", tOrderTaxi.get("driverId"))
.eq("state", 2)
.eq("type", 1)
- .eq("userType", 6)
- .eq("payState", 2)
+ .eq("userType", 2)
+ .eq("orderType", 6)
.last("LIMIT 1"));
model.addAttribute("companyMoney",tPubTransactionDetails.getMoney());
model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney()));
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
index dcc1ed2..aeea124 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -9,43 +9,6 @@
margin: 0;
font-family: "微软雅黑";
}
- .info {
- z-index: 999;
- width: auto;
- min-width: 22rem;
- padding: .75rem 1.25rem;
- margin-left: 1.25rem;
- position: fixed;
- top: 1rem;
- background-color: rgba(265, 265, 265, 0.9);
- border-radius: .25rem;
- font-size: 14px;
- color: #666;
- box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.3);
- }
- #zoominput {
- height: 24px;
- width: 80px;
- padding-left: 8px;
- }
- #change-btn {
- height: 30px;
- background: #5679ea;
- border: 0;
- padding: 0 10px 0 10px;
- margin: 10px 8px 0 0;
- cursor: pointer;
- border-radius: 2px;
- color: #fff;
- font-size: 14px;
- }
- .amap-logo{
- display: none;
- opacity:0 !important;
- }
- .amap-copyright {
- opacity:0;
- }
</style>
<div class="container-fluid" style="padding: 0 !important;">
<div class="row">
@@ -248,6 +211,11 @@
</div>
</div>
</div>
+<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=t5pcBZB5G4D11G9MzHq8Kik7jqzlTrAL"></script>
+<script src="${ctxPath}/static/js/track1.js"></script>
+<script src="${ctxPath}/static/js/track2.js"></script>
+<script src="${ctxPath}/static/js/track3.js"></script>
+<script type="text/javascript" src="//mapopen-pub-jsapi.bj.bcebos.com/jsapiGlgeo/track.js"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/home.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/home.js
index 1fc4d4c..7b799c1 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/home.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/home.js
@@ -9,7 +9,8 @@
layerIndex: -1,
businessType:null,//存储企业信息
};
-
+var map = new BMapGL.Map('container'); // 创建Map实例
+map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
/**
* 初始化表格的列
@@ -59,14 +60,13 @@
* 点击添加信息
*/
Home.openNetCarInfo = function (e) {
- var id = e.getExtData()[0];
var index = layer.open({
type: 2,
title: '详细数据',
area: ['770px', '500px'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/home/openNetCarInfo?id=' + id,
+ content: Feng.ctxPath + '/home/openNetCarInfo?id=' + e,
});
this.layerIndex = index;
};
@@ -181,18 +181,19 @@
-var map = new AMap.Map('container',{
- resizeEnable: true,
- zoom:10
-});
+var map = new BMapGL.Map('container');
+var point = new BMapGL.Point(114.322492, 29.841443);
+map.enableScrollWheelZoom(true);
+map.centerAndZoom(point, 13);
-
-var map_ = new AMap.Map('container_',{
- resizeEnable: true,
- mapStyle: 'amap://styles/1de318cbb8d12c02303a22c550b9ccc9',
- zoom:10
-});
-
+// var map_ = new AMap.Map('container_',{
+// resizeEnable: true,
+// mapStyle: 'amap://styles/1de318cbb8d12c02303a22c550b9ccc9',
+// zoom:10
+// });
+var map_ = new BMapGL.Map('container_'); // 创建Map实例
+map_.centerAndZoom(new BMapGL.Point(114.322492, 29.841443), 13); // 初始化地图,设置中心点坐标和地图级别
+map_.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
var mouseTool = new AMap.MouseTool(map);
//监听draw事件可获取画好的覆盖物
var overlays = [];
@@ -354,7 +355,6 @@
companyId: companyId
},
success: function (res) {
- map.remove(markers);
markers = [];
var data = res.driver;
var order = res.order;
@@ -364,28 +364,21 @@
var driverId = driver.id;
d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
if('' != data[i].lon){
- // 创建 AMap.Icon 实例：
- var icon = new AMap.Icon({
- size: new AMap.Size(40, 50), // 图标尺寸
- image: '/static/car.png', // Icon的图像
- // imageOffset: new AMap.Pixel(0, -60), // 图像相对展示区域的偏移量，适于雪碧图等
- imageSize: new AMap.Size(40, 50), // 根据所设置的大小拉伸或压缩图片
+ var point = new BMapGL.Point(data[i].lon, data[i].lat);
+ // 创建小车图标
+ var myIcon = new BMapGL.Icon("/static/car.png", new BMapGL.Size(52, 26));
+ // 创建Marker标注，使用小车图标
+ var marker = new BMapGL.Marker(point, {
+ icon: myIcon
});
-
- var marker = new AMap.Marker({
- position: new AMap.LngLat(data[i].lon, data[i].lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
- offset: new AMap.Pixel(-10, -10),
- icon: icon, // 添加 Icon 实例
- });
- marker.setExtData([driverId])
marker.on('click', function(){
- Home.openNetCarInfo(this);
+ Home.openNetCarInfo(driverId);
});
- markers.push(marker)
+ // markers.push(marker)
+ map.addOverlay(marker);
}
}
$('#netcardriver').html(d);
- map.add(markers);
//订单数据
var zhuanche = order.zhuanche;
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/js/track2.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/js/track2.js
index 8040ac6..b4b0b7d 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/js/track2.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/js/track2.js
@@ -2407,7 +2407,7 @@
if ( source.mimeType === 'image/png' ) {
// Inspect the PNG 'IHDR' chunk to determine whether the image could have an
- // alpha channel. This check is conservative — the image could have an alpha
+ // alpha channel. This check is conservative — the image could have an alpha
// channel with all values == 1, and the indexed type (colorType == 3) only
// sometimes contains alpha.
//
--
Gitblit v1.7.1