Merge remote-tracking branch 'origin/master_dev'

# Conflicts:
#	src/views/dispatch/Dispatch.vue

@@ -2,13 +2,15 @@ import axios from 'axios'
 import http from "../http";
 import http from "../http";
 
 
 let baseServiceURL = 'wms-server-warehouse'
 let baseServiceURL = 'wms-server-warehouse'
+const serviceName = '/cloud-user-center'
 
 
 
 
 //车辆定位
 //车辆定位
 export const selectVehicle = params => { return axios.get(`${baseServiceURL}/map/location/lastlocation`, { params: params }); };
 export const selectVehicle = params => { return axios.get(`${baseServiceURL}/map/location/lastlocation`, { params: params }); };
 //出任务
 //出任务
 export const insertSelective = params => { return http.post(`${baseServiceURL}/map/location/insertSelective`, params); };
 export const insertSelective = params => { return http.post(`${baseServiceURL}/map/location/insertSelective`, params); };
-
+//获取用户列表
+export const getUserList = params => { return http.post(`${serviceName}/crm/list`,  params) };
 
 
 //车辆轨迹
 //车辆轨迹
 export const historyTrack = params => { return axios.get(`${baseServiceURL}/map/location/historyTrack`, { params: params }); };
 export const historyTrack = params => { return axios.get(`${baseServiceURL}/map/location/historyTrack`, { params: params }); };

@@ -113,6 +113,11 @@
                         // 获取车辆位置信息
                         // 获取车辆位置信息
                         const vehicle = res.data.data.firstVcl;
                         const vehicle = res.data.data.firstVcl;
                         // 在获取车辆位置成功的部分，创建信息窗口或者自定义标记
                         // 在获取车辆位置成功的部分，创建信息窗口或者自定义标记
+
+                        if (vehicle.lon && vehicle.lat) {
+                            const lon = parseFloat(vehicle.lon) / 600000.0; // 将经度字符串转换为数值并除以 600000.0
+                            const lat = parseFloat(vehicle.lat) / 600000.0; // 将纬度字符串转换为数值并除以 600000.0
+                            //const coords = wgs84togcj02(lon, lat);
                             const markerContent = document.createElement('div');
                             const markerContent = document.createElement('div');
                             markerContent.innerHTML = `
                             markerContent.innerHTML = `
                                         <div class="rounded-corner" STYLE="width: 200px;background-color: rgba(255,255,255,0.7);text-align: center">
                                         <div class="rounded-corner" STYLE="width: 200px;background-color: rgba(255,255,255,0.7);text-align: center">
@@ -121,10 +126,6 @@
                                             <p>剩余距离：${vehicle.remainDistance}公里</p >
                                             <p>剩余距离：${vehicle.remainDistance}公里</p >
                                         </div>
                                         </div>
                                     `;
                                     `;
-                        if (vehicle.lon && vehicle.lat) {
-                            const lon = parseFloat(vehicle.lon) / 600000.0; // 将经度字符串转换为数值并除以 600000.0
-                            const lat = parseFloat(vehicle.lat) / 600000.0; // 将纬度字符串转换为数值并除以 600000.0
-                            //const coords = wgs84togcj02(lon, lat);
                             // 添加车辆位置标记
                             // 添加车辆位置标记
                             const marker = new AMap.Marker({
                             const marker = new AMap.Marker({
                                 position: [lon, lat],
                                 position: [lon, lat],