设备信息详情、管道详情

gassafety-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -74,13 +74,13 @@ public class TDeviceInfo extends BaseEntity
     private String phone;
 
     /** 安装时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installationTime;
 
     /** 最后巡检时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date inspectionTime;
 
     /** 是否删除 */

gassafety-system/src/main/java/com/zehong/system/domain/TPipe.java

@@ -57,13 +57,13 @@ public class TPipe extends BaseEntity
     private String iconUrl;
 
     /** 安装时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installationTime;
 
     /** 最后巡检时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date inspectionTime;
 
     /** 是否删除 */

gassafety-web/src/views/device/deviceInfoDetail/index.vue

@@ -32,7 +32,7 @@
             <el-form-item label="设备型号:" prop="deviceModel">
               <font>{{form.deviceModel}}</font>
             </el-form-item>
-            <el-form-item label="物联网编号:" prop="iotNo" v-if="form.iotNo != null || form.iotNo != ''">
+            <el-form-item label="物联网编号:" prop="iotNo">
               <font>{{form.iotNo}}</font>
             </el-form-item>
             <el-form-item label="联系人:" prop="linkman">
@@ -70,7 +70,7 @@
           </el-form>
         </div>
 
-        <div id="marbox" style="width: 700px;height: 400px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
+        <div id="marbox" style="width: 700px;height: 390px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
           <div style="width: 100%;height: 100%" id="container"></div>
         </div>
       </div>
@@ -106,12 +106,9 @@
       this.gaoMap = gaoMap;
     },
     methods: {
-      /** 获取巡检计划详情 */
       getDetail (){
         getDeviceInfo(this.deviceId).then(response =>{
           this.form = response.data;
-          console.log("this.form",this.form)
-
           this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
           this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
         });

gassafety-web/src/views/device/pipeDetail/index.vue

@@ -56,7 +56,7 @@
           </el-form>
         </div>
 
-        <div id="marbox" style="width: 700px;height: 400px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
+        <div id="marbox" style="width: 700px;height: 390px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
           <div style="width: 100%;height: 100%" id="container"></div>
         </div>
       </div>
@@ -92,12 +92,9 @@
       this.gaoMap = gaoMap;
     },
     methods: {
-      /** 获取巡检计划详情 */
       getDetail (){
         getPipe(this.pipeId).then(response =>{
           this.form = response.data;
-          console.log("this.form",this.form)
-
           this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
           this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
         });