Commit 73ff35a6 authored by p-wanping.song's avatar p-wanping.song

Merge branch 'dev-swp' into develop

parents 35958ac2 ea725f9e
......@@ -86,6 +86,7 @@
/>
<!-- 单选 -->
<van-field
readonly
required
clickable
name="pointType"
......@@ -95,6 +96,17 @@
@click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required label="是否为特种设备" v-if="form.pointType=='设备设施类'">
<template #input>
<van-switch
size="20"
clickable
name="specialEquipment"
v-model="form.specialEquipment"
:rules="[{ required: true, message: '是否为特种设备不能为空' }]"
/>
</template>
</van-field>
<!-- 多选 -->
<van-field
v-model="form.safetyWarningSigns"
......@@ -158,9 +170,9 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
风险图片
风险图片
</div>
<van-field name="hdPicture1" label="风险图片">
<van-field name="hdPicture1" label="风险图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'pictureFile')"
......@@ -212,7 +224,7 @@
autosize
placeholder="请输入"
/>
<van-field name="measuresProjectFile[]" label="上传附件1">
<van-field name="measuresProjectFile[]" label="上传附件">
<template #input>
<van-uploader
multiple
......@@ -265,32 +277,6 @@
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
@click="
{
measuresDept = true;
}
"
placeholder="请选择"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
@click="getUserData('measuresUser')"
placeholder="请选择"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input>
<van-uploader
......@@ -324,50 +310,7 @@
</van-uploader>
</template>
</van-field>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
危险源管理
</div>
<van-field
v-model="form.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field name="majorHazardSource" label="是否存在重大危险源">
<template #input>
<van-switch v-model="form.majorHazardSource" size="20" />
</template>
</van-field>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
重大危险源描述
</div>
<van-field
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -422,6 +365,35 @@
</template>
</van-field>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -430,17 +402,78 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
参考依据
重大危险源管理
</div>
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<van-switch v-model="form.majorHazardSource" size="20" />
</template>
</van-field>
<van-field
:disabled="!form.majorHazardSource"
v-model="form.hazardSourceName"
:required="form.majorHazardSource"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
重大危险源描述
</div>
<van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
:value="form.referenceBasis=='null'?'':form.referenceBasis"
label="判断依据"
placeholder="请选择"
@click="selectData('referenceBasis', false)"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
@click="()=>{
if(form.majorHazardSource){
selectData('referenceBasis', false)
}
}"
/>
<!-- <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
判断依据
</div> -->
<van-dialog
v-model="showGradeDialog"
title="风险评测配置"
......@@ -1443,7 +1476,17 @@ export default {
this.show = false;
}
},
watch: {}
watch: {
'form.pointType'(val,old){
if(old){
if(val=='设备设施类'){
this.form.specialEquipment = false
}else{
delete this.form.specialEquipment
}
}
}
}
};
</script>
<style lang="less" scoped>
......
......@@ -84,6 +84,7 @@
/>
<!-- 单选 -->
<van-field
readonly
required
clickable
name="pointType"
......@@ -93,6 +94,17 @@
@click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required label="是否为特种设备" v-if="form.pointType=='设备设施类'">
<template #input>
<van-switch
size="20"
clickable
name="specialEquipment"
v-model="form.specialEquipment"
:rules="[{ required: true, message: '是否为特种设备不能为空' }]"
/>
</template>
</van-field>
<!-- 多选 -->
<van-field
v-model="form.safetyWarningSigns"
......@@ -156,9 +168,9 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
风险图片
风险图片
</div>
<van-field name="hdPicture1" label="风险图片">
<van-field name="hdPicture1" label="风险图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'pictureFile')"
......@@ -168,7 +180,6 @@
v-model="uploaderImg"
>
<template slot="default">
<!-- 11111111111 -->
<div
style="
width: 2.13333rem;
......@@ -223,14 +234,14 @@
<template slot="default">
<div
style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src="@/assets/upload/file.png"
......@@ -264,31 +275,6 @@
placeholder="请输入"
/>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
@click="
{
measuresDept = true;
}
"
placeholder="请选择"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
@click="getUserData('measuresUser')"
placeholder="请选择"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input>
<van-uploader
......@@ -322,50 +308,7 @@
</van-uploader>
</template>
</van-field>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
危险源管理
</div>
<van-field
v-model="form.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field name="majorHazardSource" label="是否存在重大危险源">
<template #input>
<van-switch v-model="form.majorHazardSource" size="20" />
</template>
</van-field>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
重大危险源描述
</div>
<van-field
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -420,6 +363,36 @@
</template>
</van-field>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -428,16 +401,67 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
参考依据
重大危险源管理
</div>
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<van-switch v-model="form.majorHazardSource" size="20" />
</template>
</van-field>
<van-field
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
placeholder="请选择"
@click="selectData('referenceBasis', false)"
/>
:disabled="!form.majorHazardSource"
v-model="form.hazardSourceName"
:required="form.majorHazardSource"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
重大危险源描述
</div>
<van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis=='null'?'':form.referenceBasis"
label="判断依据"
placeholder="请选择"
:key="form.majorHazardSource"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
@click="()=>{
if(form.majorHazardSource){
selectData('referenceBasis', false)
}
}"
/>
<van-dialog
v-model="showGradeDialog"
title="风险评测配置"
......@@ -691,7 +715,9 @@ export default {
id: "",
isTimely: 1,
active: 0,
form: {},
form: {
pointType:''
},
projectId: "", // 所属工程
projectName: "", // 所属工程
projectDirectorName: "", // 所属工程
......@@ -1202,13 +1228,13 @@ export default {
}
},
watch: {
// setRank(newVal, oldVal) {
// if (newVal == "其他定级方式") {
// this.showSetRankMode = true;
// } else {
// this.showSetRankMode = false;
// }
// },
'form.pointType'(val,old){
if(val=='设备设施类'){
this.form.specialEquipment = false
}else{
delete this.form.specialEquipment
}
}
}
};
</script>
......
......@@ -113,9 +113,9 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
风险图片
风险图片
</div>
<van-field name="hdPicture1" label="风险图片">
<van-field name="hdPicture1" label="风险图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'pictureFile')"
......@@ -220,32 +220,6 @@
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
@click="
{
measuresDept = true;
}
"
placeholder="请选择"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
@click="getUserData('measuresUser')"
placeholder="请选择"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input>
<van-uploader
......@@ -334,7 +308,35 @@
</template>
</van-field>
<div
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
/>
<!-- <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
......@@ -342,13 +344,13 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
参考依据
</div>
判断依据
</div> -->
<van-field
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
label="判断依据"
placeholder="请选择"
@click="selectData('referenceBasis', false)"
/>
......
......@@ -114,9 +114,9 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
风险图片
风险图片
</div>
<van-field name="hdPicture1" label="风险图片">
<van-field name="hdPicture1" label="风险图片">
<template #input>
<van-uploader
disabled
......@@ -225,28 +225,6 @@
autosize
placeholder="请输入"
/>
<van-field
readonly
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请选择"
/>
<van-field
readonly
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请选择"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input>
<van-uploader
......@@ -337,22 +315,40 @@
</template>
</van-field>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
/>
参考依据
</div>
<van-field
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
label="判断依据"
placeholder="请选择"
/>
<van-field
......
......@@ -85,6 +85,17 @@
placeholder="请选择"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required label="是否为特种设备" v-if="form.pointType=='设备设施类'">
<template #input>
<van-switch
size="20"
disabled
name="specialEquipment"
v-model="form.specialEquipment"
:rules="[{ required: true, message: '是否为特种设备不能为空' }]"
/>
</template>
</van-field>
<!-- 多选 -->
<van-field
v-model="form.safetyWarningSigns"
......@@ -143,9 +154,9 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
风险图片
风险图片
</div>
<van-field name="hdPicture1" label="风险图片">
<van-field name="hdPicture1" label="风险图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'pictureFile')"
......@@ -254,28 +265,6 @@
autosize
placeholder="请输入"
/>
<van-field
readonly
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请选择"
/>
<van-field
readonly
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请选择"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input>
<van-uploader
......@@ -310,7 +299,8 @@
</van-uploader>
</template>
</van-field>
<div
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
......@@ -318,24 +308,81 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
危险源管理
应急措施
</div>
<van-field
readonly
v-model="form.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
v-model="form.measuresEmergency"
name="measuresEmergency"
label=""
type="textarea"
rows="1"
rows="3"
autosize
placeholder="请输入"
/>
<van-field name="majorHazardSource" label="是否存在重大危险源">
<van-field name="measuresEmergencyFile[]" label="上传附件">
<template #input>
<van-switch disabled v-model="form.majorHazardSource" size="20" />
<van-uploader
multiple
:max-count="5"
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
<!-- 11111111111 -->
<div
style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src="@/assets/upload/file.png"
alt=""
style="width: 0.64rem; height: 0.64rem"
/>
<span class="van-uploader__upload-text">最多上传五个</span>
</div>
</template>
</van-uploader>
</template>
</van-field>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -344,18 +391,25 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
重大危险源描述
重大危险源管理
</div>
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<van-switch disabled v-model="form.majorHazardSource" size="20" />
</template>
</van-field>
<van-field
readonly
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
v-model="form.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="3"
rows="1"
autosize
placeholder="请输入"
/>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -364,55 +418,20 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
应急措施
重大危险源描述
</div>
<van-field
readonly
v-model="form.measuresEmergency"
name="measuresEmergency"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
/>
<van-field name="measuresEmergencyFile[]" label="上传附件">
<template #input>
<van-uploader
multiple
disabled
:max-count="5"
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
<!-- 11111111111 -->
<div
style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src="@/assets/upload/file.png"
alt=""
style="width: 0.64rem; height: 0.64rem"
/>
<span class="van-uploader__upload-text">最多上传五个</span>
</div>
</template>
</van-uploader>
</template>
</van-field>
<div
<!-- <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
<img
......@@ -420,14 +439,14 @@
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
参考依据
</div>
判断依据
</div> -->
<van-field
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
label="判断依据"
placeholder="请选择"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/>
......
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