Skip to content

R
rongtong-app
Commit 356a3664 authored by 杨帆's avatar 杨帆
Browse files
Options

Merge branch 'dev-yf'' into 'develop' 

Dev yf'

See merge request !23
parents 323b9202 29d5a0bd
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 199 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 356a3664
...@@ -440,7 +440,6 @@ ...@@ -440,7 +440,6 @@
label="参考依据" label="参考依据"
placeholder="请选择" placeholder="请选择"
@click="selectData('referenceBasis', false)" @click="selectData('referenceBasis', false)"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/> />
<van-dialog <van-dialog
v-model="showGradeDialog" v-model="showGradeDialog"
...@@ -1189,6 +1188,12 @@ export default { ...@@ -1189,6 +1188,12 @@ export default {
}, },
performTasks() { performTasks() {
console.log("1233213 :>> ", 1233213); console.log("1233213 :>> ", 1233213);
this.$router.push({
name: "addPresent",
params: {
id: this.inherentId
}
});
}, },
// 点击预览图 // 点击预览图
clickPre(e) { clickPre(e) {
......
src/views/riskProject/add/addInherent.vue
View file @ 356a3664
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险信息 固有风险信息
</div> </div>
<van-field <van-field
readonly readonly
...@@ -437,7 +437,6 @@ ...@@ -437,7 +437,6 @@
label="参考依据" label="参考依据"
placeholder="请选择" placeholder="请选择"
@click="selectData('referenceBasis', false)" @click="selectData('referenceBasis', false)"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/> />
<van-dialog <van-dialog
v-model="showGradeDialog" v-model="showGradeDialog"
......
src/views/riskProject/add/addPresent.vue
View file @ 356a3664
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
alt="" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" style="position: relative;top: 32%;transform: translateY(-50%);"
/> />
风险信息 现有风险信息
</div> </div>
<van-field <van-field
readonly readonly
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<van-field <van-field
readonly readonly
required required
name="projectName" name="projectId"
:value="form.projectName" :value="form.projectId"
label="所属项目" label="所属项目"
placeholder="请输入" placeholder="请输入"
/> />
...@@ -39,31 +39,43 @@ ...@@ -39,31 +39,43 @@
name="buildingName" name="buildingName"
:value="form.buildingName" :value="form.buildingName"
label="所属建筑物" label="所属建筑物"
placeholder="请输入" placeholder="请输入 "
/> />
<van-field <van-field
required required
readonly clickable
name="floorName" name="floorName"
:value="form.floorName" :value="form.floorName"
label="所属楼层" label="所属楼层"
placeholder="请选择" placeholder="请选择"
@click="seletFloor('floor')"
:rules="[{ required: true, message: '所属楼层不能为空' }]" :rules="[{ required: true, message: '所属楼层不能为空' }]"
/> />
<van-field <div style="display: flex;">
readonly <van-field
required readonly
name="roomName" required
:value="form.roomName" name="roomName"
label="所属房间" :value="form.roomName"
placeholder="请输入" label="所属房间"
:rules="[{ required: true, message: '所属房间不能为空' }]" placeholder="请输入"
/> @click="seletRoom('room')"
:rules="[{ required: true, message: '所属房间不能为空' }]"
/>
<van-button
style="color: #cccc;background-color: #f0f1f5;"
icon="plus"
type="info"
native-type="button"
@click="tjfjClcik"
/>
</div>
<van-field <van-field
required required
clickable
name="name" name="name"
v-model="form.name" v-model="form.name"
label="危险源名称" label="危险源名称"
...@@ -71,13 +83,13 @@ ...@@ -71,13 +83,13 @@
:rules="[{ required: true, message: '危险源名称不能为空' }]" :rules="[{ required: true, message: '危险源名称不能为空' }]"
/> />
<van-field <van-field
readonly
v-model="form.factor" v-model="form.factor"
readonly
required required
name="factor" name="factor"
label="风险因素" label="风险因素"
placeholder="请选择" placeholder="请选择"
@click="seletFactor('factor')" @click="selectData('factor', false)"
:rules="[{ required: true, message: '风险因素不能为空' }]" :rules="[{ required: true, message: '风险因素不能为空' }]"
/> />
...@@ -88,31 +100,10 @@ ...@@ -88,31 +100,10 @@
name="type" name="type"
label="准事故类型" label="准事故类型"
placeholder="请选择" placeholder="请选择"
@click="seletType('type')" @click="selectData('type', false)"
:rules="[{ required: true, message: '准事故类型不能为空' }]" :rules="[{ required: true, message: '准事故类型不能为空' }]"
/> />
<van-field
readonly
v-model="form.level"
required
name="level"
label="风险等级"
placeholder="请选择"
@click="seletGrade('level')"
:rules="[{ required: true, message: '风险等级不能为空' }]"
/>
<!-- <van-field
readonly
v-model="form.level"
required
name="level"
label="风险管控措施评价"
placeholder="请选择"
@click="seletGrade"
:rules="[{ required: true, message: '风险等级不能为空' }]"
/> -->
<van-field <van-field
required required
name="presenceLocation" name="presenceLocation"
...@@ -142,16 +133,17 @@ ...@@ -142,16 +133,17 @@
v-model="uploaderImg" v-model="uploaderImg"
> >
<template slot="default"> <template slot="default">
<!-- 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/pic.png" src="@/assets/upload/pic.png"
...@@ -177,13 +169,13 @@ ...@@ -177,13 +169,13 @@
<van-field <van-field
v-model="form.measuresProject" v-model="form.measuresProject"
name="measuresProject" name="measuresProject"
label="技术措施" label=""
type="textarea" type="textarea"
rows="1" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
/> />
<van-field name="measuresProjectFile[]" label=" "> <van-field name="measuresProjectFile[]" label="上传附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -216,13 +208,7 @@ ...@@ -216,13 +208,7 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </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.measuresAdministration" name="measuresAdministration" label="" type="textarea" rows="3"
autosize placeholder="请输入" /> -->
<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;"
> >
...@@ -244,26 +230,31 @@ ...@@ -244,26 +230,31 @@
/> />
<van-field <van-field
required v-model="form.measuresDeptName"
v-model="form.measuresDeptId" name="measuresDeptName"
name="measuresDeptId" label="管控责任单位 "
label="管控责任单位"
type="textarea" type="textarea"
rows="1" rows="1"
autosize autosize
placeholder="请输入" @click="
{
measuresDept = true;
}
"
placeholder="请选择"
/> />
<van-field <van-field
required v-model="form.measuresUserName"
v-model="form.measuresUserId" name="measuresUserName"
name="measuresUserId" label="管控责任人 "
label="管控责任人"
type="textarea" type="textarea"
rows="1" rows="1"
autosize autosize
placeholder="请输入" @click="getUserData('measuresUser')"
placeholder="请选择"
/> />
<van-field name="measuresAdministrationFile[]" label=" ">
<van-field name="measuresAdministrationFile[]" label="上传附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -276,14 +267,14 @@ ...@@ -276,14 +267,14 @@
<template slot="default"> <template slot="default">
<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"
...@@ -296,6 +287,7 @@ ...@@ -296,6 +287,7 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<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;"
> >
...@@ -309,13 +301,13 @@ ...@@ -309,13 +301,13 @@
<van-field <van-field
v-model="form.measuresEmergency" v-model="form.measuresEmergency"
name="measuresEmergency" name="measuresEmergency"
label="应急措施" label=""
type="textarea" type="textarea"
rows="1" rows="3"
autosize autosize
placeholder="请输入" placeholder="请输入"
/> />
<van-field name="measuresEmergencyFile[]" label=" "> <van-field name="measuresEmergencyFile[]" label="上传附件">
<template #input> <template #input>
<van-uploader <van-uploader
multiple multiple
...@@ -326,16 +318,17 @@ ...@@ -326,16 +318,17 @@
@delete="deleteFile(...arguments, 'measuresEmergencyFile')" @delete="deleteFile(...arguments, 'measuresEmergencyFile')"
> >
<template slot="default"> <template slot="default">
<!-- 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"
...@@ -348,7 +341,7 @@ ...@@ -348,7 +341,7 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<!-- v-if="this.$route.params.isView" -->
<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;"
> >
...@@ -359,34 +352,101 @@ ...@@ -359,34 +352,101 @@
/> />
参考依据 参考依据
</div> </div>
<van-field
clickable
name="referenceBasis"
:value="form.referenceBasis"
label="参考依据"
placeholder="请选择"
@click="selectData('referenceBasis', false)"
/>
<van-field <van-field
readonly readonly
v-model="form.level"
required required
name="trouble" name="level"
:value="form.trouble" label="风险等级"
label="参考依据"
placeholder="请选择" placeholder="请选择"
@click="showTrouble = true" @click="seletGrade"
:rules="[{ required: true, message: '事故类型不能为空' }]" :rules="[{ required: true, message: '风险等级不能为空' }]"
/> />
<van-popup v-model="showTrouble" position="bottom"> <van-dialog
<van-picker v-model="showGradeDialog"
show-toolbar title="风险评测配置"
value-key="name" :show-cancel-button="false"
:columns="columnsTrouble" :show-confirm-button="false"
@confirm="onConTrouble" >
@cancel="showTrouble = false" <div class="dialogContain">
/> <van-collapse v-model="activeNames">
</van-popup> <van-collapse-item title="风险模型" name="1">
<van-popup v-model="showSource" position="bottom"> <van-field
<van-picker readonly
show-toolbar required
value-key="name" name="level"
:columns="columnsSource" label="当前风险模型"
@confirm="onConSource" placeholder="LS风险矩阵评估模型"
@cancel="showSource = false" />
/> </van-collapse-item>
</van-popup> <van-collapse-item title="风险模型配置" name="2">
<van-popover
v-model="showPopover"
trigger="click"
:actions="columnsRiskRank"
@select="onSelect"
>
<template #reference>
<van-field
v-model="possibleValue"
readonly
required
name="level"
label="发生的可能性"
placeholder="请选择"
/>
</template>
</van-popover>
<van-popover
v-model="showPopoveSetRank"
trigger="click"
:actions="columnsSetRank"
@select="onSelectSetRank"
>
<template #reference>
<van-field
v-model="severityValue"
readonly
required
name="level"
label="后果严重程度"
placeholder="请选择"
/>
</template>
</van-popover>
</van-collapse-item>
</van-collapse>
<van-row type="flex" justify="center" style="margin-top:10px">
<van-col span="6"
><van-button
size="small"
plain
native-type="button"
type="info"
@click="showGradeDialog = false"
>取消</van-button
></van-col
>
<van-col span="6"
><van-button
size="small"
type="info"
native-type="button"
@click="goResultPage"
>开始测评</van-button
></van-col
>
</van-row>
</div>
</van-dialog>
<!-- 楼层弹出层 --> <!-- 楼层弹出层 -->
<van-popup <van-popup
v-model="ShowfloorList" v-model="ShowfloorList"
...@@ -399,110 +459,86 @@ ...@@ -399,110 +459,86 @@
@saveSlect="saveSlectfloor" @saveSlect="saveSlectfloor"
></selectFloor> ></selectFloor>
</van-popup> </van-popup>
<!-- 风险源弹出层 -->
<!-- 单选弹出层 -->
<van-popup v-model="showSelect" position="bottom">
<van-picker
show-toolbar
value-key="dictValue"
:columns="columnsData"
@confirm="saveSelect"
@cancel="showSelect = false"
/>
</van-popup>
<!-- 复选弹出层 -->
<van-popup <van-popup
v-model="ShowSelectList" v-model="showCheckSelect"
position="bottom" position="bottom"
:style="{ height: '100%' }" :style="{ height: '100%' }"
> >
<selectList <selectList
:listdata="columnsTrouble" :listdata="columnsCheckData"
@closeSlect="closeSlect" @closeSlect="showCheckSelect = false"
@saveSlect="saveSlect" @saveSlect="saveCheckSelect"
></selectList> ></selectList>
</van-popup> </van-popup>
<!-- 准事故类型 -->
<!-- 房间弹出层 -->
<van-popup v-model="showSource" position="bottom">
<van-picker
show-toolbar
value-key="name"
:columns="columnsSource"
@confirm="onConSource"
@cancel="showSource = false"
/>
</van-popup>
<!-- 管控责任单位 -->
<van-popup <van-popup
v-model="ShowAccidentList" v-model="measuresDept"
position="bottom" position="bottom"
:style="{ height: '100%' }" :style="{ height: '100%' }"
> >
<selectList <div
:listdata="columnsAccident" class="van-picker__toolbar"
@closeSlect="closeSlectAccident" style="position: absolute;width: 100%;top: 0;"
@saveSlect="saveSlectAccident"
> >
</selectList> <button
type="button"
class="van-picker__cancel"
v-on:click="
{
form.measuresDeptId = 0;
projectDept = false;
}
"
>
取消</button
><button type="button" class="van-picker__confirm" @click="closeDept">
确认
</button>
</div>
<div style="display:flex;margin-top: 44px;">
<selectDept @changeDept="changeDept"></selectDept>
</div>
</van-popup>
<!-- 管控责任人 -->
<van-popup v-model="showTrouble" position="bottom">
<van-picker
show-toolbar
value-key="nickName"
:columns="columnsTrouble"
@confirm="onConTrouble"
@cancel="showTrouble = false"
/>
</van-popup> </van-popup>
<!-- v-if="this.$route.params.isView" -->
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit" <van-button round block type="info" native-type="submit"
>提交</van-button >提交</van-button
> >
</div> </div>
</van-form> </van-form>
<van-dialog
v-model="showGradeDialog"
title="风险评测配置"
:show-cancel-button="false"
:show-confirm-button="false"
>
<div class="dialogContain">
<van-collapse v-model="activeNames">
<van-collapse-item title="风险模型" name="1">
<van-field
readonly
required
name="level"
label="当前风险模型"
placeholder="LS风险矩阵评估模型"
/>
</van-collapse-item>
<van-collapse-item title="风险模型配置" name="2">
<van-popover
v-model="showPopover"
trigger="click"
:actions="columnsRiskRank"
@select="onSelect"
>
<template #reference>
<van-field
v-model="possibleValue"
readonly
required
name="level"
label="发生的可能性"
placeholder="请选择"
/>
</template>
</van-popover>
<van-popover
v-model="showPopoveSetRank"
trigger="click"
:actions="columnsSetRank"
@select="onSelectSetRank"
>
<template #reference>
<van-field
v-model="severityValue"
readonly
required
name="level"
label="后果严重程度"
placeholder="请选择"
/>
</template>
</van-popover>
</van-collapse-item>
</van-collapse>
<van-row type="flex" justify="center" style="margin-top:10px">
<van-col span="6"
><van-button
size="small"
plain
type="info"
@click="showGradeDialog = false"
>取消</van-button
></van-col
>
<van-col span="6"
><van-button size="small" type="info" @click="goResultPage"
>开始测评</van-button
></van-col
>
</van-row>
</div>
</van-dialog>
<!-- v-if="this.$route.params.isView" --> <!-- v-if="this.$route.params.isView" -->
<div style="margin: 10px 16px 0px; padding-bottom: 16px"> <div style="margin: 10px 16px 0px; padding-bottom: 16px">
<van-button round block type="warning" @click.native="cancel" <van-button round block type="warning" @click.native="cancel"
......
src/views/riskProject/add/inherentRisks.vue
View file @ 356a3664
...@@ -162,13 +162,26 @@ export default { ...@@ -162,13 +162,26 @@ export default {
// this.postList(); // this.postList();
}, },
methods: { methods: {
delInherent() { delInherent(item) {
Dialog.confirm({ Dialog.confirm({
title: "删除固有风险", title: "删除固有风险",
message: "是否确认删除？" message: "是否确认删除？"
}) })
.then(() => { .then(() => {
// on confirm // on confirm
getFun(`/risk/plan/inherent/delete/${item.id}`).then(res => {
this.$toast.success(res.msg);
this.riskList(
this.planId,
this.buildingId,
this.value1,
this.value2
);
// });
});
{
inherentId;
}
}) })
.catch(() => { .catch(() => {
// on cancel // on cancel
......
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