Skip to content

B
BCDH-APP
Commit 615b381c authored by 罗新东's avatar 罗新东
Browse files
Options

隐患复查

parent 6115d83d
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 185 deletions
src/views/danger/addDanger/addDanger.vue
View file @ 615b381c
......@@ -27,7 +27,7 @@
@click="showProjectName = true"
:rules="[{ required: true, message: '所属项目不能为空' }]"
/>
<van-popup v-model="showProjectName" position="bottom">
<van-popup v-model="showProjectName" position="bottom" v-if="!isShowreturnCause">
<van-picker
show-toolbar
value-key="projectName"
......@@ -47,7 +47,7 @@
@click="showRange = true"
:rules="[{ required: true, message: '适用范围不能为空' }]"
/>
<van-popup v-model="showRange" position="bottom">
<van-popup v-model="showRange" position="bottom" v-if="!isShowreturnCause">
<van-picker
show-toolbar
value-key="hdRange"
......@@ -67,7 +67,7 @@
@click="showType = true"
:rules="[{ required: true, message: '隐患类型不能为空' }]"
/>
<van-popup v-model="showType" position="bottom">
<van-popup v-model="showType" position="bottom" v-if="!isShowreturnCause">
<van-picker
show-toolbar
value-key="hdType"
......@@ -87,7 +87,7 @@
@click="showDangerName = true"
:rules="[{ required: true, message: '隐患项目名称不能为空' }]"
/>
<van-popup v-model="showDangerName" position="bottom">
<van-popup v-model="showDangerName" position="bottom" v-if="!isShowreturnCause">
<van-picker
show-toolbar
value-key="hdName"
......
src/views/danger/confirmeDanger/confirmeDanger.vue
View file @ 615b381c
......@@ -23,6 +23,10 @@
<van-col span="6">隐患类型：</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态：</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间：</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
......@@ -59,7 +63,10 @@
:value="value"
label="整改截止时间"
placeholder="点击选择日期"
@click="showCalendar = true;currentDate = new Date()"
@click="
showCalendar = true;
currentDate = new Date();
"
:rules="[{ required: true, message: '请选择日期' }]"
/>
<van-popup v-model="showCalendar" position="bottom">
......@@ -135,13 +142,13 @@
/>
</div>
<div style="margin: 16px;">
<div style="margin: 16px">
<van-button round block type="info" native-type="submit"
>保存</van-button
>
</div>
</van-form>
<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
>
......@@ -151,13 +158,13 @@
<script>
import LHeader from "@/components/header.vue";
import {getFun,postFun} from "@/service/table.js";
import { getFun, postFun } from "@/service/table.js";
import { timestampToTime } from "@/utils/format";
import { getConfirmFormList, dangerConSub } from "@/service/danger";
export default {
name: "affirm-danger",
components: {
LHeader
LHeader,
},
data() {
return {
......@@ -177,19 +184,18 @@ export default {
showPickerReview: false,
valueIdea: "",
returnReason: "",
currentDate: new Date()
currentDate: new Date(),
};
},
beforeRouteEnter(to, from, next) {
next(vm => {
next((vm) => {
if (from.name === "confirme-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.radio= "1",
vm.value = "";
(vm.radio = "1"), (vm.value = "");
vm.rectId = ""; // 隐患整改人
vm.valueRect = "";
vm.reviewId = ""; // 隐患复查人
......@@ -198,7 +204,7 @@ export default {
vm.returnReason = "";
vm.getFormList();
// 清空数据
vm.currentDate = new Date()
vm.currentDate = new Date();
}
});
},
......@@ -213,10 +219,10 @@ export default {
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
getConfirmFormList(`confirm/add/${this.taskId}`)
.then(res => {
.then((res) => {
this.$toast.clear();
this.columnsRect = res.data.rectificationUser;
this.columnsReview = res.data.rectificationReview;
......@@ -234,22 +240,31 @@ export default {
}
let formdata = new FormData();
formdata.append("confirmResult", this.radio);
formdata.append("endTime", values.endTime?values.endTime:'');
formdata.append("rectificationUser", values.rectificationUser?values.rectificationUser:'');
formdata.append("rectificationReview", values.rectificationReview?values.rectificationReview:'');
formdata.append("confirmOpinion", values.confirmOpinion?values.confirmOpinion:'');
formdata.append("endTime", values.endTime ? values.endTime : "");
formdata.append(
"rectificationUser",
values.rectificationUser ? values.rectificationUser : ""
);
formdata.append(
"rectificationReview",
values.rectificationReview ? values.rectificationReview : ""
);
formdata.append(
"confirmOpinion",
values.confirmOpinion ? values.confirmOpinion : ""
);
this.$toast.loading({
message: "提交中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
dangerConSub(`/confirm/add1/${this.taskId}`, formdata)
.then(res => {
.then((res) => {
this.$toast.clear();
this.$toast.success({
message: "提交成功",
duration: 2000
duration: 2000,
});
history.go(-1);
})
......@@ -270,18 +285,18 @@ export default {
},
onConRect(value) {
if(!value){
if (!value) {
this.showPickerRect = false;
return
return;
}
this.valueRect = value.userName;
this.rectId = value.userId;
this.showPickerRect = false;
},
onConReview(value) {
if(!value){
if (!value) {
this.showPickerReview = false;
return
return;
}
this.valueReview = value.userName;
this.reviewId = value.userId;
......@@ -292,15 +307,15 @@ export default {
this.$router.push({
name: "normal-detail",
params: {
id: taskId
}
id: taskId,
},
});
},
cancel() {
this.$router.go(-1);
}
}
},
},
};
</script>
<style lang="less" scoped>
......
src/views/danger/confirmeDanger/index.vue
View file @ 615b381c
<template>
<div>
<LHeader :text="text"></LHeader>
<van-sticky offset-top="1.5rem">
<van-sticky offset-top="1.5rem">
<van-search
v-model="searchValue"
show-action
......@@ -45,9 +45,13 @@
<van-col span="6">隐患类型：</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态：</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop ="showIndex = null">
<div class="wrapper" @click.stop="showIndex = null">
<van-button round type="primary" @click="goDetail(item)"
>详情</van-button
>
......@@ -61,24 +65,30 @@
<!-- 暂无数据 -->
<div
style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="isHaveNews"
>
暂无数据
</div>
<tab-bar :index="1"></tab-bar>
<tab-bar :index="1"></tab-bar>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import {getFun,postFun} from "@/service/table.js";
import { getFun, postFun } from "@/service/table.js";
import tabBar from "@/components/TabBar";
import { dangerConfirm } from "@/service/danger";
export default {
components: {
LHeader,
tabBar
tabBar,
},
data() {
return {
......@@ -87,7 +97,7 @@ export default {
searchValue: "",
messageList: [],
Loop: "", // 定时器
showIndex: null // 是否显示遮罩层
showIndex: null, // 是否显示遮罩层
};
},
created() {
......@@ -95,19 +105,19 @@ export default {
},
methods: {
onSearch(val) {
this.postList(this.searchValue)
this.postList(this.searchValue);
},
postList(select='') {
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
let formdata=new FormData();
formdata.append('select',select);
dangerConfirm("/confirm/list",formdata)
.then(res => {
let formdata = new FormData();
formdata.append("select", select);
dangerConfirm("/confirm/list", formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
......@@ -123,19 +133,18 @@ export default {
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return
return;
}
this.showIndex = index;
},
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.taskId
}
id: data.taskId,
},
});
this.showIndex = null;
},
......@@ -145,11 +154,11 @@ export default {
name: "affirm-danger",
params: {
data: data,
}
},
});
this.showIndex = null;
}
}
},
},
};
</script>
<style lang="less" scoped>
......@@ -163,14 +172,14 @@ export default {
background-color: #f0f1f5;
.van-cell-group--inset {
margin: 0;
margin-bottom: 0.26667rem;
padding: 0.25rem;
font-size: 0.4rem;
position: relative;
border-radius: 4%;
box-shadow: 0px 0px 10px 2px #f3f3f3;
width: 90%;
margin: 0.4rem auto;
margin-bottom: 0.26667rem;
padding: 0.25rem;
font-size: 0.4rem;
position: relative;
border-radius: 4%;
box-shadow: 0px 0px 10px 2px #f3f3f3;
width: 90%;
margin: 0.4rem auto;
.van-row {
font-size: 0.4rem;
line-height: 0.8rem;
......
src/views/danger/reportReturn/index.vue
View file @ 615b381c
......@@ -45,6 +45,11 @@
<van-col span="6">隐患类型：</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态：</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row>
<!-- {{ item.taskName }} -->
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
src/views/danger/reviewDanger/index.vue
View file @ 615b381c
......@@ -21,7 +21,7 @@
:key="index"
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-row gutter="">
<van-col span="6">隐患编号：</van-col>
<van-col span="18">{{ item.businessId }}</van-col>
</van-row>
......@@ -49,10 +49,13 @@
<van-col span="6">超期标识：</van-col>
<van-col span="18">{{ item | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态：</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop ="showIndex = null">
<div class="wrapper" @click.stop="showIndex = null">
<van-button round type="primary" @click="goDetail(item)"
>详情</van-button
>
......@@ -65,7 +68,13 @@
</div>
<!-- 暂无数据 -->
<div
style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="isHaveNews"
>
暂无数据
......@@ -77,12 +86,12 @@
<script>
import tabBar from "@/components/TabBar";
import LHeader from "@/components/header.vue";
import {getFun,postFun} from "@/service/table.js";
import { getFun, postFun } from "@/service/table.js";
import { dangerReview } from "@/service/danger";
export default {
components: {
LHeader,
tabBar
tabBar,
},
data() {
return {
......@@ -91,7 +100,7 @@ export default {
searchValue: "",
messageList: [],
Loop: "", // 定时器
showIndex: null // 是否显示遮罩层
showIndex: null, // 是否显示遮罩层
};
},
created() {
......@@ -99,23 +108,23 @@ export default {
},
methods: {
onSearch(val) {
this.postList(this.searchValue)
this.postList(this.searchValue);
},
postList(select='') {
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
let formdata=new FormData();
formdata.append('select',select);
dangerReview("/review/list",formdata)
.then(res => {
let formdata = new FormData();
formdata.append("select", select);
dangerReview("/review/list", formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
......@@ -129,36 +138,35 @@ export default {
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return
return;
}
this.showIndex = index;
},
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.taskId
}
id: data.taskId,
},
});
this.showIndex = null;
},
// 确认
goConfirm(data) {
localStorage.setItem('reviewdanger_params',JSON.stringify(data))
localStorage.setItem("reviewdanger_params", JSON.stringify(data));
this.$router.push({
name: "review-add",
params: {
data,
}
},
});
this.showIndex = null;
}
},
},
filters: {
formatTime: function(row) {
formatTime: function (row) {
if (new Date(row.dueDate).getTime() <= row.rectificationTime) {
return "超期";
} else if (
......@@ -170,8 +178,8 @@ export default {
} else {
return "正常";
}
}
}
},
},
};
</script>
<style lang="less" scoped>
......
src/views/risk/riskAdd/index.vue
View file @ 615b381c
......@@ -110,10 +110,9 @@
required
name="setRank"
:value="setRank"
label="风险定级"
placeholder="请选择"
@click="showSetRank = true"
:rules="[{ required: true, message: '风险定级不能为空' }]"
v-if="!isShowreturnCause"
/>
<van-popup v-model="showSetRank" position="bottom">
<van-picker
......@@ -165,13 +164,19 @@
/>
<van-field name="setRankModeFile" label=" " v-show="showSetRankMode">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="setRankModeImg" accept="file" />
<van-uploader
multiple
:max-count="5"
upload-text="最多上传五个"
v-model="setRankModeImg"
accept="file"
/>
</template>
</van-field>
<van-field
v-model="location"
required
required
name="location"
label="风险部位"
type="textarea"
......@@ -184,7 +189,7 @@
<van-field
readonly
clickable
required
required
name="control"
:value="control"
label="管控层级"
......@@ -250,7 +255,13 @@
/>
<van-field name="technologyFile" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="technologyImg" accept="file" />
<van-uploader
multiple
:max-count="5"
upload-text="最多上传五个"
v-model="technologyImg"
accept="file"
/>
</template>
</van-field>
......@@ -265,7 +276,13 @@
/>
<van-field name="administrationFile" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="administrationImg" accept="file" />
<van-uploader
multiple
:max-count="5"
upload-text="最多上传五个"
v-model="administrationImg"
accept="file"
/>
</template>
</van-field>
......@@ -280,7 +297,13 @@
/>
<van-field name="urgentFile" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="urgentImg" accept="file" />
<van-uploader
multiple
:max-count="5"
upload-text="最多上传五个"
v-model="urgentImg"
accept="file"
/>
</template>
</van-field>
......@@ -290,7 +313,7 @@
>
</div>
</van-form>
<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
>
......@@ -300,7 +323,7 @@
<script>
import LHeader from "@/components/header.vue";
import {getFun,postFun} from "@/service/table.js";
import { getFun, postFun } from "@/service/table.js";
import {
getFormList,
postHdSource,
......@@ -308,15 +331,15 @@ import {
postHdPeople,
postReAdd,
postriskConiCause,
postRiskShowMeasures
postRiskShowMeasures,
} from "@/service/risk";
export default {
name:"risk-add",
name: "risk-add",
components: {
LHeader
LHeader,
},
activated() {
this.showSetRank = false // 再次关闭弹出层 以防万一
this.showSetRank = false; // 再次关闭弹出层 以防万一
if (this.$route.params.status) {
this.isShowreturnCause = true;
this.text = "风险上报退回";
......@@ -325,64 +348,69 @@ export default {
}
this.getList();
this.$bus.$on("riskLevelBus", res => {
this.showSetRank = false // 再次关闭弹出层 以防万一
console.log(Boolean(res))
if(res){
this.riskRank = res
}else{
this.setRank = ""
this.$bus.$on("riskLevelBus", (res) => {
this.showSetRank = false; // 再次关闭弹出层 以防万一
console.log(Boolean(res));
if (res) {
this.riskRank = res;
} else {
this.setRank = "";
}
// 销毁一下监听事件 不然会越加越多
this.$bus.$off('riskLevelBus')
this.$bus.$off("riskLevelBus");
});
},
beforeRouteLeave(to, from, next) {
if (to.name != "matrix-grad") {
this.text = "新增风险",
this.taskId = "",
this.id = "",
this.projectId = "", // 所属工程
this.projectName = "", // 所属工程
this.showProjectName = false,
this.columnsProjectName = [],
this.factor = "", //风险因素
this.showFactor = false,
this.columnsFactor = [],
this.source = "", //风险源
this.showSource = false,
this.columnsSource = [],
this.trouble = "", //事故类型
this.showTrouble = false,
this.columnsTrouble = [],
this.setRank = "", //风险定级
this.showSetRank = false,
this.columnsSetRank = ["矩阵式定级", "其他定级方式"],
this.riskRank = "", // 风险等级
this.showRiskRank = false,
this.columnsRiskRank = ["一般风险", "较小风险", "较大风险", "重大风险"],
this.setRankMode = "", // 定级方式文字
this.setRankModeImg = [], // 定级方式图片
this.location = "", //风险部位
this.control = "", //管控层级
this.showControl = false,
this.columnsControl = ["项目级", "企业级"],
this.mainDutyDept = "", // 主责部门
this.mainDutyDeptId = "",
this.showMainDutyDept = false,
this.columnsMainDutyDept = [],
this.mainDutyPeopLe = "", // 主责人员
this.mainDutyPeopLeId = "",
this.showMainDutyPeopLe = false,
this.columnsMainDutyPeopLe = [],
this.technology = "", //技术措施文字
this.technologyImg = [], //技术措施图片
this.administration = "", //管理措施文字
this.administrationImg = [], //管理措施图片
this.urgent = "", //应急措施文字
this.urgentImg = [], //应急措施图片
this.returnCause = "", // 退回原因
this.isShowreturnCause = false
(this.text = "新增风险"),
(this.taskId = ""),
(this.id = ""),
(this.projectId = ""), // 所属工程
(this.projectName = ""), // 所属工程
(this.showProjectName = false),
(this.columnsProjectName = []),
(this.factor = ""), //风险因素
(this.showFactor = false),
(this.columnsFactor = []),
(this.source = ""), //风险源
(this.showSource = false),
(this.columnsSource = []),
(this.trouble = ""), //事故类型
(this.showTrouble = false),
(this.columnsTrouble = []),
(this.setRank = ""), //风险定级
(this.showSetRank = false),
(this.columnsSetRank = ["矩阵式定级", "其他定级方式"]),
(this.riskRank = ""), // 风险等级
(this.showRiskRank = false),
(this.columnsRiskRank = [
"一般风险",
"较小风险",
"较大风险",
"重大风险",
]),
(this.setRankMode = ""), // 定级方式文字
(this.setRankModeImg = []), // 定级方式图片
(this.location = ""), //风险部位
(this.control = ""), //管控层级
(this.showControl = false),
(this.columnsControl = ["项目级", "企业级"]),
(this.mainDutyDept = ""), // 主责部门
(this.mainDutyDeptId = ""),
(this.showMainDutyDept = false),
(this.columnsMainDutyDept = []),
(this.mainDutyPeopLe = ""), // 主责人员
(this.mainDutyPeopLeId = ""),
(this.showMainDutyPeopLe = false),
(this.columnsMainDutyPeopLe = []),
(this.technology = ""), //技术措施文字
(this.technologyImg = []), //技术措施图片
(this.administration = ""), //管理措施文字
(this.administrationImg = []), //管理措施图片
(this.urgent = ""), //应急措施文字
(this.urgentImg = []), //应急措施图片
(this.returnCause = ""), // 退回原因
(this.isShowreturnCause = false);
}
next();
},
......@@ -432,7 +460,7 @@ export default {
urgent: "", //应急措施文字
urgentImg: [], //应急措施图片
returnCause: "", // 退回原因
isShowreturnCause: false
isShowreturnCause: false,
};
},
created() {
......@@ -463,19 +491,19 @@ export default {
formdata.append("emergencyMeasure", this.urgent);
// 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
values.setRankModeFile.forEach(item => {
values.setRankModeFile.forEach((item) => {
// 定级方式
formdata.append("risk1[]", item.file);
});
values.technologyFile.forEach(item => {
values.technologyFile.forEach((item) => {
// 技术措施
formdata.append("risk2[]", item.file);
});
values.administrationFile.forEach(item => {
values.administrationFile.forEach((item) => {
// 管理措施
formdata.append("risk3[]", item.file);
});
values.urgentFile.forEach(item => {
values.urgentFile.forEach((item) => {
// 应急措施
formdata.append("risk4[]", item.file);
});
......@@ -484,7 +512,7 @@ export default {
message: "提交中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
let url = "/riskMain/add";
if (this.taskId) {
......@@ -492,11 +520,11 @@ export default {
url = `/riskMain/editSave/${this.taskId}`;
}
postReAdd(url, formdata)
.then(res => {
.then((res) => {
this.$toast.clear();
this.$toast.success({
message: "提交成功",
duration: 2000
duration: 2000,
});
history.go(-1);
})
......@@ -504,7 +532,7 @@ export default {
this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试");
});
this.$toast.clear();
this.$toast.clear();
},
// 请求表单数据
......@@ -513,10 +541,10 @@ export default {
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
getFormList("/riskMain/add")
.then(res => {
.then((res) => {
this.$toast.clear();
this.columnsProjectName = res.data.projectInformations;
this.columnsFactor = res.data.riskInventories;
......@@ -534,10 +562,67 @@ export default {
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
duration: 0,
});
postriskConiCause(`/riskMain/edit/${this.taskId}`)
.then(res => {
.then((res) => {
let data = res.data.riskMain;
let data1 = res.data.ResponsibilityMember;
this.projectId = data.pId;
this.riskRank = data.riskLevel;
this.factor = data.riskFactor;
this.source = data.riskSource;
this.trouble = data.accidentType;
this.setRank = data.level;
this.setRankMode = data.grapingMethod;
this.location = data.riskPosition;
this.control = data.controlLevel;
this.mainDutyDeptId = data.responsibilityDept;
this.mainDutyPeopLeId = data.responsibilityMember;
this.administration = data.managementMeasures;
this.urgent = data.emergencyMeasure;
this.mainDutyPeopLe = data.mainDutyPeopLe;
this.mainDutyDept = data1.dept.deptName;
this.technology=data.technicalMeasures;
// urgentImg administrationImg technologyImg
data.riskFileList4 = data.riskFileList4 || [];
data.riskFileList3 = data.riskFileList3 || [];
data.riskFileList2 = data.riskFileList2 || [];
data.riskFileList1= data.riskFileList1 || [];
this.technologyFile = data.riskFileList1.map(() => {
return {
...item,
url: item.filePath,
};
});
this.urgentImg = data.riskFileList4.map(() => {
return {
...item,
url: item.filePath,
};
});
this.administrationImg = data.riskFileList3.map(() => {
return {
...item,
url: item.filePath,
};
});
this.technologyImg = data.riskFileList2.map(() => {
return {
...item,
url: item.filePath,
};
});
// 请求人员列表
let formdata = new FormData();
formdata.append("organizationId", data.responsibilityDept);
postHdPeople(`/riskMain/getUserList`, formdata).then((res) => {
this.columnsMainDutyPeopLe = res.data;
this.mainDutyPeopLe=this.columnsMainDutyPeopLe.filter(item=>{
return item['userId']==data.responsibilityMember
})[0]['userName']
});
// console.log(data)
this.$toast.clear();
this.returnCause = res.data.reason;
})
......@@ -567,7 +652,7 @@ export default {
this.source = "";
this.trouble = "";
// 请求风险源
postHdSource(`/riskMain/showSourceName/${this.factor}`).then(res => {
postHdSource(`/riskMain/showSourceName/${this.factor}`).then((res) => {
this.columnsSource = res.data;
});
},
......@@ -583,7 +668,7 @@ export default {
// 请求事故类型
postHdType(
`/riskMain/showaccidentType/${this.factor}/${this.source}`
).then(res => {
).then((res) => {
this.columnsTrouble = res.data;
});
},
......@@ -598,7 +683,7 @@ export default {
// 请求三个措施
postRiskShowMeasures(
`/riskMain/showmeasures/${this.factor}/${this.source}/${this.trouble}`
).then(res => {
).then((res) => {
this.technology = res.data[0].measuresProject;
this.administration = res.data[0].measuresAdministration;
this.urgent = res.data[0].measuresEmergency;
......@@ -612,7 +697,7 @@ export default {
if (this.setRank == "矩阵式定级") {
this.showSetRank = false;
this.$router.push({
name: "matrix-grad"
name: "matrix-grad",
});
}
},
......@@ -644,7 +729,7 @@ export default {
// 请求主责人员
let formdata = new FormData();
formdata.append("organizationId", this.mainDutyDeptId);
postHdPeople(`/riskMain/getUserList`, formdata).then(res => {
postHdPeople(`/riskMain/getUserList`, formdata).then((res) => {
this.columnsMainDutyPeopLe = res.data;
});
},
......@@ -657,16 +742,16 @@ export default {
cancel() {
this.$router.go(-1);
}
},
},
watch:{
setRank(newVal, oldVal){
if(newVal == '其他定级方式'){
this.showSetRankMode = true
}else{
this.showSetRankMode = false
watch: {
setRank(newVal, oldVal) {
if (newVal == "其他定级方式") {
this.showSetRankMode = true;
} else {
this.showSetRankMode = false;
}
}
},
},
};
</script>
......
src/views/saveWorkbench/index.vue
View file @ 615b381c
......@@ -144,13 +144,7 @@ export default {
}
],
dangerList: [
{
key: "11",
// path: "/danger",
path: "/insert-danger",
imgUrl: require("@/assets/workbench/risk-confirm.png"),
text: "我的上报"
},
// 隐患排查治理
{
key: "1",
......@@ -159,6 +153,13 @@ export default {
imgUrl: require("@/assets/workbench/danger-report.png"),
text: "隐患上报"
},
{
key: "11",
// path: "/danger",
path: "/insert-danger",
imgUrl: require("@/assets/workbench/risk-confirm.png"),
text: "我的上报"
},
{
key: "3",
path: "/confirme-danger",
......
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