Skip to content

R
rongtong-app
Commit 81def004 authored by yf's avatar yf
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf'

parents f212e12b 4e02b7b4
Show whitespace changes
Inline Side-by-side
Showing with 856 additions and 835 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 81def004
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
/> />
<!-- 单选 --> <!-- 单选 -->
<van-field <van-field
readonly
required required
clickable clickable
name="pointType" name="pointType"
...@@ -95,6 +96,11 @@ ...@@ -95,6 +96,11 @@
@click="selectData('pointType', true)" @click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]" :rules="[{ required: true, message: '风险点类型不能为空' }]"
/> />
<van-field required label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<template #input>
<van-switch v-model="form.specialEquipment" size="20" name="specialEquipment" />
</template>
</van-field>
<!-- 多选 --> <!-- 多选 -->
<van-field <van-field
v-model="form.safetyWarningSigns" v-model="form.safetyWarningSigns"
...@@ -158,9 +164,9 @@ ...@@ -158,9 +164,9 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险源图片 风险图片
</div> </div>
<van-field name="hdPicture1" label="风险源图片"> <van-field name="hdPicture1" label="风险图片">
<template #input> <template #input>
<van-uploader <van-uploader
@delete="deleteFile(...arguments, 'pictureFile')" @delete="deleteFile(...arguments, 'pictureFile')"
...@@ -201,8 +207,10 @@ ...@@ -201,8 +207,10 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 应采取的管控措施
</div> </div>
<van-field label="技术措施">
<template #input>
<van-field <van-field
v-model="form.measuresProject" v-model="form.measuresProject"
name="measuresProject" name="measuresProject"
...@@ -211,8 +219,11 @@ ...@@ -211,8 +219,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresProjectFile[]" label="上传附件1"> </template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -245,17 +256,8 @@ ...@@ -245,17 +256,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<van-field label="管控措施">
<div <template #input>
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 <van-field
v-model="form.measuresAdministration" v-model="form.measuresAdministration"
name="measuresAdministration" name="measuresAdministration"
...@@ -264,34 +266,11 @@ ...@@ -264,34 +266,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
</template>
<van-field </van-field>
v-model="form.measuresDeptName" <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -324,60 +303,8 @@ ...@@ -324,60 +303,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<div <van-field label="应急措施">
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> <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;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
应急措施
</div>
<van-field <van-field
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
name="measuresEmergency" name="measuresEmergency"
...@@ -386,8 +313,11 @@ ...@@ -386,8 +313,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresEmergencyFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -422,6 +352,35 @@ ...@@ -422,6 +352,35 @@
</template> </template>
</van-field> </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 <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
> >
...@@ -430,17 +389,72 @@ ...@@ -430,17 +389,72 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
参考依据 重大危险源管理
</div> </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+'123'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<van-field label="重大危险源描述" :disabled="!form.majorHazardSource" :required="form.majorHazardSource">
<template #input>
<van-field
:disabled="!form.majorHazardSource"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
type="textarea"
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'456'"
:rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
style="padding-left: 0;padding-top: 0;"
/>
</template>
</van-field>
<van-field <van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
readonly readonly
clickable clickable
name="referenceBasis" name="referenceBasis"
:value="form.referenceBasis" :value="form.referenceBasis=='null'?'':form.referenceBasis"
label="参考依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
@click="selectData('referenceBasis', false)" :key="form.majorHazardSource+'789'"
: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 <van-dialog
v-model="showGradeDialog" v-model="showGradeDialog"
title="风险评测配置" title="风险评测配置"
...@@ -624,8 +638,8 @@ ...@@ -624,8 +638,8 @@
<van-cell-group <van-cell-group
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index"
@click="touchstart(index, item)" @click="touchstart(index, item)"
:key="item.id"
> >
<div style="font-size: 0.45rem;padding: 5px 0;"> <div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.name }} {{ item.name }}
...@@ -858,7 +872,7 @@ export default { ...@@ -858,7 +872,7 @@ export default {
id: "", id: "",
isTimely: 1, isTimely: 1,
active: 0, active: 0,
form: {}, form: { },
projectId: "", // 所属工程 projectId: "", // 所属工程
projectName: "", // 所属工程 projectName: "", // 所属工程
projectDirectorName: "", // 所属工程 projectDirectorName: "", // 所属工程
...@@ -1283,7 +1297,7 @@ export default { ...@@ -1283,7 +1297,7 @@ export default {
// console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values) // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
var formDataJson = this.jsonToFormData(this.form); var formDataJson = this.jsonToFormData(this.form);
let url = "/risk/plan/inherent"; let url = "/risk/plan/inherent";
values.hdPicture1.forEach(item => { (values.hdPicture1||[]).forEach(item => {
if (item.file) { if (item.file) {
formDataJson.append("pictureFile[]", item.file); formDataJson.append("pictureFile[]", item.file);
} else { } else {
...@@ -1443,7 +1457,17 @@ export default { ...@@ -1443,7 +1457,17 @@ export default {
this.show = false; this.show = false;
} }
}, },
watch: {} watch: {
'form.pointType'(val,old){
if(old){
if(val=='设备设施类'){
this.form.specialEquipment = false
}else{
this.form.specialEquipment=''
}
}
}
}
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
src/views/riskProject/add/addInherent.vue
View file @ 81def004
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
/> />
<!-- 单选 --> <!-- 单选 -->
<van-field <van-field
readonly
required required
clickable clickable
name="pointType" name="pointType"
...@@ -93,6 +94,11 @@ ...@@ -93,6 +94,11 @@
@click="selectData('pointType', true)" @click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]" :rules="[{ required: true, message: '风险点类型不能为空' }]"
/> />
<van-field required label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<template #input>
<van-switch name="specialEquipment" v-model="form.specialEquipment" size="20" />
</template>
</van-field>
<!-- 多选 --> <!-- 多选 -->
<van-field <van-field
v-model="form.safetyWarningSigns" v-model="form.safetyWarningSigns"
...@@ -156,9 +162,9 @@ ...@@ -156,9 +162,9 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险源图片 风险图片
</div> </div>
<van-field name="hdPicture1" label="风险源图片"> <van-field name="hdPicture1" label="风险图片">
<template #input> <template #input>
<van-uploader <van-uploader
@delete="deleteFile(...arguments, 'pictureFile')" @delete="deleteFile(...arguments, 'pictureFile')"
...@@ -168,7 +174,6 @@ ...@@ -168,7 +174,6 @@
v-model="uploaderImg" v-model="uploaderImg"
> >
<template slot="default"> <template slot="default">
<!-- 11111111111 -->
<div <div
style=" style="
width: 2.13333rem; width: 2.13333rem;
...@@ -199,8 +204,10 @@ ...@@ -199,8 +204,10 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 应采取的管控措施
</div> </div>
<van-field label="技术措施">
<template #input>
<van-field <van-field
v-model="form.measuresProject" v-model="form.measuresProject"
name="measuresProject" name="measuresProject"
...@@ -209,8 +216,11 @@ ...@@ -209,8 +216,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresProjectFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -243,17 +253,8 @@ ...@@ -243,17 +253,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<van-field label="管控措施">
<div <template #input>
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 <van-field
v-model="form.measuresAdministration" v-model="form.measuresAdministration"
name="measuresAdministration" name="measuresAdministration"
...@@ -262,34 +263,11 @@ ...@@ -262,34 +263,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
</template>
<van-field </van-field>
v-model="form.measuresDeptName" <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -322,60 +300,8 @@ ...@@ -322,60 +300,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<div <van-field label="应急措施">
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> <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;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
应急措施
</div>
<van-field <van-field
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
name="measuresEmergency" name="measuresEmergency"
...@@ -384,8 +310,11 @@ ...@@ -384,8 +310,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresEmergencyFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -420,6 +349,36 @@ ...@@ -420,6 +349,36 @@
</template> </template>
</van-field> </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 <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
> >
...@@ -428,15 +387,62 @@ ...@@ -428,15 +387,62 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
参考依据 重大危险源管理
</div> </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+'456'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<van-field label="重大危险源描述" :disabled="!form.majorHazardSource"
:required="form.majorHazardSource">
<template #input>
<van-field <van-field
:disabled="!form.majorHazardSource"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'123'"
:rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
style="padding-left: 0;padding-top: 0;"
/>
</template>
</van-field>
<van-field
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
readonly
clickable clickable
name="referenceBasis" name="referenceBasis"
:value="form.referenceBasis" :value="form.referenceBasis=='null'?'':form.referenceBasis"
label="参考依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
@click="selectData('referenceBasis', false)" :key="form.majorHazardSource+'7'"
:rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
@click="()=>{
if(form.majorHazardSource){
selectData('referenceBasis', false)
}
}"
/> />
<van-dialog <van-dialog
v-model="showGradeDialog" v-model="showGradeDialog"
...@@ -691,7 +697,9 @@ export default { ...@@ -691,7 +697,9 @@ export default {
id: "", id: "",
isTimely: 1, isTimely: 1,
active: 0, active: 0,
form: {}, form: {
specialEquipment:''
},
projectId: "", // 所属工程 projectId: "", // 所属工程
projectName: "", // 所属工程 projectName: "", // 所属工程
projectDirectorName: "", // 所属工程 projectDirectorName: "", // 所属工程
...@@ -1202,13 +1210,13 @@ export default { ...@@ -1202,13 +1210,13 @@ export default {
} }
}, },
watch: { watch: {
// setRank(newVal, oldVal) { 'form.pointType'(val,old){
// if (newVal == "其他定级方式") { if(val=='设备设施类'){
// this.showSetRankMode = true; this.form.specialEquipment = false
// } else { }else{
// this.showSetRankMode = false; this.form.specialEquipment = ''
// } }
// }, }
} }
}; };
</script> </script>
......
src/views/riskProject/add/addPresent.vue
View file @ 81def004
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险源图片 风险图片
</div> </div>
<van-field name="hdPicture1" label="风险源图片"> <van-field name="hdPicture1" label="风险图片">
<template #input> <template #input>
<van-uploader <van-uploader
@delete="deleteFile(...arguments, 'pictureFile')" @delete="deleteFile(...arguments, 'pictureFile')"
...@@ -156,8 +156,10 @@ ...@@ -156,8 +156,10 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 已采取的管控措施
</div> </div>
<van-field label="技术措施">
<template #input>
<van-field <van-field
v-model="form.measuresProject" v-model="form.measuresProject"
name="measuresProject" name="measuresProject"
...@@ -166,8 +168,11 @@ ...@@ -166,8 +168,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresProjectFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -200,17 +205,8 @@ ...@@ -200,17 +205,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<van-field label="管控措施">
<div <template #input>
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 <van-field
v-model="form.measuresAdministration" v-model="form.measuresAdministration"
name="measuresAdministration" name="measuresAdministration"
...@@ -219,34 +215,11 @@ ...@@ -219,34 +215,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
</template>
<van-field </van-field>
v-model="form.measuresDeptName" <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -279,17 +252,8 @@ ...@@ -279,17 +252,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<van-field label="应急措施">
<div <template #input>
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 <van-field
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
name="measuresEmergency" name="measuresEmergency"
...@@ -298,8 +262,11 @@ ...@@ -298,8 +262,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresEmergencyFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -334,7 +301,35 @@ ...@@ -334,7 +301,35 @@
</template> </template>
</van-field> </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;" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
> >
<img <img
...@@ -342,13 +337,13 @@ ...@@ -342,13 +337,13 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
参考依据 判断依据
</div> </div> -->
<van-field <van-field
clickable clickable
name="referenceBasis" name="referenceBasis"
:value="form.referenceBasis" :value="form.referenceBasis"
label="参考依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
@click="selectData('referenceBasis', false)" @click="selectData('referenceBasis', false)"
/> />
......
src/views/riskProject/taskLedger/presentDetail.vue
View file @ 81def004
...@@ -114,9 +114,9 @@ ...@@ -114,9 +114,9 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险源图片 风险图片
</div> </div>
<van-field name="hdPicture1" label="风险源图片"> <van-field name="hdPicture1" label="风险图片">
<template #input> <template #input>
<van-uploader <van-uploader
disabled disabled
...@@ -158,8 +158,10 @@ ...@@ -158,8 +158,10 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 已采取的管控措施
</div> </div>
<van-field label="技术措施">
<template #input>
<van-field <van-field
readonly readonly
v-model="form.measuresProject" v-model="form.measuresProject"
...@@ -169,12 +171,15 @@ ...@@ -169,12 +171,15 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresProjectFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
disabled
multiple multiple
disabled
:max-count="5" :max-count="5"
upload-text="最多上传五个" upload-text="最多上传五个"
v-model="measuresProjectFile" v-model="measuresProjectFile"
...@@ -205,16 +210,8 @@ ...@@ -205,16 +210,8 @@
</template> </template>
</van-field> </van-field>
<div <van-field label="管控措施">
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" <template #input>
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
已采取的管控措施
</div>
<van-field <van-field
readonly readonly
v-model="form.measuresAdministration" v-model="form.measuresAdministration"
...@@ -224,30 +221,11 @@ ...@@ -224,30 +221,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
</template>
<van-field </van-field>
readonly <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -256,6 +234,7 @@ ...@@ -256,6 +234,7 @@
upload-text="最多上传五个" upload-text="最多上传五个"
v-model="measuresAdministrationFile" v-model="measuresAdministrationFile"
accept="file" accept="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"
> >
<template slot="default"> <template slot="default">
<div <div
...@@ -280,17 +259,8 @@ ...@@ -280,17 +259,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<van-field label="应急措施">
<div <template #input>
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 <van-field
readonly readonly
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
...@@ -300,8 +270,11 @@ ...@@ -300,8 +270,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresEmergencyFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
disabled disabled
...@@ -337,23 +310,45 @@ ...@@ -337,23 +310,45 @@
</template> </template>
</van-field> </van-field>
<div <van-field
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" v-model="form.measuresDeptName"
> name="measuresDeptName"
<img label="管控责任单位 "
src="@/assets/accidentIcon/bookmark.svg" type="textarea"
alt="" rows="1"
style="position: relative;top: 32%;transform: translateY(-50%);" autosize
placeholder="请输入"
readonly
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
readonly
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
readonly
/> />
参考依据
</div>
<van-field <van-field
readonly readonly
clickable clickable
name="referenceBasis" name="referenceBasis"
:value="form.referenceBasis" :value="form.referenceBasis"
label="参考依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
/> />
<van-field <van-field
readonly readonly
......
src/views/riskProject/taskLedger/tabDetail.vue
View file @ 81def004
...@@ -85,6 +85,11 @@ ...@@ -85,6 +85,11 @@
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '风险点类型不能为空' }]" :rules="[{ required: true, message: '风险点类型不能为空' }]"
/> />
<van-field required name="specialEquipment" label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<template #input>
<van-switch disabled v-model="form.specialEquipment" size="20" />
</template>
</van-field>
<!-- 多选 --> <!-- 多选 -->
<van-field <van-field
v-model="form.safetyWarningSigns" v-model="form.safetyWarningSigns"
...@@ -143,9 +148,9 @@ ...@@ -143,9 +148,9 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险源图片 风险图片
</div> </div>
<van-field name="hdPicture1" label="风险源图片"> <van-field name="hdPicture1" label="风险图片">
<template #input> <template #input>
<van-uploader <van-uploader
@delete="deleteFile(...arguments, 'pictureFile')" @delete="deleteFile(...arguments, 'pictureFile')"
...@@ -187,8 +192,10 @@ ...@@ -187,8 +192,10 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 应采取的管控措施
</div> </div>
<van-field label="技术措施">
<template #input>
<van-field <van-field
readonly readonly
v-model="form.measuresProject" v-model="form.measuresProject"
...@@ -198,8 +205,11 @@ ...@@ -198,8 +205,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresProjectFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -234,16 +244,8 @@ ...@@ -234,16 +244,8 @@
</template> </template>
</van-field> </van-field>
<div <van-field label="管控措施">
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" <template #input>
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
应采取的管控措施
</div>
<van-field <van-field
readonly readonly
v-model="form.measuresAdministration" v-model="form.measuresAdministration"
...@@ -253,30 +255,11 @@ ...@@ -253,30 +255,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
</template>
<van-field </van-field>
readonly <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -310,62 +293,8 @@ ...@@ -310,62 +293,8 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<div <van-field label="应急措施">
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
readonly
v-model="form.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field name="majorHazardSource" label="是否存在重大危险源">
<template #input> <template #input>
<van-switch disabled 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
readonly
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;"
>
<img
src="@/assets/accidentIcon/bookmark.svg"
alt=""
style="position: relative;top: 32%;transform: translateY(-50%);"
/>
应急措施
</div>
<van-field <van-field
readonly readonly
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
...@@ -375,8 +304,11 @@ ...@@ -375,8 +304,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/> />
<van-field name="measuresEmergencyFile[]" label="上传附件"> </template>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -412,6 +344,38 @@ ...@@ -412,6 +344,38 @@
</template> </template>
</van-field> </van-field>
<van-field
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
readonly
/>
<van-field
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
readonly
/>
<van-field
v-model="form.measuresUserPhone"
name="measuresUserPhone"
label="管控责任人联系方式"
type="textarea"
rows="1"
autosize
placeholder="请输入"
maxlength="11"
readonly
/>
<div <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
> >
...@@ -420,16 +384,49 @@ ...@@ -420,16 +384,49 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
参考依据 重大危险源管理
</div> </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.hazardSourceName"
name="hazardSourceName"
label="危险源名称 "
type="textarea"
rows="1"
autosize
placeholder="请输入"
/>
<van-field label="重大危险源描述" :required="form.majorHazardSource">
<template #input>
<van-field
readonly
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/>
</template>
</van-field>
<van-field <van-field
readonly readonly
clickable clickable
name="referenceBasis" name="referenceBasis"
:value="form.referenceBasis" :value="form.referenceBasis"
label="参考依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '事故类型不能为空' }]" :rules="[{ required: true, message: '判断依据不能为空' }]"
/> />
</van-form> </van-form>
</div> </div>
...@@ -482,7 +479,9 @@ export default { ...@@ -482,7 +479,9 @@ export default {
id: "", id: "",
isTimely: 1, isTimely: 1,
active: 0, active: 0,
form: {}, form: {
specialEquipment:false
},
projectId: "", // 所属工程 projectId: "", // 所属工程
projectName: "", // 所属工程 projectName: "", // 所属工程
projectDirectorName: "", // 所属工程 projectDirectorName: "", // 所属工程
......
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