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 = "使用年限")