xiugaibufen

zhc4dev
wangjiadong 2 years ago
parent 08133e7153
commit 3670bdce3b
  1. 4
      ant-design-vue-jeecg/src/views/sensor/SensorList.vue
  2. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/sensor/entity/Sensor.java

@ -172,7 +172,7 @@
{ {
title:'工位', title:'工位',
align:"center", align:"center",
dataIndex: 'stationId' dataIndex: 'stationId_dictText'
}, },
{ {
title:'进出标记', title:'进出标记',
@ -194,7 +194,7 @@
deleteBatch: "/sensor/sensor/deleteBatch", deleteBatch: "/sensor/sensor/deleteBatch",
exportXlsUrl: "/sensor/sensor/exportXls", exportXlsUrl: "/sensor/sensor/exportXls",
importExcelUrl: "sensor/sensor/importExcel", importExcelUrl: "sensor/sensor/importExcel",
}, },
dictOptions:{}, dictOptions:{},
superFieldList:[], superFieldList:[],

@ -71,6 +71,7 @@ public class Sensor implements Serializable {
private String sensorIp; private String sensorIp;
/**工位*/ /**工位*/
@Excel(name = "工位", width = 15) @Excel(name = "工位", width = 15)
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
@ApiModelProperty(value = "工位") @ApiModelProperty(value = "工位")
private String stationId; private String stationId;
/**工位*/ /**工位*/

Loading…
Cancel
Save