From 136011301fa5286fd038ca140d6541e2ed66b566 Mon Sep 17 00:00:00 2001
From: gaoguangchao <443960933@qq.com>
Date: Sat, 27 Jul 2024 14:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/deviceManage/device/index.vue           | 2 +-
 ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue     | 1 -
 .../src/main/java/com/zc/business/domain/DcDevice.java     | 7 ++++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/deviceManage/device/index.vue b/ruoyi-ui/src/views/deviceManage/device/index.vue
index c60292a0..553a6f5f 100644
--- a/ruoyi-ui/src/views/deviceManage/device/index.vue
+++ b/ruoyi-ui/src/views/deviceManage/device/index.vue
@@ -574,7 +574,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('deviceManage/device/export', {
+      this.download('business/device/export', {
         ...this.queryParams
       }, `device_${new Date().getTime()}.xlsx`)
     },
diff --git a/ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue b/ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue
index 4c4ee0aa..7d70ea82 100644
--- a/ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue
+++ b/ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue
@@ -273,7 +273,6 @@ export default {
     },
     seeLog(deviceId){
       this.logVisible = true;
-      this.initQueryDate();
       this.logQueryParams.queryDate=formatDate(new Date(),'yyyy-MM-dd');
       this.logQueryParams.deviceId = deviceId;
       this.logQuery();
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
index 1ac7cf25..668c6835 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 
 import java.util.Date;
 
@@ -61,13 +62,13 @@ public class DcDevice {
     @Excel(name = "所属网段")
     private String networkSegment;
     @ApiModelProperty("设备图片")
-    @Excel(name = "设备图片")
+    @Excel(name = "设备图片",cellType = ColumnType.IMAGE)
     private String deviceImg;
     @ApiModelProperty("安装日期")
-    @Excel(name = "安装日期")
+    @Excel(name = "安装日期",dateFormat = "yyyy-MM-dd")
     private Date installationDate;
     @ApiModelProperty("生产日期")
-    @Excel(name = "生产日期")
+    @Excel(name = "生产日期",dateFormat = "yyyy-MM-dd")
     private Date productionDate;
     @ApiModelProperty("使用年限")
     @Excel(name = "使用年限")