1

src/axios/api.js

@@ -42,3 +42,4 @@ export const getalarmRealQuery = '/api/alarm/real'; //获取车辆设备实时
 export const dispatchFinishQuery = '/api/Dispatch/finish'; //获取智能调度是否完成
 export const apiCpointQuery = '/api/Cpoint'; //获取关键控制点坐标
 export const apiPathmapNavigationQuery = '/api/Pathmap/navigation'; //获取关键控制点坐标
+export const apiManmadesRealCarQuery = '/api/Manmades/RealCar'; //点击车辆小弹框

src/views/MLargeScreen/components/smallWindow/index.vue

@@ -9,19 +9,25 @@
 				<span>车牌号：</span><span style="color: rgb(24,228,240);">{{carnumber}}</span>
 			</div>
 			<div>
-				<span>车辆运行公里数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.mil ? carInformationData2.mil : '无'}}</span>
+				<span>司机：</span><span style="color: rgb(24,228,240);">{{carInformationData2.driver ? carInformationData2.driver : '无'}}</span>
 			</div>
 			<div>
-				<span>车辆运行时长：</span><span style="color: rgb(24,228,240);">{{carInformationData2.runTime ? carInformationData2.runTime : '无'}}</span>
+				<span>车辆运行公里数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.mil ? carInformationData2.mil + 'km' : '无'}}</span>
 			</div>
 			<div>
-				<span>今日装车次数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carNum ? carInformationData2.carNum : '无'}}</span>
+				<span>车辆运行时长：</span><span style="color: rgb(24,228,240);">{{carInformationData2.runTime ? carInformationData2.runTime + '小时' : '无'}}</span>
 			</div>
 			<div>
-				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.status == 0 ? '空闲' : carInformationData2.status == 1 ? '运行中' : '暂无状态'}}</span>
+				<span>今日装车次数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carNum ? carInformationData2.carNum + '次' : '无'}}</span>
 			</div>
-			<div>
-				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carclass ? carInformationData2.carclass : '无'}}</span>
+			<div v-show="carclass == '卡车'">
+				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.weightStatus == 0 ? '空运' : carInformationData2.weightStatus == 1 ? '重运' : carInformationData2.weightStatus == 2 ? '待装' : '暂无状态'}}</span>
+			</div>
+			<div v-show="carclass == '卡车'">
+				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.arearesources ? carInformationData2.arearesources : '无'}}</span>
+			</div>
+			<div v-show="carclass == '铲车'">
+				<span>电铲状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.workStatus == 0 ? '空闲' : carInformationData2.workStatus == 1 ? '忙碌' : '暂无状态'}}</span>
 			</div>
 		</div>
 	</div>
@@ -29,7 +35,7 @@
 
 <script>
 import { httpGet, httpPostForJson, putForJson, httpDelForJson} from "@/common/httpBean.js"
