no message

serverConfig.xml

@@ -50,12 +50,9 @@
         <token>09a98bc555474e058ef90b6cc6e23638</token>
     </mapView>
     <!-- 图片地址 这里填本机地址 -->
-<<<<<<< HEAD
-    <imagePath>192.168.0.105</imagePath>
-=======
+    <!-- <imagePath>192.168.0.105</imagePath> -->
     <!-- <imagePath>192.168.0.247</imagePath> -->
     <imagePath>127.0.0.1</imagePath>
->>>>>>> 1f5d438964227535959a5ab3bd511e2d1366772e
     <!-- 地图中心点 -->
     <mapCenter>
         <lng>121.183574</lng>

src/biz/jgfwnl/data.ts

@@ -204,7 +204,6 @@ export async function carInfo(req, res) {
         车辆违规列表.push([positionTime, alertTypeStr, alertDurationStr, `${velocity}公里/小时`]);
     });
 
-    
     let 今日里程;
     let 累计里程;
     let 今日时长;
@@ -212,10 +211,10 @@ export async function carInfo(req, res) {
     vehicleLocData.forEach( info => {
         let {vin, daymileage, dayduration, totalMileage, totalDuration} = info;
         if (vin == carId) {
-            今日里程 = Math.floor(daymileage);
-            今日时长 = Math.floor(dayduration/3600);
-            累计里程 = Math.floor(totalMileage);
-            累计时长 = Math.floor(totalDuration/3600);
+            今日里程 = Math.ceil(daymileage);
+            今日时长 = Math.ceil(dayduration/3600*10)/10;
+            累计里程 = Math.ceil(totalMileage);
+            累计时长 = Math.ceil(totalDuration/3600*10)/10;
         }
     })