Pre Merge pull request !43 from 阿斌/N/A

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/service/bean/GPSMsgInfo.java

@@ -1,7 +1,6 @@
 package com.genersoft.iot.vmp.service.bean;
 
 import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
-import com.genersoft.iot.vmp.utils.DateUtil;
 import lombok.Data;
 
 @Data
@@ -62,7 +61,7 @@ public class GPSMsgInfo {
         gpsMsgInfo.setLat(mobilePosition.getLatitude());
         gpsMsgInfo.setSpeed(mobilePosition.getSpeed());
         gpsMsgInfo.setDirection(mobilePosition.getDirection());
-        gpsMsgInfo.setTime(DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
+        gpsMsgInfo.setTime(mobilePosition.getTime());
         return gpsMsgInfo;
     }
 }

web/src/views/map/index.vue

@@ -89,7 +89,7 @@
           <div class="infobox-content" v-if="channel">
             <el-descriptions class="margin-top" :title="channel.gbName" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
               <el-descriptions-item label="编号" >{{channel.gbDeviceId}}</el-descriptions-item>
-              <el-descriptions-item label="生产厂商">{{channel.gbManufacture}}</el-descriptions-item>
+              <el-descriptions-item label="生产厂商">{{channel.gbManufacturer}}</el-descriptions-item>
               <el-descriptions-item label="安装地址" >{{channel.gbAddress == null?'未知': channel.gbAddress}}</el-descriptions-item>
             </el-descriptions>
             <div style="padding-top: 10px; margin: 0 auto; width: fit-content;">