-import {apiManmadesRealQuery} from "@/axios/api.js"
+import {vehicleInformationQuery,apiManmadesRealCarQuery} from "@/axios/api.js"
 
 export default {
 	data() {
@@ -38,16 +44,21 @@ export default {
 			carInformationData2:{},
 			carnumber:'',
 			personalName:'',
+			carclass:'',
 		}
 	},
 	methods: {
 		loadData(carnumber) {
 			this.showDecide = true;
 			this.carnumber = carnumber;
-			//获取实时数据
-			httpGet(apiManmadesRealQuery,{number:this.carnumber}).then((res) => {
-                if(res.length != 0){
-					this.carInformationData2 = res[0];
+			httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res1) => {
+				if(res1.code == 200 && res1.data.totalElements != 0){
+					this.carclass = res1.data.content[0].carclass;
+				}
+			});
+			httpGet(apiManmadesRealCarQuery,{number:this.carnumber}).then((res) => {
+				if(res.code == 200){
+					this.carInformationData2 = res.data[0];
 				}
 			});
 		},

src/views/MLargeScreen/index.vue

@@ -95,10 +95,6 @@ import smallWindow from './components/smallWindow/index.vue' //小窗口车辆
 import mars3dViewerMap from '../../components/mars3d/Map.vue' //地图
 import ElectricQuantity from '../../components/electricity/index.vue' //电池组件
 
-let x_PI = 3.14159265358979324 * 3000.0 / 180.0;
-let PI = 3.1415926535897932384626;
-let a = 6378245.0;
-let ee = 0.00669342162296594323;
 export default {
 	components: { 
 		startOrderReceiving,
@@ -136,6 +132,11 @@ export default {
 			batteryEnegy:0,
 			//控制点数据
 			controlPointData:[],
+			//暂存经纬度
+			navigatorXY:{
+				x:0,
+				y:0,
+			}
 		}
 	},
 	mounted(){
@@ -163,12 +164,6 @@ export default {
 					if(res.data.totalElements == 0){
 						return
 					}else{
-						//判断该车是否在行驶状态
-						if(res.data.content[0].workStatus == 0){
-							this.leftBtnDisable = true;
-						}else{
-							this.leftBtnDisable = false;
-						}
 						//获取该车报警记录接口
 						httpGet(getalarmRealQuery,{name:res.data.content[0].equipmentName}).then((res1) => {
 							if(res1.code == 200){
@@ -281,10 +276,16 @@ export default {
                     function(position) {
 						let LoaObj1 = {};
 						let LoaObj1xy = {};
+						//判断该车是否在行驶状态
+						if(that.getDistanceIndex(that.navigatorXY.y,that.navigatorXY.x,position.coords.latitude,position.coords.longitude) <= 1){
+							that.leftBtnDisable = true;
+						}else{
+							that.leftBtnDisable = false;
+						}
 						LoaObj1xy.x = position.coords.longitude;
 						LoaObj1xy.y = position.coords.latitude;
-						// LoaObj1xy.x = that.wgs84togcj02(position.coords.longitude, position.coords.latitude)[0];
-						// LoaObj1xy.y = that.wgs84togcj02(position.coords.longitude, position.coords.latitude)[1];
+						that.navigatorXY.x = position.coords.longitude;
+						that.navigatorXY.y = position.coords.latitude;
 						LoaObj1.gndRate = '';
 						LoaObj1.location = LoaObj1xy;
 						LoaObj1.name = that.equipmentName;
@@ -305,53 +306,6 @@ export default {
                 );
             }
 		},
-		/**
-		 * WGS84转GCj02
-		 * @param lng
-		 * @param lat
-		 * @returns {*[]}
-		 */
-		wgs84togcj02(lng, lat) { 
-			if (this.out_of_china(lng, lat)) {
-				return [lng, lat]
-			}
-			else {
-				let dlat = this.transformlat(lng - 105.0, lat - 35.0);
-				let dlng = this.transformlng(lng - 105.0, lat - 35.0);
-				let radlat = lat / 180.0 * PI;
-				let magic = Math.sin(radlat);
-				magic = 1 - ee * magic * magic;
-				let sqrtmagic = Math.sqrt(magic);
-				dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
-				dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
-				let mglat = lat + dlat;
-				let mglng = lng + dlng;
-				return [mglng, mglat]
-			}
-		},
-		/**
-		 * 判断是否在国内，不在国内则不做偏移
-		 * @param lng
-		 * @param lat
-		 * @returns {boolean}
-		 */
-		out_of_china(lng, lat) {
-			return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
-		},
-		transformlat(lng, lat) {
-			let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
-			ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
-			ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
-			ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
-			return ret
-		},
-		transformlng(lng, lat) {
-			let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
-			ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
-			ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
-			ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
-			return ret
-		},
 		//接受派单
 		IntelligentDisFn(){
 			if(this.orderReceiving){
@@ -631,6 +585,17 @@ export default {
 				this.$refs.mars3dViewerMapMethod.addArrowGraphic3(boo);
 			}
 		},
+		//根据两个经纬度计算距离
+		getDistanceIndex(lat1, lng1, lat2, lng2) {
+			var radLat1 = lat1 * Math.PI / 180.0;
+			var radLat2 = lat2 * Math.PI / 180.0;
+			var a = radLat1 - radLat2;
+			var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+			var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+			s = s * 6378.137 // EARTH_RADIUS;
+			s = Math.round(s * 10000) / 10000 * 1000;
+			return s
+		},
 	},
     beforeDestroy(){
 		this.$refs.voiceApplicationMethod.xintiaoCloseFn();