Browse Source

设备列表导出图片

develop
gaoguangchao 4 months ago
parent
commit
136011301f
  1. 2
      ruoyi-ui/src/views/deviceManage/device/index.vue
  2. 1
      ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue
  3. 7
      zc-business/src/main/java/com/zc/business/domain/DcDevice.java

2
ruoyi-ui/src/views/deviceManage/device/index.vue

@ -574,7 +574,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('deviceManage/device/export', { this.download('business/device/export', {
...this.queryParams ...this.queryParams
}, `device_${new Date().getTime()}.xlsx`) }, `device_${new Date().getTime()}.xlsx`)
}, },

1
ruoyi-ui/src/views/deviceManage/deviceOnline/index.vue

@ -273,7 +273,6 @@ export default {
}, },
seeLog(deviceId){ seeLog(deviceId){
this.logVisible = true; this.logVisible = true;
this.initQueryDate();
this.logQueryParams.queryDate=formatDate(new Date(),'yyyy-MM-dd'); this.logQueryParams.queryDate=formatDate(new Date(),'yyyy-MM-dd');
this.logQueryParams.deviceId = deviceId; this.logQueryParams.deviceId = deviceId;
this.logQuery(); this.logQuery();

7
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import com.ruoyi.common.annotation.Excel.ColumnType;
import java.util.Date; import java.util.Date;
@ -61,13 +62,13 @@ public class DcDevice {
@Excel(name = "所属网段") @Excel(name = "所属网段")
private String networkSegment; private String networkSegment;
@ApiModelProperty("设备图片") @ApiModelProperty("设备图片")
@Excel(name = "设备图片") @Excel(name = "设备图片",cellType = ColumnType.IMAGE)
private String deviceImg; private String deviceImg;
@ApiModelProperty("安装日期") @ApiModelProperty("安装日期")
@Excel(name = "安装日期") @Excel(name = "安装日期",dateFormat = "yyyy-MM-dd")
private Date installationDate; private Date installationDate;
@ApiModelProperty("生产日期") @ApiModelProperty("生产日期")
@Excel(name = "生产日期") @Excel(name = "生产日期",dateFormat = "yyyy-MM-dd")
private Date productionDate; private Date productionDate;
@ApiModelProperty("使用年限") @ApiModelProperty("使用年限")
@Excel(name = "使用年限") @Excel(name = "使用年限")

Loading…
Cancel
Save