Skip to content

G
gassafety-progress
Commit 101b3348 authored by 王晓倩's avatar 王晓倩
Browse files
Options

燃气事故台账增加字段事故发生时间，用户安全装置台账修改字段安装时间类型

parent d2426e87
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 29 deletions
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSafeEquipmentStandingBook.java
View file @ 101b3348
...@@ -41,8 +41,8 @@ public class TSafeEquipmentStandingBook extends BaseEntity ...@@ -41,8 +41,8 @@ public class TSafeEquipmentStandingBook extends BaseEntity
private String linkMobile; private String linkMobile;
/** 安装时间 */ /** 安装时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date installTime; private Date installTime;
/** 品牌名称 */ /** 品牌名称 */
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTroubleStandingBook.java
View file @ 101b3348
...@@ -59,6 +59,11 @@ public class TTroubleStandingBook extends BaseEntity ...@@ -59,6 +59,11 @@ public class TTroubleStandingBook extends BaseEntity
@Excel(name = "是否处理：1.已处理 2.未处理") @Excel(name = "是否处理：1.已处理 2.未处理")
private String isDeal; private String isDeal;
/** 事故发生时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "事故发生时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date happenDate;
/** 处理完成时间 */ /** 处理完成时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "处理完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "处理完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
...@@ -170,7 +175,16 @@ public class TTroubleStandingBook extends BaseEntity ...@@ -170,7 +175,16 @@ public class TTroubleStandingBook extends BaseEntity
{ {
return isDeal; return isDeal;
} }
public void setDealDate(Date dealDate)
public Date getHappenDate() {
return happenDate;
}
public void setHappenDate(Date happenDate) {
this.happenDate = happenDate;
}
public void setDealDate(Date dealDate)
{ {
this.dealDate = dealDate; this.dealDate = dealDate;
} }
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/TTroubleStandingBookForm.java
View file @ 101b3348
...@@ -28,6 +28,14 @@ public class TTroubleStandingBookForm ...@@ -28,6 +28,14 @@ public class TTroubleStandingBookForm
/** 是否处理：1.已处理 2.未处理 */ /** 是否处理：1.已处理 2.未处理 */
private String isDeal; private String isDeal;
/** 事故发生起始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date happenDateStart;
/** 事故发生截止时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date happenDateEnd;
/** 处理完成起始时间 */ /** 处理完成起始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDateStart; private Date dealDateStart;
......
gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml
View file @ 101b3348
...@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="responsibleUnit" column="responsible_unit" /> <result property="responsibleUnit" column="responsible_unit" />
<result property="responsiblePeople" column="responsible_people" /> <result property="responsiblePeople" column="responsible_people" />
<result property="isDeal" column="is_deal" /> <result property="isDeal" column="is_deal" />
<result property="happenDate" column="happen_date" />
<result property="dealDate" column="deal_date" /> <result property="dealDate" column="deal_date" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
...@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTTroubleStandingBookVo"> <sql id="selectTTroubleStandingBookVo">
select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
</sql> </sql>
<select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult"> <select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult">
...@@ -35,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -35,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="troubleName != null and troubleName != ''"> and trouble_name like concat('%', #{troubleName}, '%')</if> <if test="troubleName != null and troubleName != ''"> and trouble_name like concat('%', #{troubleName}, '%')</if>
<if test="troubleType != null and troubleType != ''"> and trouble_type = #{troubleType}</if> <if test="troubleType != null and troubleType != ''"> and trouble_type = #{troubleType}</if>
<if test="isDeal != null and isDeal != ''"> and is_deal = #{isDeal}</if> <if test="isDeal != null and isDeal != ''"> and is_deal = #{isDeal}</if>
<if test="happenDateStart != null "> and happen_date &gt;= #{happenDateStart}</if>
<if test="happenDateEnd != null "> and happen_date &lt;= #{happenDateEnd}</if>
<if test="dealDateStart != null "> and deal_date &gt;= #{dealDateStart}</if> <if test="dealDateStart != null "> and deal_date &gt;= #{dealDateStart}</if>
<if test="dealDateEnd != null "> and deal_date &lt;= #{dealDateEnd}</if> <if test="dealDateEnd != null "> and deal_date &lt;= #{dealDateEnd}</if>
</where> </where>
...@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="responsibleUnit != null">responsible_unit,</if> <if test="responsibleUnit != null">responsible_unit,</if>
<if test="responsiblePeople != null">responsible_people,</if> <if test="responsiblePeople != null">responsible_people,</if>
<if test="isDeal != null">is_deal,</if> <if test="isDeal != null">is_deal,</if>
<if test="happenDate != null">happen_date,</if>
<if test="dealDate != null">deal_date,</if> <if test="dealDate != null">deal_date,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
...@@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="responsibleUnit != null">#{responsibleUnit},</if> <if test="responsibleUnit != null">#{responsibleUnit},</if>
<if test="responsiblePeople != null">#{responsiblePeople},</if> <if test="responsiblePeople != null">#{responsiblePeople},</if>
<if test="isDeal != null">#{isDeal},</if> <if test="isDeal != null">#{isDeal},</if>
<if test="happenDate != null">#{happenDate},</if>
<if test="dealDate != null">#{dealDate},</if> <if test="dealDate != null">#{dealDate},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
...@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if> <if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
<if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if> <if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
<if test="isDeal != null">is_deal = #{isDeal},</if> <if test="isDeal != null">is_deal = #{isDeal},</if>
<if test="happenDate != null">happen_date = #{happenDate},</if>
<if test="dealDate != null">deal_date = #{dealDate},</if> <if test="dealDate != null">deal_date = #{dealDate},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ 101b3348
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
<el-form-item label="安装时间" prop="installTime"> <el-form-item label="安装时间" prop="installTime">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="queryParams.installTimeStart" v-model="queryParams.installTimeStart"
type="datetime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
placeholder="请选择起始时间"> placeholder="请选择起始时间">
</el-date-picker><span style="color: #bebfc3"> - </span> </el-date-picker><span style="color: #bebfc3"> - </span>
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="queryParams.installTimeEnd" v-model="queryParams.installTimeEnd"
type="datetime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
placeholder="请选择截止时间"> placeholder="请选择截止时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
<el-form-item label="安装时间" prop="installTime"> <el-form-item label="安装时间" prop="installTime">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="form.installTime" v-model="form.installTime"
type="datetime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
placeholder="请选择安装时间" placeholder="请选择安装时间"
style="width: 100%"> style="width: 100%">
</el-date-picker> </el-date-picker>
......
gassafetyprogress-web/src/views/standingBook/trouble/index.vue
View file @ 101b3348
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否处理" prop="isDeal"> <el-form-item label="是否处理" prop="isDeal">
<el-select v-model="queryParams.isDeal" placeholder="请选择事故类型" clearable size="small"> <el-select v-model="queryParams.isDeal" placeholder="请选择是否处理" clearable size="small">
<el-option <el-option
v-for="dict in isDealOptions" v-for="dict in isDealOptions"
:key="dict.dictValue" :key="dict.dictValue"
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="处理完成时间" prop="dealDate"> <el-form-item label="事故发生时间" prop="happenDate">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="queryParams.dealDateStart" v-model="queryParams.happenDateStart"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择起始时间"> placeholder="请选择起始时间">
</el-date-picker><span style="color: #bebfc3"> - </span> </el-date-picker><span style="color: #bebfc3"> - </span>
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="queryParams.dealDateEnd" v-model="queryParams.happenDateEnd"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择截止时间"> placeholder="请选择截止时间">
...@@ -84,15 +84,16 @@ ...@@ -84,15 +84,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/> <el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/>
<el-table-column label="责任单位" align="center" prop="responsibleUnit" /> <el-table-column label="事故发生时间" align="center" prop="happenDate" width="180px"/>
<el-table-column label="责任人员" align="center" prop="responsiblePeople" /> <el-table-column label="责任单位" align="center" prop="responsibleUnit" width="150px"/>
<el-table-column label="责任人员" align="center" prop="responsiblePeople" width="150px"/>
<el-table-column label="是否处理" align="center" prop="isDeal" width="120px"> <el-table-column label="是否处理" align="center" prop="isDeal" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isDeal == 1">已处理</span> <span v-if="scope.row.isDeal == 1">已处理</span>
<span v-if="scope.row.isDeal == 2">未处理</span> <span v-if="scope.row.isDeal == 2">未处理</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/> <!-- <el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -156,26 +157,35 @@ ...@@ -156,26 +157,35 @@
<el-row> <el-row>
<el-col :span="23"> <el-col :span="23">
<el-form-item label="经纬度坐标" prop="longitude"> <el-form-item label="经纬度坐标" prop="longitude">
<el-row> <el-col :span="9">
<el-col :span="9"> <el-input v-model="form.longitude" placeholder="请输入经度" />
<el-input v-model="form.longitude" placeholder="请输入经度" /> </el-col>
</el-col> <el-col :span="9" style="margin-left: 10px">
<el-col :span="9" style="margin-left: 10px"> <el-input v-model="form.latitude" placeholder="请输入纬度"/>
<el-input v-model="form.latitude" placeholder="请输入纬度"/> </el-col>
</el-col> <el-col :span="3" style="margin-left: 30px">
<el-col :span="3" style="margin-left: 30px"> <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
<el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button> </el-col>
</el-col>
</el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="23"> <el-col :span="11">
<el-form-item label="事故原因" prop="troubleReason"> <el-form-item label="事故原因" prop="troubleReason">
<el-input v-model="form.troubleReason" placeholder="请输入事故原因" /> <el-input v-model="form.troubleReason" placeholder="请输入事故原因" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="事故发生时间" prop="happenDate">
<el-date-picker clearable size="small"
v-model="form.happenDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择处理完成时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="23"> <el-col :span="23">
...@@ -287,6 +297,8 @@ export default { ...@@ -287,6 +297,8 @@ export default {
troubleName: null, troubleName: null,
troubleType: null, troubleType: null,
isDeal: null, isDeal: null,
happenDateStart: null,
happenDateEnd: null,
dealDateStart: null, dealDateStart: null,
dealDateEnd: null dealDateEnd: null
}, },
...@@ -306,6 +318,9 @@ export default { ...@@ -306,6 +318,9 @@ export default {
longitude: [ longitude: [
{ required: true, message: "请输入经纬度", trigger: "blur" }, { required: true, message: "请输入经纬度", trigger: "blur" },
], ],
happenDate: [
{ required: true, message: "请输入经纬度", trigger: "blur" },
],
troubleReason: [ troubleReason: [
{ required: true, message: "请输入事故原因", trigger: "blur" }, { required: true, message: "请输入事故原因", trigger: "blur" },
], ],
...@@ -355,6 +370,7 @@ export default { ...@@ -355,6 +370,7 @@ export default {
responsibleUnit: null, responsibleUnit: null,
responsiblePeople: null, responsiblePeople: null,
isDeal: null, isDeal: null,
happenDate: null,
dealDate: null, dealDate: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
......
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