Skip to content

H
huaxin-rq
Commit 7123b91e authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

居民壁挂炉及燃气表信息添加

parent 0aadbcea
Show whitespace changes
Inline Side-by-side
Showing with 320 additions and 4 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TUser.java
View file @ 7123b91e
...@@ -140,6 +140,50 @@ public class TUser extends BaseEntity ...@@ -140,6 +140,50 @@ public class TUser extends BaseEntity
private String inspectLatitude; private String inspectLatitude;
/** 壁挂炉安装年份 */
@Excel(name = "壁挂炉安装年份")
private String boilerInstallYear;
/** 壁挂炉品牌 */
@Excel(name = "壁挂炉品牌")
private String boilerBrand;
/** 壁挂炉型号 */
@Excel(name = "壁挂炉型号")
private String boilerModel;
/** 壁挂炉出厂日期 */
@Excel(name = "壁挂炉出厂日期")
private String boilerProduceDate;
/** 壁挂炉出厂批次 */
@Excel(name = "壁挂炉出厂批次")
private String boilerProduceBatch;
/** 燃气表报警状态:0.正常 1.欠压 2.磁场干扰 3.拆表 */
@Excel(name = "燃气表报警状态",dictType = "t_gas_meter_alarm_status")
private String meterAlarmStatus;
/** 燃气表阀门状态: 0.开启 1.关闭 2.未使用 */
@Excel(name = "燃气表阀门状态",dictType = "t_gas_meter_value_status")
private String meterValueStatus;
/** 燃气表使用年限 */
@Excel(name = "燃气表使用年限")
private String meterUseLimit;
/** 燃气表计量方式: 0.容积式 1.速度式 */
@Excel(name = "燃气表计量方式",dictType = "t_gas_meter_measure\u200C_method")
private String measure‌Method;
/** 燃气表改造年份 */
@Excel(name = "燃气表改造年份")
private String reformYear;
/** 燃气表改造批次 */
@Excel(name = "燃气表改造批次")
private String reformBatch;
public String getMeternum() { public String getMeternum() {
return meternum; return meternum;
...@@ -463,6 +507,94 @@ public class TUser extends BaseEntity ...@@ -463,6 +507,94 @@ public class TUser extends BaseEntity
this.inspectLatitude = inspectLatitude; this.inspectLatitude = inspectLatitude;
} }
public String getBoilerInstallYear() {
return boilerInstallYear;
}
public void setBoilerInstallYear(String boilerInstallYear) {
this.boilerInstallYear = boilerInstallYear;
}
public String getBoilerBrand() {
return boilerBrand;
}
public void setBoilerBrand(String boilerBrand) {
this.boilerBrand = boilerBrand;
}
public String getBoilerModel() {
return boilerModel;
}
public void setBoilerModel(String boilerModel) {
this.boilerModel = boilerModel;
}
public String getBoilerProduceDate() {
return boilerProduceDate;
}
public void setBoilerProduceDate(String boilerProduceDate) {
this.boilerProduceDate = boilerProduceDate;
}
public String getBoilerProduceBatch() {
return boilerProduceBatch;
}
public void setBoilerProduceBatch(String boilerProduceBatch) {
this.boilerProduceBatch = boilerProduceBatch;
}
public String getMeterAlarmStatus() {
return meterAlarmStatus;
}
public void setMeterAlarmStatus(String meterAlarmStatus) {
this.meterAlarmStatus = meterAlarmStatus;
}
public String getMeterValueStatus() {
return meterValueStatus;
}
public void setMeterValueStatus(String meterValueStatus) {
this.meterValueStatus = meterValueStatus;
}
public String getMeterUseLimit() {
return meterUseLimit;
}
public void setMeterUseLimit(String meterUseLimit) {
this.meterUseLimit = meterUseLimit;
}
public String getMeasure‌Method() {
return measure‌Method;
}
public void setMeasure‌Method(String measure‌Method) {
this.measure‌Method = measure‌Method;
}
public String getReformYear() {
return reformYear;
}
public void setReformYear(String reformYear) {
this.reformYear = reformYear;
}
public String getReformBatch() {
return reformBatch;
}
public void setReformBatch(String reformBatch) {
this.reformBatch = reformBatch;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
huaxin-system/src/main/resources/mapper/system/TUserMapper.xml
View file @ 7123b91e
...@@ -33,6 +33,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,6 +33,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="taskType" column="task_type" /> <result property="taskType" column="task_type" />
<result property="imgurl" column="imgurl" /> <result property="imgurl" column="imgurl" />
<result property="boilerInstallYear" column="boiler_install_year" />
<result property="boilerBrand" column="boiler_brand" />
<result property="boilerModel" column="boiler_model" />
<result property="boilerProduceDate" column="boiler_produce_date" />
<result property="boilerProduceBatch" column="boiler_produce_batch" />
<result property="meterAlarmStatus" column="meter_alarm_status" />
<result property="meterValueStatus" column="meter_value_status" />
<result property="meterUseLimit" column="meter_use_limit" />
<result property="measure‌Method" column="measure‌_method" />
<result property="reformYear" column="reform_year" />
<result property="reformBatch" column="reform_batch" />
</resultMap> </resultMap>
<sql id="selectTUserVo"> <sql id="selectTUserVo">
...@@ -80,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -80,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="meterCompany != null and meterCompany != ''"> and u.meter_company = #{meterCompany}</if> <if test="meterCompany != null and meterCompany != ''"> and u.meter_company = #{meterCompany}</if>
<if test="meterType != null and meterType != ''"> and u.meter_type = #{meterType}</if> <if test="meterType != null and meterType != ''"> and u.meter_type = #{meterType}</if>
<if test="meternum != null and meternum != ''"> and u.meternum = #{meternum}</if> <if test="meternum != null and meternum != ''"> and u.meternum = #{meternum}</if>
<if test="boilerBrand != null and boilerBrand != ''"> and boiler_brand = #{boilerBrand}</if>
<if test="reformYear != null and reformYear != ''"> and reform_year = #{reformYear}</if>
</where> </where>
<if test="selectFrom==1"> <if test="selectFrom==1">
order by tp.status order by tp.status
...@@ -125,6 +138,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -125,6 +138,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imgurl != null">imgurl,</if> <if test="imgurl != null">imgurl,</if>
<if test="position != null">`position`,</if> <if test="position != null">`position`,</if>
<if test="taskType != null">task_type,</if> <if test="taskType != null">task_type,</if>
<if test="boilerInstallYear != null">boiler_install_year,</if>
<if test="boilerBrand != null">boiler_brand,</if>
<if test="boilerModel != null">boiler_model,</if>
<if test="boilerProduceDate != null">boiler_produce_date,</if>
<if test="boilerProduceBatch != null">boiler_produce_batch,</if>
<if test="meterAlarmStatus != null">meter_alarm_status,</if>
<if test="meterValueStatus != null">meter_value_status,</if>
<if test="meterUseLimit != null">meter_use_limit,</if>
<if test="measure‌Method != null">measure‌_method,</if>
<if test="reformYear != null">reform_year,</if>
<if test="reformBatch != null">reform_batch,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
...@@ -155,6 +179,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -155,6 +179,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imgurl != null">#{imgurl},</if> <if test="imgurl != null">#{imgurl},</if>
<if test="position != null">#{position},</if> <if test="position != null">#{position},</if>
<if test="taskType != null">#{taskType},</if> <if test="taskType != null">#{taskType},</if>
<if test="boilerInstallYear != null">#{boilerInstallYear},</if>
<if test="boilerBrand != null">#{boilerBrand},</if>
<if test="boilerModel != null">#{boilerModel},</if>
<if test="boilerProduceDate != null">#{boilerProduceDate},</if>
<if test="boilerProduceBatch != null">#{boilerProduceBatch},</if>
<if test="meterAlarmStatus != null">#{meterAlarmStatus},</if>
<if test="meterValueStatus != null">#{meterValueStatus},</if>
<if test="meterUseLimit != null">#{meterUseLimit},</if>
<if test="measure‌Method != null">#{measure‌Method},</if>
<if test="reformYear != null">#{reformYear},</if>
<if test="reformBatch != null">#{reformBatch},</if>
</trim> </trim>
</insert> </insert>
...@@ -187,6 +222,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -187,6 +222,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imgurl != null">imgurl = #{imgurl},</if> <if test="imgurl != null">imgurl = #{imgurl},</if>
<if test="position != null">`position` = #{position},</if> <if test="position != null">`position` = #{position},</if>
<if test="taskType != null">task_type = #{taskType},</if> <if test="taskType != null">task_type = #{taskType},</if>
<if test="boilerInstallYear != null">boiler_install_year = #{boilerInstallYear},</if>
<if test="boilerBrand != null">boiler_brand = #{boilerBrand},</if>
<if test="boilerModel != null">boiler_model = #{boilerModel},</if>
<if test="boilerProduceDate != null">boiler_produce_date = #{boilerProduceDate},</if>
<if test="boilerProduceBatch != null">boiler_produce_batch = #{boilerProduceBatch},</if>
<if test="meterAlarmStatus != null">meter_alarm_status = #{meterAlarmStatus},</if>
<if test="meterValueStatus != null">meter_value_status = #{meterValueStatus},</if>
<if test="meterUseLimit != null">meter_use_limit = #{meterUseLimit},</if>
<if test="measure‌Method != null">measure‌_method = #{measure‌Method},</if>
<if test="reformYear != null">reform_year = #{reformYear},</if>
<if test="reformBatch != null">reform_batch = #{reformBatch},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
huaxin-web/src/views/baseinfo/jmuser/components/DetailInfo.vue
View file @ 7123b91e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body destroy-on-close> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body destroy-on-close>
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
<el-form label-width="100px"> <el-form label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户姓名"> <el-form-item label="用户姓名">
...@@ -122,6 +122,95 @@ ...@@ -122,6 +122,95 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="壁挂炉安装年份">
<span v-if="detailInfo.boilerInstallYear">{{ detailInfo.boilerInstallYear}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="壁挂炉品牌">
<span v-if="detailInfo.boilerBrand">{{ detailInfo.boilerBrand}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="壁挂炉型号">
<span v-if="detailInfo.boilerModel">{{ detailInfo.boilerModel}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="壁挂炉出厂日期">
<span v-if="detailInfo.boilerProduceDate">{{ detailInfo.boilerProduceDate}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="壁挂炉出厂批次">
<span v-if="detailInfo.boilerProduceBatch">{{ detailInfo.boilerProduceBatch}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气表报警状态">
<span v-if="detailInfo.meterAlarmStatus">{{ $parent.meterAlarmStatusFormat(this.detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="燃气表阀门状态">
<span v-if="detailInfo.meterValueStatus">{{ $parent.meterValueStatusFormat(this.detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气表使用年限">
<span v-if="detailInfo.meterUseLimit">{{ detailInfo.meterUseLimit}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="燃气表计量方式">
<span v-if="detailInfo.measure‌Method">{{ $parent.measure‌MethodFormat(this.detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气表改造年份">
<span v-if="detailInfo.reformYear">{{ detailInfo.reformYear}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="燃气表改造批次">
<span v-if="detailInfo.reformBatch">{{ detailInfo.reformBatch}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
......
huaxin-web/src/views/baseinfo/jmuser/index.vue
View file @ 7123b91e
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="小区名称" prop="community"> <el-form-item label="小区名称" prop="community">
<el-select v-model="queryParams.community" placeholder="请选择小区名称" clearable size="small"> <el-select v-model="queryParams.community" placeholder="请选择小区名称" clearable size="small">
<el-option <el-option
...@@ -76,6 +76,25 @@ ...@@ -76,6 +76,25 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="壁挂炉品牌" prop="boilerBrand">
<el-input
v-model="queryParams.boilerBrand"
placeholder="请输入壁挂炉品牌"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="改造年份" prop="reformYear">
<el-input
v-model="queryParams.reformYear"
placeholder="请输入改造年份"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
...@@ -565,7 +584,9 @@ ...@@ -565,7 +584,9 @@
taskType: null, taskType: null,
meterCompany: null, meterCompany: null,
meterType: null, meterType: null,
position: null position: null,
boilerBrand: null,
reformYear: null
}, },
//地区关联查询 //地区关联查询
queryParams2: { queryParams2: {
...@@ -633,7 +654,13 @@ ...@@ -633,7 +654,13 @@
}, },
communitys: [], communitys: [],
positionOptions: [], positionOptions: [],
inspectUserTypeOptions: [] inspectUserTypeOptions: [],
// 燃气表报警状态字典
meterAlarmStatusOptions: [],
// 燃气表阀门状态:字典
meterValueStatusOptions: [],
// 燃气表计量方式:字典
measure‌MethodOptions: [],
}; };
}, },
created() { created() {
...@@ -654,6 +681,15 @@ ...@@ -654,6 +681,15 @@
this.getDicts("t_inspect_user_type").then(response => { this.getDicts("t_inspect_user_type").then(response => {
this.inspectUserTypeOptions = response.data; this.inspectUserTypeOptions = response.data;
}); });
this.getDicts("t_gas_meter_alarm_status").then(response => {
this.meterAlarmStatusOptions = response.data;
});
this.getDicts("t_gas_meter_value_status").then(response => {
this.meterValueStatusOptions = response.data;
});
this.getDicts("t_gas_meter_measure‌_method").then(response => {
this.measure‌MethodOptions = response.data;
});
this.getCommunityInfo(); this.getCommunityInfo();
}, },
methods: { methods: {
...@@ -747,6 +783,19 @@ ...@@ -747,6 +783,19 @@
return this.selectDictLabel(this.sceneOptions, row.branch); return this.selectDictLabel(this.sceneOptions, row.branch);
}, },
// 燃气表报警状态字典翻译
meterAlarmStatusFormat(row, column) {
return this.selectDictLabel(this.meterAlarmStatusOptions, row.meterAlarmStatus);
},
// 燃气表阀门状态:字典翻译
meterValueStatusFormat(row, column) {
return this.selectDictLabel(this.meterValueStatusOptions, row.meterValueStatus);
},
// 燃气表计量方式:字典翻译
measure‌MethodFormat(row, column) {
return this.selectDictLabel(this.measure‌MethodOptions, row.measure‌Method);
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
......
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