Skip to content

P
property-management
Commit 52dfdd8e by chenjunxiong
Options

Merge remote-tracking branch 'origin/master'

parents c8afcf95 3ecdf92f
Showing with 34 additions and 33 deletions
ant-design-vue-jeecg/src/views/pm/monitoring-device/PmMonitoringDeviceList.vue
...@@ -151,11 +151,11 @@ ...@@ -151,11 +151,11 @@
align:"center", align:"center",
dataIndex: 'place' dataIndex: 'place'
}, },
{ // {
title:'xy值', // title:'xy值',
align:"center", // align:"center",
dataIndex: 'coordinate' // dataIndex: 'coordinate'
}, // },
{ {
title:'生产日期', title:'生产日期',
align:"center", align:"center",
......
ant-design-vue-jeecg/src/views/pm/monitoring-device/modules/PmMonitoringDeviceForm.vue
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<a-input v-model="model.place" placeholder="请输入设备位置" ></a-input> <a-input v-model="model.place" placeholder="请输入设备位置" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="xy值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coordinate"> <!-- <a-form-model-item label="xy值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coordinate">-->
<a-input v-model="model.coordinate" placeholder="请输入xy值" ></a-input> <!-- <a-input v-model="model.coordinate" placeholder="请输入xy值" ></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateOfProduction"> <a-form-model-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateOfProduction">
<j-date placeholder="请选择生产日期" v-model="model.dateOfProduction" style="width: 100%" /> <j-date placeholder="请选择生产日期" v-model="model.dateOfProduction" style="width: 100%" />
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="生产厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer"> <a-form-model-item label="生产厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer">
<j-date placeholder="请选择生产厂商" v-model="model.manufacturer" style="width: 100%" /> <a-input v-model="model.manufacturer" placeholder="请输入生产厂商" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
...@@ -63,21 +63,21 @@ ...@@ -63,21 +63,21 @@
<a-input v-model="model.status" placeholder="请输入状态" ></a-input> <a-input v-model="model.status" placeholder="请输入状态" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="创建人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createUserId"> <!-- <a-form-model-item label="创建人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createUserId">-->
<a-input v-model="model.createUserId" placeholder="请输入创建人Id（sys_user）" ></a-input> <!-- <a-input v-model="model.createUserId" placeholder="请输入创建人Id" ></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="修改人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyUserId"> <!-- <a-form-model-item label="修改人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyUserId">-->
<a-input v-model="model.modifyUserId" placeholder="请输入修改人Id（sys_user）" ></a-input> <!-- <a-input v-model="model.modifyUserId" placeholder="请输入修改人Id（sys_user）" ></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="修改时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyTime"> <!-- <a-form-model-item label="修改时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyTime">-->
<j-date placeholder="请选择修改时间" v-model="model.modifyTime" style="width: 100%" /> <!-- <j-date placeholder="请选择修改时间" v-model="model.modifyTime" style="width: 100%" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
</a-row> </a-row>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
......
jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/entity/PmMonitoringDevice.java
...@@ -79,13 +79,14 @@ public class PmMonitoringDevice implements Serializable { ...@@ -79,13 +79,14 @@ public class PmMonitoringDevice implements Serializable {
@Excel(name = "设备位置", width = 15) @Excel(name = "设备位置", width = 15)
@ApiModelProperty(value = "设备位置") @ApiModelProperty(value = "设备位置")
private String place; private String place;
/**
* xy值 // /**
*/ // * xy值
@Excel(name = "xy值", width = 15) // */
@ApiModelProperty(value = "xy值") // @Excel(name = "xy值", width = 15)
@TableField(typeHandler = Coordinate.TypeHandler.class) // @ApiModelProperty(value = "xy值")
private Coordinate coordinate; // @TableField(typeHandler = Coordinate.TypeHandler.class)
// private Coordinate coordinate;
/** /**
* 生产日期 * 生产日期
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment