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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 856 additions and 835 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 81def004
This diff is collapsed.
src/views/riskProject/add/addInherent.vue
View file @ 81def004
This diff is collapsed.
src/views/riskProject/add/addPresent.vue
View file @ 81def004
This diff is collapsed.
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;"
/>
<van-field </template>
readonly </van-field>
v-model="form.measuresDeptName" <van-field name="measuresAdministrationFile[]" label="管控措施附件">
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;" <template #input>
>
<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>
<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
...@@ -391,14 +323,14 @@ ...@@ -391,14 +323,14 @@
<!-- 11111111111 --> <!-- 11111111111 -->
<div <div
style=" style="
width: 2.13333rem; width: 2.13333rem;
height: 2.13333rem; height: 2.13333rem;
background: #f7f8fa; background: #f7f8fa;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
" "
> >
<img <img
src="@/assets/upload/file.png" src="@/assets/upload/file.png"
...@@ -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