Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 96652cb3 authored by 吴卿华's avatar 吴卿华
Browse files
Options

应急物资 应急演练修改

parent c8a7eef9
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 110 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TEmergencyDrill.java
View file @ 96652cb3
......@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 应急演练对象 t_emergency_drill
*
*
* @author zehong
* @date 2022-06-29
*/
......@@ -61,114 +61,140 @@ public class TEmergencyDrill extends BaseEntity
@Excel(name = "评估")
private String assessment;
/**评价*/
private String evaluate;
/**措施*/
private String measures;
/** 删除 0否 1是 */
private Integer isDel;
public void setDrillId(Long drillId)
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getEvaluate() {
return evaluate;
}
public void setEvaluate(String evaluate) {
this.evaluate = evaluate;
}
public String getMeasures() {
return measures;
}
public void setMeasures(String measures) {
this.measures = measures;
}
public void setDrillId(Long drillId)
{
this.drillId = drillId;
}
public Long getDrillId()
public Long getDrillId()
{
return drillId;
}
public void setDrillName(String drillName)
public void setDrillName(String drillName)
{
this.drillName = drillName;
}
public String getDrillName()
public String getDrillName()
{
return drillName;
}
public void setDrillAddress(String drillAddress)
public void setDrillAddress(String drillAddress)
{
this.drillAddress = drillAddress;
}
public String getDrillAddress()
public String getDrillAddress()
{
return drillAddress;
}
public void setDrillUnit(String drillUnit)
public void setDrillUnit(String drillUnit)
{
this.drillUnit = drillUnit;
}
public String getDrillUnit()
public String getDrillUnit()
{
return drillUnit;
}
public void setDrillTime(Date drillTime)
public void setDrillTime(Date drillTime)
{
this.drillTime = drillTime;
}
public Date getDrillTime()
public Date getDrillTime()
{
return drillTime;
}
public void setDrillType(Integer drillType)
public void setDrillType(Integer drillType)
{
this.drillType = drillType;
}
public Integer getDrillType()
public Integer getDrillType()
{
return drillType;
}
public void setDrillForm(Integer drillForm)
public void setDrillForm(Integer drillForm)
{
this.drillForm = drillForm;
}
public Integer getDrillForm()
public Integer getDrillForm()
{
return drillForm;
}
public void setDrillObjective(String drillObjective)
public void setDrillObjective(String drillObjective)
{
this.drillObjective = drillObjective;
}
public String getDrillObjective()
public String getDrillObjective()
{
return drillObjective;
}
public void setDrillPeople(String drillPeople)
public void setDrillPeople(String drillPeople)
{
this.drillPeople = drillPeople;
}
public String getDrillPeople()
public String getDrillPeople()
{
return drillPeople;
}
public void setDrillContent(String drillContent)
public void setDrillContent(String drillContent)
{
this.drillContent = drillContent;
}
public String getDrillContent()
public String getDrillContent()
{
return drillContent;
}
public void setAssessment(String assessment)
public void setAssessment(String assessment)
{
this.assessment = assessment;
}
public String getAssessment()
public String getAssessment()
{
return assessment;
}
public void setIsDel(Integer isDel)
public void setIsDel(Integer isDel)
{
this.isDel = isDel;
}
public Integer getIsDel()
public Integer getIsDel()
{
return isDel;
}
......
danger-manage-system/src/main/java/com/zehong/system/domain/TMaterialInfo.java
View file @ 96652cb3
......@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 应急物资管理对象 t_material_info
*
*
* @author zehong
* @date 2022-07-01
*/
......@@ -69,132 +69,147 @@ public class TMaterialInfo extends BaseEntity
@Excel(name = "手机号")
private String phone;
/**责任部门*/
private String deptName;
/** 0未删除 1已删除 */
private Integer isDelete;
public void setId(Long id)
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
public void setId(Long id)
{
this.id = id;
}
public Long getId()
public Long getId()
{
return id;
}
public void setMaterialName(String materialName)
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
public String getMaterialName()
{
return materialName;
}
public void setMaterialType(Integer materialType)
public void setMaterialType(Integer materialType)
{
this.materialType = materialType;
}
public Integer getMaterialType()
public Integer getMaterialType()
{
return materialType;
}
public void setNum(Integer num)
public void setNum(Integer num)
{
this.num = num;
}
public Integer getNum()
public Integer getNum()
{
return num;
}
public void setPerformance(String performance)
public void setPerformance(String performance)
{
this.performance = performance;
}
public String getPerformance()
public String getPerformance()
{
return performance;
}
public void setPurpose(String purpose)
public void setPurpose(String purpose)
{
this.purpose = purpose;
}
public String getPurpose()
public String getPurpose()
{
return purpose;
}
public void setValidityTime(Date validityTime)
public void setValidityTime(Date validityTime)
{
this.validityTime = validityTime;
}
public Date getValidityTime()
public Date getValidityTime()
{
return validityTime;
}
public void setDeptId(Long deptId)
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
public Long getDeptId()
{
return deptId;
}
public void setLongitude(String longitude)
public void setLongitude(String longitude)
{
this.longitude = longitude;
}
public String getLongitude()
public String getLongitude()
{
return longitude;
}
public void setLatitude(String latitude)
public void setLatitude(String latitude)
{
this.latitude = latitude;
}
public String getLatitude()
public String getLatitude()
{
return latitude;
}
public void setAddress(String address)
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
public String getAddress()
{
return address;
}
public void setContacts(String contacts)
public void setContacts(String contacts)
{
this.contacts = contacts;
}
public String getContacts()
public String getContacts()
{
return contacts;
}
public void setPhone(String phone)
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
public String getPhone()
{
return phone;
}
public void setIsDelete(Integer isDelete)
public void setIsDelete(Integer isDelete)
{
this.isDelete = isDelete;
}
public Integer getIsDelete()
public Integer getIsDelete()
{
return isDelete;
}
......
danger-manage-system/src/main/resources/mapper/system/TEmergencyDrillMapper.xml
View file @ 96652cb3
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TEmergencyDrillMapper">
<resultMap type="TEmergencyDrill" id="TEmergencyDrillResult">
<result property="drillId" column="drill_id" />
<result property="drillName" column="drill_name" />
......@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTEmergencyDrillVo">
select drill_id, drill_name, drill_address, drill_unit, drill_time, drill_type, drill_form, drill_objective, drill_people, drill_content, assessment, create_time, create_by, is_del from t_emergency_drill
select drill_id, drill_name, drill_address, drill_unit, drill_time, drill_type, drill_form, drill_objective, drill_people, drill_content, assessment, evaluate,measures,create_time, create_by, is_del from t_emergency_drill
</sql>
<select id="selectTEmergencyDrillList" parameterType="TEmergencyDrill" resultMap="TEmergencyDrillResult">
......@@ -34,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="drillForm != null "> and drill_form = #{drillForm}</if>
</where>
</select>
<select id="selectTEmergencyDrillById" parameterType="Long" resultMap="TEmergencyDrillResult">
<include refid="selectTEmergencyDrillVo"/>
where drill_id = #{drillId}
</select>
<insert id="insertTEmergencyDrill" parameterType="TEmergencyDrill" useGeneratedKeys="true" keyProperty="drillId">
insert into t_emergency_drill
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -89,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="assessment != null">assessment = #{assessment},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="evaluate != null">evaluate = #{evaluate},</if>
<if test="measures != null">measures = #{measures},</if>
<if test="isDel != null">is_del = #{isDel},</if>
</trim>
where drill_id = #{drillId}
......@@ -99,9 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTEmergencyDrillByIds" parameterType="String">
delete from t_emergency_drill where drill_id in
delete from t_emergency_drill where drill_id in
<foreach item="drillId" collection="array" open="(" separator="," close=")">
#{drillId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
danger-manage-system/src/main/resources/mapper/system/TMaterialInfoMapper.xml
View file @ 96652cb3
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TMaterialInfoMapper">
<resultMap type="TMaterialInfo" id="TMaterialInfoResult">
<result property="id" column="id" />
<result property="materialName" column="material_name" />
......@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="isDelete" column="is_delete" />
<result property="deptName" column="dept_name" />
</resultMap>
<sql id="selectTMaterialInfoVo">
......@@ -28,18 +29,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectTMaterialInfoList" parameterType="TMaterialInfo" resultMap="TMaterialInfoResult">
<include refid="selectTMaterialInfoVo"/>
<where>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="materialType != null "> and material_type = #{materialType}</if>
select d.dept_name,a.id, a.material_name, a.material_type, a.num, a.performance, a.purpose, a.validity_time, a.dept_id, a.longitude, a.latitude, a.address, a.contacts, a.phone, a.create_time, a.update_time, a.is_delete
from t_material_info a
LEFT JOIN sys_dept d ON d.`dept_id` = a.`dept_id`
<where>
<if test="materialName != null and materialName != ''"> and a.material_name like concat('%', #{materialName}, '%')</if>
<if test="materialType != null "> and a.material_type = #{materialType}</if>
</where>
</select>
<select id="selectTMaterialInfoById" parameterType="Long" resultMap="TMaterialInfoResult">
<include refid="selectTMaterialInfoVo"/>
where id = #{id}
</select>
<insert id="insertTMaterialInfo" parameterType="TMaterialInfo" useGeneratedKeys="true" keyProperty="id">
insert into t_material_info
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -105,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTMaterialInfoByIds" parameterType="String">
delete from t_material_info where id in
delete from t_material_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
danger-manage-web/src/views/system/drill/index.vue
View file @ 96652cb3
......@@ -91,12 +91,15 @@
<el-table-column label="演练地址" align="center" prop="drillAddress" />
<el-table-column label="主办单位" align="center" prop="drillUnit" />
<el-table-column label="演练时间" align="center" prop="drillTime" width="180"/>
<!--<el-table-column label="演练目的" align="center" prop="drillObjective" />-->
<!--<el-table-column label="参演人员" align="center" prop="drillPeople" />-->
<!--<el-table-column label="演练内容" align="center" prop="drillContent" />-->
<!--<el-table-column label="评估" align="center" prop="assessment" />-->
<el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
<el-table-column label="状态" align="center" prop="evaluate" >
<span slot-scope="scope" v-if="scope.row.evaluate">已完成</span>
<span v-else>待评估</span>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -112,6 +115,13 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
v-if="!scope.row.evaluate"
@click="assessment(scope.row)"
>评估</el-button>
<el-button
size="mini"
type="text"
......@@ -233,6 +243,14 @@
<editor v-model="form.drillContent" :min-height="240" :readOnly="readOnly"/>
</el-form-item>
</div>
<div class="div-kuang" style="width: 50%;margin-left: 2%">
<el-form-item label="总结评价:" >
<span>{{form.evaluate}}</span>
</el-form-item>
<el-form-item label="整改措施:">
<span>{{form.measures}}</span>
</el-form-item>
</div>
</div>
......@@ -241,6 +259,22 @@
<!--</el-form-item>-->
</el-form>
</el-dialog>
<!--评估-->
<el-dialog title="评估" :visible.sync="dialogFormVisible">
<el-form ref="form" :model="form">
<el-form-item label="演练效果和总结评价:" >
<el-input maxlength="2000" v-model="form.evaluate" type="textarea" :rows="4" autocomplete="off" show-word-limit></el-input>
</el-form-item>
<el-form-item label="演练存在的问题及整改措施:" >
<el-input maxlength="2000" v-model="form.measures" type="textarea" :rows="4" autocomplete="off" show-word-limit></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogFormVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -277,6 +311,8 @@ export default {
// 是否显示弹出层
open: false,
open2:false,
//评估
dialogFormVisible:false,
// 演练类型字典
drillTypeOptions: [],
// 演练形式字典
......@@ -359,7 +395,9 @@ export default {
assessment: null,
createTime: null,
createBy: null,
isDel: null
isDel: null,
evaluate:null,
measures:null,
};
this.resetForm("form");
},
......@@ -394,15 +432,30 @@ export default {
this.open = true;
this.title = "修改应急演练";
});
},
/** 评估按钮操作 */
assessment(row) {
this.reset();
const drillId = row.drillId || this.ids
getDrill(drillId).then(response => {
this.form = response.data;
this.dialogFormVisible = true;
});
},
/*评估提交*/
submitAssessment(){
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
console.log(this.form.drillId)
if (valid) {
if (this.form.drillId != null) {
updateDrill(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.dialogFormVisible=false;
this.getList();
});
} else {
......
danger-manage-web/src/views/system/info/index.vue
View file @ 96652cb3
......@@ -86,8 +86,9 @@
<!--<el-table-column label="经度" align="center" prop="longitude" />-->
<!--<el-table-column label="维度" align="center" prop="latitude" />-->
<el-table-column label="地址信息" align="center" prop="address" />
<el-table-column label="联系人" align="center" prop="contacts" width="100"/>
<el-table-column label="手机号" align="center" prop="phone" width="180"/>
<el-table-column label="责任部门" align="center" prop="deptName" />
<!-- <el-table-column label="联系人" align="center" prop="contacts" width="100"/>-->
<!-- <el-table-column label="手机号" align="center" prop="phone" width="180"/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
<template slot-scope="scope">
<el-button
......@@ -141,9 +142,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物资数量" prop="num">
<el-input v-model="form.num" placeholder="请输入物资数量" />
</el-form-item>
</div>
<div style="width: 50%">
<el-form-item label="有效时间" prop="validityTime">
......@@ -155,25 +153,41 @@
placeholder="选择有效时间">
</el-date-picker>
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-form-item label="物资数量" prop="num">
<el-input v-model="form.num" placeholder="请输入物资数量" />
</el-form-item>
<el-col :span="12">
<el-form-item label="责任部门" prop="deptId">
<!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
<el-select v-model="form.deptId" filterable placeholder="请选择责任部门">
<el-option
v-for="dict in deptList"
:key="dict.deptId"
:label="dict.deptName"
:value="parseInt(dict.deptId)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-form-item label="联系人" prop="contacts">-->
<!-- <el-input v-model="form.contacts" placeholder="请输入联系人" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="手机号" prop="phone">-->
<!-- <el-input v-model="form.phone" placeholder="请输入手机号" />-->
<!-- </el-form-item>-->
</div>
</div>
<div class="division" style="width: 100%">
<el-form-item label="经纬度" prop="longitude">
<div class="division">
<el-input v-model="form.longitude" placeholder="请输入经度" />
<el-input style="margin-left: 10px" v-model="form.latitude" placeholder="请输入维度" />
</div>
</el-form-item>
<!-- <div class="division" style="width: 100%">-->
<!-- <el-form-item label="经纬度" prop="longitude">-->
<!-- <div class="division">-->
<!-- <el-input v-model="form.longitude" placeholder="请输入经度" />-->
<!-- <el-input style="margin-left: 10px" v-model="form.latitude" placeholder="请输入维度" />-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-button style=" height: 36px;margin-left: 10px" type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
<!--<div class="btn">选择经纬度</div>-->
</div>
<!-- <el-button style=" height: 36px;margin-left: 10px" type="primary" plain @click="MapdialogFun">选择经纬度</el-button>-->
<!-- &lt;!&ndash;<div class="btn">选择经纬度</div>&ndash;&gt;-->
<!-- </div>-->
<el-form-item label="地址信息" prop="address">
<el-input v-model="form.address" placeholder="请输入地址信息" />
</el-form-item>
......@@ -211,11 +225,20 @@
<el-form-item label="有效时间:" prop="validityTime">
<span>{{form.validityTime}}</span>
</el-form-item>
<el-form-item label="联系人:" prop="contacts">
<span>{{form.contacts}}</span>
<!-- <el-form-item label="联系人:" prop="contacts">-->
<!-- <span>{{form.contacts}}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="手机号:" prop="phone">-->
<!-- <span>{{form.phone}}</span>-->
<!-- </el-form-item>-->
<el-form-item label="地址信息:" prop="address">
<span>{{form.address}}</span>
</el-form-item>
<el-form-item label="手机号:" prop="phone">
<span>{{form.phone}}</span>
<el-form-item label="性能:" prop="performance">
<span>{{form.performance}}</span>
</el-form-item>
<el-form-item label="用途:" prop="purpose">
<span>{{form.purpose}}</span>
</el-form-item>
</div>
<div style="width: 60%;height: 340px;background: #99a9bf" id="enterpriseContainer">
......@@ -229,15 +252,7 @@
<!--&lt;!&ndash;<div class="btn">选择经纬度</div>&ndash;&gt;-->
<!--</div>-->
<el-form-item label="地址信息:" prop="address">
<span>{{form.address}}</span>
</el-form-item>
<el-form-item label="性能:" prop="performance">
<span>{{form.performance}}</span>
</el-form-item>
<el-form-item label="用途:" prop="purpose">
<span>{{form.purpose}}</span>
</el-form-item>
</el-form>
......@@ -255,6 +270,7 @@
<script>
import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/system/info";
import GetPos from '@/components/GetPos';
import { listDept } from "@/api/system/dept";
import { EditorMap } from "@/utils/mapClass/getPath.js";
export default {
......@@ -280,6 +296,7 @@ export default {
total: 0,
// 应急物资管理表格数据
infoList: [],
deptList:[],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -331,6 +348,7 @@ export default {
},
created() {
this.getList();
this.getDeptList();
this.getDicts("t_material_type").then(response => {
this.materialTypeOptions = response.data;
});
......@@ -345,6 +363,12 @@ export default {
this.loading = false;
});
},
getDeptList() {
listDept({status: undefined}).then(response => {
this.deptList = response.data;
console.log(this.deptList)
});
},
// 分类字典翻译
materialTypeFormat(row, column) {
return this.selectDictLabel(this.materialTypeOptions, row.materialType);
......
danger-manage-web/src/views/system/plan/index.vue
View file @ 96652cb3
......@@ -325,12 +325,6 @@
planTitle: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
planType: [
{ required: true, message: "预案类型不能为空", trigger: "blur" }
],
planLevel: [
{ required: true, message: "预案等级不能为空", trigger: "blur" }
]
}
};
},
......
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