Skip to content

Z
zh-baseversion-project
Commit d8d87b57 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

抽查隐患

parent 378719b8
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 29 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsSpotHazardRef.java
View file @ d8d87b57
......@@ -27,9 +27,11 @@ public class TInsSpotHazardRef extends BaseEntity
private String fHazardOutUniqueCode;
/** 设计供气企业编码 */
@Excel(name = "设计供气企业编码")
private String fInvolveEnterpriseCode;
@Excel(name = "供气企业编码")
private String enterpriseName;
/** 检查对象分类，按分类代码表23 分类填写
23-0100 ：气代煤
......@@ -61,17 +63,21 @@ public class TInsSpotHazardRef extends BaseEntity
private String fObjCode;
/** 对象所在行政区，县级行政区ID */
@Excel(name = "对象所在行政区，县级行政区ID")
private String fObjBelongRegionId;
@Excel(name = "县级行政区")
private String countyName;
/** 监督检查时间 yyyy-MM-dd hh:mm:ss */
@Excel(name = "监督检查时间")
private String fCheckTime;
/** 隐患分类分级编码 */
@Excel(name = "隐患分类分级编码")
private String fHazardTypeLevelId;
@Excel(name = "隐患分类分级标准")
private String levelName;
/** 隐患分类分级标准中的内容不足以表述隐患，或隐患
分类分级编码对应了“其他”类隐患的，应该用补充说
......@@ -221,6 +227,30 @@ public class TInsSpotHazardRef extends BaseEntity
return fLastTime;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getLevelName() {
return levelName;
}
public void setLevelName(String levelName) {
this.levelName = levelName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
zh-baseversion-system/src/main/resources/mapper/system/TInsSpotHazardRefMapper.xml
View file @ d8d87b57
......@@ -22,7 +22,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTInsSpotHazardRefVo">
select f_ins_spot_hazard_ref_id, f_hazard_unique_code, f_hazard_out_unique_code, f_involve_enterprise_code, f_obj_type, f_obj_code, f_obj_belong_region_id, f_check_time, f_hazard_type_level_id, f_hazard_desc, f_before_picture, f_is_enforcement, f_remark, f_last_time from t_ins_spot_hazard_ref
SELECT
spot.f_ins_spot_hazard_ref_id,
spot.f_hazard_unique_code,
spot.f_hazard_out_unique_code,
spot.f_involve_enterprise_code,
spot.f_obj_type,
spot.f_obj_code,
spot.f_obj_belong_region_id,
spot.f_check_time,
spot.f_hazard_type_level_id,
spot.f_hazard_desc,
spot.f_before_picture,
spot.f_is_enforcement,
spot.f_remark,
spot.f_last_time,
(select rec.f_name from t_county_level_region rec where rec.f_id = spot.f_obj_belong_region_id) AS countyName,
(select en.enterprise_name from t_enterprise_info en where enterprise_id = spot.f_involve_enterprise_code)AS enterpriseName,
(select inf.f_hazard_name from t_ins_sta_infor inf where inf.f_ins_sta_infor_id = spot.f_hazard_type_level_id)AS levelName
FROM
t_ins_spot_hazard_ref spot
</sql>
<select id="selectTInsSpotHazardRefList" parameterType="TInsSpotHazardRef" resultMap="TInsSpotHazardRefResult">
......
zh-baseversion-web/src/views/supervision/record/components/InsRefDetailInfo.vue
View file @ d8d87b57
......@@ -61,7 +61,7 @@
<el-col :span="12">
<el-form-item label="隐患分类分级编码">
<span v-if="detailInfo.fHazardTypeLevelId">{{ detailInfo.fHazardTypeLevelId }}</span>
<span v-if="detailInfo.fHazardTypeLevelId">{{ $parent.hiddenData.find(item => item.fInsStaInforId == detailInfo.fHazardTypeLevelId).fHazardName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......
zh-baseversion-web/src/views/supervision/record/components/Rectification.vue
View file @ d8d87b57
......@@ -75,7 +75,18 @@
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="隐患分类分级编码" prop="fHazardTypeLevelId">
<el-input v-model="form.fHazardTypeLevelId" placeholder="请输入隐患分类分级编码" />
<el-select
v-model="form.fHazardTypeLevelId"
placeholder="请选择隐患分类分级标准"
style="width: 100%"
>
<el-option
v-for="hidden in hiddenData"
:key="hidden.fInsStaInforId"
:label="hidden.fHazardName"
:value="hidden.fInsStaInforId"
/>
</el-select>
</el-form-item>
</el-col>
......@@ -295,6 +306,7 @@
import { getDefaultCountyList } from "@/api/area/county";
import { enterpriseListInfo } from "@/api/regulation/info";
import InsRefDetailInfo from "./InsRefDetailInfo";
import { hiddenList } from "@/api/supervision/hideType";
export default {
name: "rectification",
props:{
......@@ -346,7 +358,8 @@
total: 0,
countyInfo: [],
enterpriseList: [],
editIndex: -1
editIndex: -1,
hiddenData: []
}
},
created(){
......@@ -365,6 +378,7 @@
this.fEnforcementTypeOptions = response.data;
});
this.getCountyInfo();
this.getHiddenList();
},
methods:{
// 检查对象分类
......@@ -385,6 +399,7 @@
//this.getRecordList();
this.getCountyInfo();
this.getEnterpriseInfo();
this.getHiddenList();
this.open = true;
this.title = "添加隐患";
},
......@@ -448,6 +463,7 @@
this.form = this.refList[scope.$index];
this.getCountyInfo();
this.getEnterpriseInfo();
this.getHiddenList();
this.open = true;
this.title = "修改隐患";
},
......@@ -497,6 +513,14 @@
this.$refs.insRefDetail.detailInfo = row;
this.$refs.insRefDetail.detailOpen = true;
},
//所有隐患
getHiddenList(){
hiddenList().then(res =>{
if(res.code == 200 && res.data){
this.hiddenData = res.data;
}
})
},
}
}
</script>
......
zh-baseversion-web/src/views/supervision/spot/components/DetailInfo.vue
View file @ d8d87b57
......@@ -18,15 +18,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="设计供气企业编码">
<span v-if="detailInfo.fInvolveEnterpriseCode">{{ detailInfo.fInvolveEnterpriseCode }}</span>
<el-form-item label="供气企业">
<span v-if="detailInfo.enterpriseName">{{ detailInfo.enterpriseName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查对象分类">
<span v-if="detailInfo.fObjType">{{ $parent.fObjTypeFormat(detailInfo) }}</span>
<span v-if="detailInfo.fObjType">{{ detailInfo.fObjType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -39,8 +39,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="行政区县级行政区ID">
<span v-if="detailInfo.fObjBelongRegionId">{{ detailInfo.fObjBelongRegionId }}</span>
<el-form-item label="行政区县级行政区">
<span v-if="detailInfo.countyName">{{ detailInfo.countyName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -53,8 +53,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="隐患分类分级编码">
<span v-if="detailInfo.fHazardTypeLevelId">{{ detailInfo.fHazardTypeLevelId }}</span>
<el-form-item label="隐患分类分级标准">
<span v-if="detailInfo.levelName">{{ detailInfo.levelName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......
zh-baseversion-web/src/views/supervision/spot/index.vue
View file @ d8d87b57
......@@ -84,29 +84,29 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="设计供气企业编码" align="center" prop="fInvolveEnterpriseCode">
<el-table-column label="供气企业" align="center" prop="fInvolveEnterpriseCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.fInvolveEnterpriseCode">{{ scope.row.fInvolveEnterpriseCode }}</span>
<span v-if="scope.row.enterpriseName">{{ scope.row.enterpriseName }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="检查对象分类" align="center" prop="fObjType" :formatter="fObjTypeFormat" />
<el-table-column label="检查对象分类" align="center" prop="fObjType"/>
<el-table-column label="对象编码" align="center" prop="fObjCode">
<template slot-scope="scope">
<span v-if="scope.row.fObjCode">{{ scope.row.fObjCode }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="行政区县级行政区ID" align="center" prop="fObjBelongRegionId" width="150" :show-overflow-tooltip="true">
<el-table-column label="行政区县级行政区" align="center" prop="fObjBelongRegionId" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.fObjBelongRegionId">{{ scope.row.fObjBelongRegionId }}</span>
<span v-if="scope.row.countyName">{{ scope.row.countyName }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="监督检查时间" align="center" prop="fCheckTime" width="150" />
<el-table-column label="隐患分类分级编码" align="center" prop="fHazardTypeLevelId" :show-overflow-tooltip="true">
<el-table-column label="隐患分类分级标准" align="center" prop="fHazardTypeLevelId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.fHazardTypeLevelId">{{ scope.row.fHazardTypeLevelId }}</span>
<span v-if="scope.row.levelName">{{ scope.row.levelName }}</span>
<span v-else>-</span>
</template>
</el-table-column>
......@@ -178,8 +178,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="设计供气企业编码" prop="fInvolveEnterpriseCode">
<el-input v-model="form.fInvolveEnterpriseCode" placeholder="请输入设计供气企业编码" />
<el-form-item label="供气企业编码" prop="fInvolveEnterpriseCode">
<el-select
v-model="form.fInvolveEnterpriseCode"
placeholder="请选择供气企业"
style="width: 100%"
>
<el-option
v-for="enterprise in enterpriseList"
:key="enterprise.companyType"
:label="enterprise.enterpriseName"
:value="enterprise.companyType"
/>
</el-select>
</el-form-item>
</el-col>
......@@ -188,13 +199,14 @@
<el-select
v-model="form.fObjType"
placeholder="请选择检查对象分类"
@change="objectTypeChange"
style="width: 100%"
>
<el-option
v-for="dict in fObjTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
:value="dict.dictLabel"
></el-option>
</el-select>
</el-form-item>
......@@ -202,13 +214,24 @@
<el-col :span="12">
<el-form-item label="对象编码" prop="fObjCode">
<el-input v-model="form.fObjCode" placeholder="请输入对象编码" />
<el-input disabled v-model="form.fObjCode" placeholder="请输入对象编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政区县级行政区ID" prop="fObjBelongRegionId">
<el-input v-model="form.fObjBelongRegionId" placeholder="请输入行政区县级行政区ID" />
<el-form-item label="行政区县级行政区" prop="fObjBelongRegionId">
<el-select
v-model="form.fObjBelongRegionId"
placeholder="请选择县级行政区"
style="width: 100%"
>
<el-option
v-for="county in countyInfo"
:key="county.fId"
:label="county.fName.trim()"
:value="county.fId"
/>
</el-select>
</el-form-item>
</el-col>
......@@ -226,7 +249,18 @@
<el-col :span="12">
<el-form-item label="隐患分类分级编码" prop="fHazardTypeLevelId">
<el-input v-model="form.fHazardTypeLevelId" placeholder="请输入隐患分类分级编码" />
<el-select
v-model="form.fHazardTypeLevelId"
placeholder="请选择隐患分类分级标准"
style="width: 100%"
>
<el-option
v-for="hidden in hiddenData"
:key="hidden.fInsStaInforId"
:label="hidden.fHazardName"
:value="hidden.fInsStaInforId"
/>
</el-select>
</el-form-item>
</el-col>
......@@ -281,6 +315,9 @@
import { listRef, getRef, delRef, addRef, updateRef, exportRef } from "@/api/supervision/spot";
import ImageUpload from '@/components/ImageUpload';
import DetailInfo from "./components/DetailInfo";
import { getDefaultCountyList } from "@/api/area/county";
import { enterpriseListInfo } from "@/api/regulation/info";
import { hiddenList } from "@/api/supervision/hideType";
export default {
name: "Ref",
components: {
......@@ -332,7 +369,10 @@ export default {
fCheckTime: [
{ required: true, message: "请选择监督检查时间", trigger: "change" }
],
}
},
countyInfo: [],
enterpriseList: [],
hiddenData: []
};
},
created() {
......@@ -399,6 +439,9 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getCountyInfo();
this.getEnterpriseInfo();
this.getHiddenList();
this.open = true;
this.title = "添加抽查隐患";
},
......@@ -408,6 +451,9 @@ export default {
const fInsSpotHazardRefId = row.fInsSpotHazardRefId || this.ids
getRef(fInsSpotHazardRefId).then(response => {
this.form = response.data;
this.getCountyInfo();
this.getEnterpriseInfo();
this.getHiddenList();
this.open = true;
this.title = "修改抽查隐患";
});
......@@ -465,6 +511,32 @@ export default {
handleDetail(row){
this.$refs.detail.getDetailInfo(row.fInsSpotHazardRefId);
},
//获取县级
getCountyInfo(){
getDefaultCountyList().then(res =>{
if(res.code == 200 && res.data){
this.countyInfo = res.data;
}
})
},
getEnterpriseInfo(){
enterpriseListInfo().then(res =>{
if(res.code == 200 && res.data){
this.enterpriseList = res.data;
}
})
},
//所有隐患
getHiddenList(){
hiddenList().then(res =>{
if(res.code == 200 && res.data){
this.hiddenData = res.data;
}
})
},
objectTypeChange(val){
this.form.fObjCode = this.fObjTypeOptions.find(item => item.dictLabel == val).dictValue;
},
}
};
</script>
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