Skip to content

R
rongtong-app
Commit 54405545 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

去掉管控措施等标题，合并组

parent 431f9184
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 535 additions and 588 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 54405545
...@@ -96,9 +96,9 @@ ...@@ -96,9 +96,9 @@
@click="selectData('pointType', true)" @click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]" :rules="[{ required: true, message: '风险点类型不能为空' }]"
/> />
<van-field required name="specialEquipment" label="是否为特种设备" v-show="form.pointType=='设备设施类'"> <van-field required label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<template #input> <template #input>
<van-switch v-model="form.specialEquipment" size="20" /> <van-switch v-model="form.specialEquipment" size="20" name="specialEquipment" />
</template> </template>
</van-field> </van-field>
<!-- 多选 --> <!-- 多选 -->
...@@ -207,18 +207,23 @@ ...@@ -207,18 +207,23 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
技术措施 应采取的管控措施
</div> </div>
<van-field <van-field label="技术措施">
v-model="form.measuresProject" <template #input>
name="measuresProject" <van-field
label="" v-model="form.measuresProject"
type="textarea" name="measuresProject"
rows="3" label=""
autosize type="textarea"
placeholder="请输入" rows="3"
/> autosize
<van-field name="measuresProjectFile[]" label="上传附件"> placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/>
</template>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -251,27 +256,21 @@ ...@@ -251,27 +256,21 @@
</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;" <van-field
> v-model="form.measuresAdministration"
<img name="measuresAdministration"
src="@/assets/accidentIcon/bookmark.svg" label=""
alt="" type="textarea"
style="position: relative;top: 32%;transform: translateY(-50%);" rows="3"
/> autosize
应采取的管控措施 placeholder="请输入"
</div> style="padding-left: 0;padding-top: 0;"
<van-field />
v-model="form.measuresAdministration" </template>
name="measuresAdministration" </van-field>
label="" <van-field name="measuresAdministrationFile[]" label="管控措施附件">
type="textarea"
rows="3"
autosize
placeholder="请输入"
/>
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -304,27 +303,21 @@ ...@@ -304,27 +303,21 @@
</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;" <van-field
> v-model="form.measuresEmergency"
<img name="measuresEmergency"
src="@/assets/accidentIcon/bookmark.svg" label=""
alt="" type="textarea"
style="position: relative;top: 32%;transform: translateY(-50%);" rows="3"
/> autosize
应急措施 placeholder="请输入"
</div> style="padding-left: 0;padding-top: 0;"
<van-field />
v-model="form.measuresEmergency" </template>
name="measuresEmergency" </van-field>
label="" <van-field name="measuresEmergencyFile[]" label="应急措施附件">
type="textarea"
rows="3"
autosize
placeholder="请输入"
/>
<van-field name="measuresEmergencyFile[]" label="上传附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -417,29 +410,23 @@ ...@@ -417,29 +410,23 @@
:key="form.majorHazardSource+'123'" :key="form.majorHazardSource+'123'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]" :rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/> />
<div <van-field label="重大危险源描述" :disabled="!form.majorHazardSource"
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" :required="form.majorHazardSource">
> <template #input>
<img <van-field
src="@/assets/accidentIcon/bookmark.svg" v-model="form.majorHazardSourceDescription"
alt="" name="majorHazardSourceDescription"
style="position: relative;top: 32%;transform: translateY(-50%);" type="textarea"
/> rows="3"
重大危险源描述 autosize
</div> placeholder="请输入"
<van-field :key="form.majorHazardSource+'456'"
:disabled="!form.majorHazardSource" :rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
:required="form.majorHazardSource" style="padding-left: 0;padding-top: 0;"
v-model="form.majorHazardSourceDescription"
name="majorHazardSourceDescription" />
label="" </template>
type="textarea" </van-field>
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'456'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
/>
<van-field <van-field
:disabled="!form.majorHazardSource" :disabled="!form.majorHazardSource"
:required="form.majorHazardSource" :required="form.majorHazardSource"
...@@ -450,7 +437,7 @@ ...@@ -450,7 +437,7 @@
label="判断依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
:key="form.majorHazardSource+'789'" :key="form.majorHazardSource+'789'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]" :rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
@click="()=>{ @click="()=>{
if(form.majorHazardSource){ if(form.majorHazardSource){
selectData('referenceBasis', false) selectData('referenceBasis', false)
...@@ -885,10 +872,7 @@ export default { ...@@ -885,10 +872,7 @@ export default {
id: "", id: "",
isTimely: 1, isTimely: 1,
active: 0, active: 0,
form: { form: { },
specialEquipment:false,
pointType:''
},
projectId: "", // 所属工程 projectId: "", // 所属工程
projectName: "", // 所属工程 projectName: "", // 所属工程
projectDirectorName: "", // 所属工程 projectDirectorName: "", // 所属工程
...@@ -1479,7 +1463,7 @@ export default { ...@@ -1479,7 +1463,7 @@ export default {
if(val=='设备设施类'){ if(val=='设备设施类'){
this.form.specialEquipment = false this.form.specialEquipment = false
}else{ }else{
delete this.form.specialEquipment this.form.specialEquipment=''
} }
} }
} }
......
src/views/riskProject/add/addInherent.vue
View file @ 54405545
This diff is collapsed.
src/views/riskProject/add/addPresent.vue
View file @ 54405545
This diff is collapsed.
src/views/riskProject/taskLedger/tabDetail.vue
View file @ 54405545
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
/> />
<van-field required name="specialEquipment" label="是否为特种设备" v-show="form.pointType=='设备设施类'"> <van-field required name="specialEquipment" label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<template #input> <template #input>
<van-switch v-model="form.specialEquipment" size="20" /> <van-switch disabled v-model="form.specialEquipment" size="20" />
</template> </template>
</van-field> </van-field>
<!-- 多选 --> <!-- 多选 -->
...@@ -192,8 +192,10 @@ ...@@ -192,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"
...@@ -203,8 +205,11 @@ ...@@ -203,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
...@@ -239,16 +244,8 @@ ...@@ -239,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"
...@@ -258,8 +255,11 @@ ...@@ -258,8 +255,11 @@
rows="3" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
/> style="padding-left: 0;padding-top: 0;"
<van-field name="measuresAdministrationFile[]" label="上传附件"> />
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -293,18 +293,10 @@ ...@@ -293,18 +293,10 @@
</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
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
name="measuresEmergency" name="measuresEmergency"
label="" label=""
...@@ -312,11 +304,15 @@ ...@@ -312,11 +304,15 @@
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
disabled
:max-count="5" :max-count="5"
upload-text="最多上传五个" upload-text="最多上传五个"
v-model="measuresEmergencyFile" v-model="measuresEmergencyFile"
...@@ -356,6 +352,7 @@ ...@@ -356,6 +352,7 @@
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
readonly
/> />
<van-field <van-field
v-model="form.measuresUserName" v-model="form.measuresUserName"
...@@ -365,6 +362,7 @@ ...@@ -365,6 +362,7 @@
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
readonly
/> />
<van-field <van-field
v-model="form.measuresUserPhone" v-model="form.measuresUserPhone"
...@@ -375,6 +373,7 @@ ...@@ -375,6 +373,7 @@
autosize autosize
placeholder="请输入" placeholder="请输入"
maxlength="11" maxlength="11"
readonly
/> />
<div <div
...@@ -404,37 +403,22 @@ ...@@ -404,37 +403,22 @@
/> />
<div <van-field label="重大危险源描述" :required="form.majorHazardSource">
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" <template #input>
> <van-field
<img readonly
src="@/assets/accidentIcon/bookmark.svg" v-model="form.majorHazardSourceDescription"
alt="" name="majorHazardSourceDescription"
style="position: relative;top: 32%;transform: translateY(-50%);" label=""
/> type="textarea"
重大危险源描述 rows="3"
</div> autosize
<van-field placeholder="请输入"
readonly style="padding-left: 0;padding-top: 0;"
v-model="form.majorHazardSourceDescription" />
name="majorHazardSourceDescription" </template>
label="" </van-field>
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
clickable clickable
...@@ -442,7 +426,7 @@ ...@@ -442,7 +426,7 @@
:value="form.referenceBasis" :value="form.referenceBasis"
label="判断依据" label="判断依据"
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '事故类型不能为空' }]" :rules="[{ required: true, message: '判断依据不能为空' }]"
/> />
</van-form> </van-form>
</div> </div>
......
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