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