Skip to content

B
BCDH-APP
Commit e616b47d authored by 王李辉's avatar 王李辉
Browse files
Options

风险 隐患操作模块加入列表数据

parent 3a8dd64d
Hide whitespace changes
Inline Side-by-side
Showing with 770 additions and 128 deletions
src/App.vue
View file @ e616b47d
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
<template> <template>
<div id="app"> <div id="app">
<transition :name="transitionName"> <transition :name="transitionName">
<router-view class="router-view" /> <keep-alive :include="cachePage">
<router-view class="router-view" />
</keep-alive>
</transition> </transition>
</div> </div>
</template> </template>
...@@ -20,7 +22,8 @@ ...@@ -20,7 +22,8 @@
export default { export default {
data () { data () {
return { return {
transitionName: 'slide-left' transitionName: 'slide-left',
cachePage:["change-info","affirm-danger","risk-affirm","manager-survey","super-survey","major-survey"]
} }
}, },
watch: { watch: {
......
src/views/danger/addDanger/addDanger.vue
View file @ e616b47d
...@@ -143,6 +143,8 @@ ...@@ -143,6 +143,8 @@
@click="showSource = true" @click="showSource = true"
:rules="[{ required: true, message: '风险源不能为空' }]" :rules="[{ required: true, message: '风险源不能为空' }]"
/> />
<van-popup v-model="showSource" position="bottom"> <van-popup v-model="showSource" position="bottom">
<van-picker <van-picker
show-toolbar show-toolbar
...@@ -159,11 +161,11 @@ ...@@ -159,11 +161,11 @@
name="dangerSource" name="dangerSource"
:value="source1" :value="source1"
label=" " label=" "
@click="showSource1 = true" @click="showSource1 = true"
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '风险源不能为空' }]" :rules="[{ required: true, message: '风险源不能为空' }]"
/> />
<!-- @click="goSelectTwo" --> <!-- @click="goSelectTwo" -->
<van-popup v-model="showSource1" position="bottom"> <van-popup v-model="showSource1" position="bottom">
<van-picker <van-picker
...@@ -275,15 +277,12 @@ export default { ...@@ -275,15 +277,12 @@ export default {
LHeader LHeader
}, },
created() { created() {
this.taskId = this.$route.params.taskId this.taskId = this.$route.params.taskId
if (this.taskId) { if (this.taskId) {
this.isShowreturnCause = true; this.isShowreturnCause = true;
this.text = "隐患上报退回"; this.text = "隐患上报退回";
this.postReturnEcho() this.postReturnEcho()
console.log(this.taskId);
console.log(Boolean( this.taskId));
} }
console.log("taskid"+this.taskId);
this.getList(); this.getList();
}, },
data() { data() {
...@@ -327,9 +326,9 @@ export default { ...@@ -327,9 +326,9 @@ export default {
}; };
}, },
mounted(){ mounted(){
// this.$bus.$on("sourceAyy", res =>{ this.$bus.$on("sourceAyy", res =>{
// console.log(res.join(",")); console.log(res.join(","));
// }) })
}, },
methods: { methods: {
onSubmit(values) { onSubmit(values) {
...@@ -510,19 +509,19 @@ export default { ...@@ -510,19 +509,19 @@ export default {
this.source1 = value.riskSource; this.source1 = value.riskSource;
this.showSource1 = false; this.showSource1 = false;
}, },
// goSelectTwo(){ goSelectTwo(){
// if(this.source){ if(this.source){
// // 跳转到多选页面 // 跳转到多选页面
// this.$router.push({ this.$router.push({
// name: "choose-people", name: "choose-people",
// params:{ params:{
// source:this.source source:this.source
// } }
// }) })
// }else{ }else{
// this.$toast("请先选择风险源"); this.$toast("请先选择风险源");
// } }
// }, },
// 隐患到期时间 // 隐患到期时间
onConExpireTime(date) { onConExpireTime(date) {
this.expireTime = timestampToTime(date, "DT1", true); this.expireTime = timestampToTime(date, "DT1", true);
......
src/views/danger/changeDanger/changeInfo.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
v-for="(item, index) in messageList"
:key="index"
inset
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="5">所属项目:</van-col>
<van-col span="19">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患级别:</van-col>
<van-col span="19">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">适用范围:</van-col>
<van-col span="19">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患类型:</van-col>
<van-col span="19">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">发现时间:</van-col>
<van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">超期标识:</van-col>
<van-col span="19">{{ item.dueDate | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">状态:</van-col>
<van-col span="19">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error="false" :show-error="false"
...@@ -27,10 +65,7 @@ ...@@ -27,10 +65,7 @@
:rules="[{ required: true, message: '隐患整改详情描述不能为空' }]" :rules="[{ required: true, message: '隐患整改详情描述不能为空' }]"
/> />
<van-field <van-field name="uploader" label="整改照片">
name="uploader"
label="整改照片"
>
<template #input> <template #input>
<van-uploader v-model="uploaderImg" /> <van-uploader v-model="uploaderImg" />
</template> </template>
...@@ -60,6 +95,7 @@ ...@@ -60,6 +95,7 @@
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import { dangerRectReturn, dangerRectAdd } from "@/service/danger"; import { dangerRectReturn, dangerRectAdd } from "@/service/danger";
export default { export default {
name: "change-info",
components: { components: {
LHeader LHeader
}, },
...@@ -68,6 +104,7 @@ export default { ...@@ -68,6 +104,7 @@ export default {
text: "整改确认", text: "整改确认",
taskId: "", taskId: "",
taskName: "", taskName: "",
messageList: [],
returnCause: "", returnCause: "",
isShowreturnCause: false, isShowreturnCause: false,
value: "", value: "",
...@@ -75,15 +112,28 @@ export default { ...@@ -75,15 +112,28 @@ export default {
uploaderVideo: [] //视频上传 uploaderVideo: [] //视频上传
}; };
}, },
created() { beforeRouteEnter(to, from, next) {
this.taskId = this.$route.params.taskId; next(vm => {
this.taskName = this.$route.params.taskName; if (from.name === "change-danger") {
if (this.taskName == "隐患整改(已退回)") { vm.messageList = []
this.isShowreturnCause = true; let paramsData = to.params.data;
// 请求退回原因 vm.taskId = paramsData.taskId;
this.getRectReturn(); vm.taskName = paramsData.taskName;
} vm.messageList.push(paramsData);
if (vm.taskName == "隐患整改(已退回)") {
vm.isShowreturnCause = true;
// 请求退回原因
vm.getRectReturn();
}
// 清空数据
vm.value="",
vm.uploaderImg=[]; //图像上传
vm.uploaderVideo=[] //视频上传
}
});
}, },
activated() {},
methods: { methods: {
onSubmit(values) { onSubmit(values) {
console.log("submit", values); console.log("submit", values);
...@@ -102,7 +152,7 @@ export default { ...@@ -102,7 +152,7 @@ export default {
if (this.taskName == "隐患整改(已退回)") { if (this.taskName == "隐患整改(已退回)") {
url = `/rectification/add2/${this.taskId}`; url = `/rectification/add2/${this.taskId}`;
} }
dangerRectAdd(url,formdata) dangerRectAdd(url, formdata)
.then(res => { .then(res => {
this.$toast.clear(); this.$toast.clear();
this.$toast.success({ this.$toast.success({
...@@ -134,13 +184,64 @@ export default { ...@@ -134,13 +184,64 @@ export default {
this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
}); });
}, },
// 详情
goDetail(taskId) {
this.$router.push({
name: "normal-detail",
params: {
id: taskId
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
} }
},
filters: {
formatTime: function(val) {
if (new Date(val).getTime() <= new Date().getTime()) {
return "超期";
} else if (
new Date(val).getTime() >= new Date().getTime() &&
new Date(val).getTime() <= new Date().getTime() + 259200000
) {
return "临期";
} else {
return "正常";
}
}
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0.266667rem 0;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/danger/changeDanger/index.vue
View file @ e616b47d
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="read(item)"
@touchstart="touchstart(index, item)" @touchstart="touchstart(index, item)"
@touchend.prevent="touchend(index)" @touchend.prevent="touchend(index)"
> >
...@@ -144,8 +143,7 @@ export default { ...@@ -144,8 +143,7 @@ export default {
this.$router.push({ this.$router.push({
name:"change-info", name:"change-info",
params:{ params:{
"taskId":data.taskId, data: data,
"taskName":data.taskName
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/confirmeDanger/confirmeDanger.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="5">所属项目:</van-col>
<van-col span="19">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患级别:</van-col>
<van-col span="19">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">适用范围:</van-col>
<van-col span="19">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患类型:</van-col>
<van-col span="19">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">发现时间:</van-col>
<van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error="false" :show-error="false"
...@@ -80,15 +110,15 @@ ...@@ -80,15 +110,15 @@
/> />
</van-popup> </van-popup>
<van-field <van-field
v-model="valueIdea" v-model="valueIdea"
label="意见" label="意见"
name="confirmOpinion" name="confirmOpinion"
rows="3" rows="3"
type="textarea" type="textarea"
placeholder="请输入" placeholder="请输入"
:rules="[{ required: true, message: '意见不能为空' }]" :rules="[{ required: true, message: '意见不能为空' }]"
/> />
</div> </div>
<!-- 退回是的选项 --> <!-- 退回是的选项 -->
...@@ -123,12 +153,14 @@ import LHeader from "@/components/header.vue"; ...@@ -123,12 +153,14 @@ import LHeader from "@/components/header.vue";
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",
components: { components: {
LHeader LHeader
}, },
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [],
radio: "1", radio: "1",
text: "隐患确认", text: "隐患确认",
value: "", value: "",
...@@ -145,10 +177,28 @@ export default { ...@@ -145,10 +177,28 @@ export default {
returnReason: "" returnReason: ""
}; };
}, },
created() {
this.taskId = this.$route.params.taskId; beforeRouteEnter(to, from, next) {
this.getFormList(); next(vm => {
if (from.name === "confirme-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.value = "";
vm.rectId = ""; // 隐患整改人
vm.valueRect = "";
vm.reviewId = ""; // 隐患复查人
vm.valueReview = "";
vm.valueIdea = "";
vm.returnReason = "";
vm.getFormList();
// 清空数据
}
});
}, },
created() {},
methods: { methods: {
getFormList() { getFormList() {
if (!this.taskId) { if (!this.taskId) {
...@@ -178,19 +228,19 @@ export default { ...@@ -178,19 +228,19 @@ export default {
if (!this.taskId) { if (!this.taskId) {
return; return;
} }
let formdata = new FormData() let formdata = new FormData();
formdata.append('confirmResult', this.radio) formdata.append("confirmResult", this.radio);
formdata.append('endTime', values.endTime) formdata.append("endTime", values.endTime);
formdata.append('rectificationUser', this.rectId) formdata.append("rectificationUser", this.rectId);
formdata.append('rectificationReview', this.reviewId) formdata.append("rectificationReview", this.reviewId);
formdata.append('confirmOpinion', values.confirmOpinion) formdata.append("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({
...@@ -225,6 +275,15 @@ export default { ...@@ -225,6 +275,15 @@ export default {
this.reviewId = value.userId; this.reviewId = value.userId;
this.showPickerReview = false; this.showPickerReview = false;
}, },
// 详情
goDetail(taskId) {
this.$router.push({
name: "normal-detail",
params: {
id: taskId
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
...@@ -234,4 +293,32 @@ export default { ...@@ -234,4 +293,32 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0.266667rem 0;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/danger/confirmeDanger/index.vue
View file @ e616b47d
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
this.$router.push({ this.$router.push({
name: "affirm-danger", name: "affirm-danger",
params: { params: {
taskId: data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/delayApproval/index.vue
View file @ e616b47d
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="read(item)"
@touchstart="touchstart(index, item)" @touchstart="touchstart(index, item)"
@touchend.prevent="touchend(index)" @touchend.prevent="touchend(index)"
> >
......
src/views/danger/majorDanger/index.vue
View file @ e616b47d
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="read(item)"
@touchstart="touchstart(index, item)" @touchstart="touchstart(index, item)"
@touchend.prevent="touchend(index)" @touchend.prevent="touchend(index)"
> >
...@@ -154,9 +153,9 @@ export default { ...@@ -154,9 +153,9 @@ export default {
goConfirm(data) { goConfirm(data) {
console.log(data); console.log(data);
this.$router.push({ this.$router.push({
name:"major-survey", name: "major-survey",
params:{ params: {
"taskId":data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/majorDanger/majorSurvey.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="7">隐患编号:</van-col>
<van-col span="17">{{ item.businessId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患项目名称:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.startDate }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error='false' :show-error='false'
...@@ -83,12 +112,14 @@ ...@@ -83,12 +112,14 @@
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import { majorAdd } from "@/service/danger"; import { majorAdd } from "@/service/danger";
export default { export default {
name:"major-survey",
components: { components: {
LHeader LHeader
}, },
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [],
radio: "1", radio: "1",
text: "重大隐患审批", text: "重大隐患审批",
agreeOpinion: "", agreeOpinion: "",
...@@ -99,9 +130,21 @@ export default { ...@@ -99,9 +130,21 @@ export default {
}; };
}, },
created() { beforeRouteEnter(to, from, next) {
this.taskId = this.$route.params.taskId; next(vm => {
if (from.name === "major-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.radio = "1";
vm.agreeOpinion = "";
vm.disagreeOpinion = "";
vm.thinkLevel = ""
}
});
}, },
created() {},
methods: { methods: {
selectResult(val) { selectResult(val) {
this.radio = val; this.radio = val;
...@@ -140,7 +183,15 @@ export default { ...@@ -140,7 +183,15 @@ export default {
this.thinkLevel = value; this.thinkLevel = value;
this.showProjectName = false; this.showProjectName = false;
}, },
// 详情
goDetail(taskId) {
this.$router.push({
name: "normal-detail",
params: {
id: taskId
}
});
},
cancel() { cancel() {
...@@ -151,4 +202,32 @@ export default { ...@@ -151,4 +202,32 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/danger/managerDanger/index.vue
View file @ e616b47d
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="read(item)"
@touchstart="touchstart(index, item)" @touchstart="touchstart(index, item)"
@touchend.prevent="touchend(index)" @touchend.prevent="touchend(index)"
> >
...@@ -152,9 +151,9 @@ export default { ...@@ -152,9 +151,9 @@ export default {
goConfirm(data) { goConfirm(data) {
console.log(data); console.log(data);
this.$router.push({ this.$router.push({
name:"manager-survey", name: "manager-survey",
params:{ params: {
"taskId":data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/managerDanger/managerSurvey.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.pid)"
>
<van-row gutter="">
<van-col span="7">隐患编号:</van-col>
<van-col span="17">{{ item.hdProjectId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患项目名称:</van-col>
<van-col span="17">{{ item.projectName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患发现时间:</van-col>
<van-col span="17">{{ item.createTime }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error='false' :show-error="false"
:scroll-to-error="true" :scroll-to-error="true"
validate-trigger="onSubmit" validate-trigger="onSubmit"
> >
<van-field <van-field
v-model="opinion" v-model="opinion"
label="批示内容" label="批示内容"
name="instructionsContent" name="instructionsContent"
rows="3" rows="3"
type="textarea" type="textarea"
placeholder="请输入" placeholder="请输入"
/> />
<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
...@@ -33,21 +59,30 @@ ...@@ -33,21 +59,30 @@
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import { superviseAdd } from "@/service/danger"; import { superviseAdd } from "@/service/danger";
export default { export default {
name: "manager-survey",
components: { components: {
LHeader LHeader
}, },
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [],
text: "项目经理督办批示", text: "项目经理督办批示",
opinion: "", opinion: ""
}; };
}, },
created() { beforeRouteEnter(to, from, next) {
this.taskId = this.$route.params.taskId; next(vm => {
if (from.name === "manager-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.opinion = "";
}
});
}, },
created() {},
methods: { methods: {
onSubmit(values) { onSubmit(values) {
console.log("submit", values); console.log("submit", values);
...@@ -57,9 +92,9 @@ export default { ...@@ -57,9 +92,9 @@ export default {
loadingType: "spinner", loadingType: "spinner",
duration: 0 duration: 0
}); });
let formdata = new FormData() let formdata = new FormData();
formdata.append('instructionsContent', values.instructionsContent) formdata.append("instructionsContent", values.instructionsContent);
superviseAdd(`/instructions/add`,formdata) superviseAdd(`/instructions/add`, formdata)
.then(res => { .then(res => {
this.$toast.clear(); this.$toast.clear();
this.$toast.success({ this.$toast.success({
...@@ -73,6 +108,15 @@ export default { ...@@ -73,6 +108,15 @@ export default {
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
}); });
}, },
// 详情
goDetail(pid) {
this.$router.push({
name: "normal-detail",
params: {
id: pid
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
...@@ -82,4 +126,32 @@ export default { ...@@ -82,4 +126,32 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/danger/reviewDanger/index.vue
View file @ e616b47d
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
this.$router.push({ this.$router.push({
name: "review-add", name: "review-add",
params: { params: {
taskId: data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/reviewDanger/reviewAdd.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="5">所属项目:</van-col>
<van-col span="19">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患级别:</van-col>
<van-col span="19">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">适用范围:</van-col>
<van-col span="19">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">隐患类型:</van-col>
<van-col span="19">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">发现时间:</van-col>
<van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">超期标识:</van-col>
<van-col span="19">{{ item | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">状态:</van-col>
<van-col span="19">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error='false' :show-error='false'
...@@ -78,6 +118,7 @@ export default { ...@@ -78,6 +118,7 @@ export default {
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [],
radio: "1", radio: "1",
text: "隐患复查", text: "隐患复查",
detail: "", detail: "",
...@@ -85,9 +126,21 @@ export default { ...@@ -85,9 +126,21 @@ export default {
returnReason: "" returnReason: ""
}; };
}, },
created() { beforeRouteEnter(to, from, next) {
this.taskId = this.$route.params.taskId; next(vm => {
if (from.name === "review-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.radio= "1";
vm.detail = "";
vm.uploaderImg = []; // 隐患整改人
vm.returnReason = "";
}
});
}, },
created() {},
methods: { methods: {
selectResult(val) { selectResult(val) {
this.radio = val; this.radio = val;
...@@ -119,12 +172,64 @@ export default { ...@@ -119,12 +172,64 @@ export default {
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
}); });
}, },
// 详情
goDetail(taskId) {
this.$router.push({
name: "normal-detail",
params: {
id: taskId
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
} }
},
filters: {
formatTime: function(row) {
if (new Date(row.dueDate).getTime() <= row.rectificationTime) {
return "超期";
} else if (
new Date(row.dueDate).getTime() >= row.rectificationTime &&
new Date(row.dueDate).getTime() - 259200000 <= row.rectificationTime
) {
//三天
return "临期";
} else {
return "正常";
}
}
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/danger/superviseDanger/index.vue
View file @ e616b47d
...@@ -146,10 +146,10 @@ export default { ...@@ -146,10 +146,10 @@ export default {
// 确认 // 确认
goConfirm(data) { goConfirm(data) {
console.log(data); console.log(data);
this.$router.push({ this.$router.push({
name: "super-survey", name: "super-survey",
params: { params: {
taskId: data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/danger/superviseDanger/superSurvey.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.pid)"
>
<van-row gutter="">
<van-col span="7">隐患编号:</van-col>
<van-col span="17">{{ item.processInstanceId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患项目名称:</van-col>
<van-col span="17">{{ item.projectName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患发现时间:</van-col>
<van-col span="17">{{ item.createTime }}</van-col>
</van-row>
<!-- *接口对接4 END -->
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error='false' :show-error='false'
...@@ -33,6 +60,7 @@ ...@@ -33,6 +60,7 @@
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import { superviseAdd } from "@/service/danger"; import { superviseAdd } from "@/service/danger";
export default { export default {
name:"super-survey",
components: { components: {
LHeader LHeader
}, },
...@@ -40,14 +68,24 @@ export default { ...@@ -40,14 +68,24 @@ export default {
return { return {
taskId: "", taskId: "",
text: "隐患督办批示", text: "隐患督办批示",
messageList: [],
opinion: "", opinion: "",
}; };
}, },
created() { beforeRouteEnter(to, from, next) {
this.taskId = this.$route.params.taskId; next(vm => {
if (from.name === "supervise-danger") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.opinion = "";
}
});
}, },
created() {},
methods: { methods: {
onSubmit(values) { onSubmit(values) {
console.log("submit", values); console.log("submit", values);
...@@ -73,6 +111,15 @@ export default { ...@@ -73,6 +111,15 @@ export default {
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
}); });
}, },
// 详情
goDetail(pid) {
this.$router.push({
name: "normal-detail",
params: {
id: pid
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
...@@ -82,4 +129,32 @@ export default { ...@@ -82,4 +129,32 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
src/views/risk/riskAccount/index.vue
View file @ e616b47d
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="read(item)"
@touchstart="touchstart(index, item)" @touchstart="touchstart(index, item)"
@touchend.prevent="touchend(index)" @touchend.prevent="touchend(index)"
> >
......
src/views/risk/riskAdd/index.vue
View file @ e616b47d
...@@ -118,13 +118,32 @@ ...@@ -118,13 +118,32 @@
</van-popup> </van-popup>
<van-field <van-field
readonly
clickable
name="setRank"
:value="riskRank"
label="风险等级"
placeholder="请选择"
@click="myRiskRank"
:rules="[{ required: true, message: '风险等级不能为空' }]"
/>
<van-popup v-model="showRiskRank" position="bottom">
<van-picker
show-toolbar
:columns="columnsRiskRank"
@confirm="onConRiskRank"
@cancel="showRiskRank = false"
/>
</van-popup>
<!-- <van-field
v-model="riskRank" v-model="riskRank"
readonly readonly
name="riskRank" name="riskRank"
label="风险等级" label="风险等级"
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '风险等级不能为空' }]" :rules="[{ required: true, message: '风险等级不能为空' }]"
/> /> -->
<van-field <van-field
v-model="setRankMode" v-model="setRankMode"
...@@ -295,8 +314,10 @@ export default { ...@@ -295,8 +314,10 @@ export default {
columnsTrouble: [], columnsTrouble: [],
setRank: "", //风险定级 setRank: "", //风险定级
showSetRank: false, showSetRank: false,
columnsSetRank: ["一般风险", "较小风险", "较大风险", "重大风险"], columnsSetRank: [{ text: '矩阵式定级', disabled: true }, "其他定级方式"],
riskRank: "", // 风险等级 riskRank: "", // 风险等级
showRiskRank: false,
columnsRiskRank:["一般风险", "较小风险", "较大风险", "重大风险"],
setRankMode: "", // 定级方式文字 setRankMode: "", // 定级方式文字
setRankModeImg: [], // 定级方式图片 setRankModeImg: [], // 定级方式图片
location: "", //风险部位 location: "", //风险部位
...@@ -492,14 +513,28 @@ export default { ...@@ -492,14 +513,28 @@ export default {
// 风险定级 // 风险定级
onConSetRank(value) { onConSetRank(value) {
this.setRank = value; this.setRank = value;
this.riskRank = value; this.riskRank = ""
if (value == "重大风险" || value == "较大风险") {
this.control = "企业级";
} else {
this.control = "项目级";
}
this.showSetRank = false; this.showSetRank = false;
}, },
// 自己定义风险等级点击方法
myRiskRank(){
console.log(this.setRank);
if(this.setRank == "其他定级方式"){
this.showRiskRank = true;
}
},
// 风险等级
onConRiskRank(value) {
this.riskRank = value;
// if (value == "重大风险" || value == "较大风险") {
// this.control = "企业级";
// } else {
// this.control = "项目级";
// }
this.showRiskRank = false;
},
// 管控层级 // 管控层级
onConControl(value) { onConControl(value) {
this.control = value; this.control = value;
......
src/views/risk/riskConfirme/index.vue
View file @ e616b47d
...@@ -146,9 +146,9 @@ export default { ...@@ -146,9 +146,9 @@ export default {
goConfirm(data) { goConfirm(data) {
console.log(data); console.log(data);
this.$router.push({ this.$router.push({
name:"risk-affirm", name: "risk-affirm",
params:{ params: {
"taskId":data.taskId data: data,
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/risk/riskConfirme/riskAffirm.vue
View file @ e616b47d
<template> <template>
<div> <div>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="5">所属项目:</van-col>
<van-col span="19">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">风险等级:</van-col>
<van-col span="19">{{ item.riskLevel }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">风险源:</van-col>
<van-col span="19">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">事故类型:</van-col>
<van-col span="19">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">管控层级:</van-col>
<van-col span="19">{{ item.controllevel }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">主责部门:</van-col>
<van-col span="19">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">主责人员:</van-col>
<van-col span="19">{{ item.responsibilityMember }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="5">工单状态:</van-col>
<van-col span="19">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
</van-cell-group>
<van-form <van-form
@submit="onSubmit" @submit="onSubmit"
:show-error='false' :show-error="false"
:scroll-to-error="true" :scroll-to-error="true"
validate-trigger="onSubmit" validate-trigger="onSubmit"
> >
...@@ -22,14 +65,14 @@ ...@@ -22,14 +65,14 @@
<!-- 同意时的选项 --> <!-- 同意时的选项 -->
<div class="agree" v-if="radio == 1"> <div class="agree" v-if="radio == 1">
<van-field <van-field
v-model="agreeIdea" v-model="agreeIdea"
label="意见" label="意见"
name ="confirmOpinion" name="confirmOpinion"
rows="3" rows="3"
type="textarea" type="textarea"
placeholder="请输入" placeholder="请输入"
:rules="[{ required: true, message: '意见不能为空' }]" :rules="[{ required: true, message: '意见不能为空' }]"
/> />
</div> </div>
...@@ -38,7 +81,7 @@ ...@@ -38,7 +81,7 @@
<van-field <van-field
v-model="disagreeIdea" v-model="disagreeIdea"
label="退回原因" label="退回原因"
name ="confirmOpinion" name="confirmOpinion"
rows="3" rows="3"
type="textarea" type="textarea"
placeholder="请输入" placeholder="请输入"
...@@ -64,22 +107,34 @@ ...@@ -64,22 +107,34 @@
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import { postriskConAdd } from "@/service/risk"; import { postriskConAdd } from "@/service/risk";
export default { export default {
name: "risk-affirm",
components: { components: {
LHeader LHeader
}, },
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [],
radio: "1", radio: "1",
text: "风险确认", text: "风险确认",
agreeIdea:"", // 同意意见 agreeIdea: "", // 同意意见
disagreeIdea: "", //退回意见 disagreeIdea: "" //退回意见
}; };
}, },
created() {
this.taskId = this.$route.params.taskId; beforeRouteEnter(to, from, next) {
next(vm => {
if (from.name === "risk-confirme") {
vm.messageList = [];
let paramsData = to.params.data;
vm.taskId = paramsData.taskId;
vm.messageList.push(paramsData);
vm.agreeIdea = "";
vm.disagreeIdea = []; // 隐患整改人
}
});
}, },
created() {},
methods: { methods: {
selectResult(val) { selectResult(val) {
this.radio = val; this.radio = val;
...@@ -90,16 +145,16 @@ export default { ...@@ -90,16 +145,16 @@ export default {
if (!this.taskId) { if (!this.taskId) {
return; return;
} }
let formdata = new FormData() let formdata = new FormData();
formdata.append("confirmResult", values.radio) formdata.append("confirmResult", values.radio);
formdata.append("confirmOpinion", values.confirmOpinion) formdata.append("confirmOpinion", values.confirmOpinion);
this.$toast.loading({ this.$toast.loading({
message: "提交中...", message: "提交中...",
forbidClick: true, forbidClick: true,
loadingType: "spinner", loadingType: "spinner",
duration: 0 duration: 0
}); });
postriskConAdd(`/riskConfirm/add/${this.taskId}`,formdata) postriskConAdd(`/riskConfirm/add/${this.taskId}`, formdata)
.then(res => { .then(res => {
this.$toast.clear(); this.$toast.clear();
this.$toast.success({ this.$toast.success({
...@@ -113,12 +168,49 @@ export default { ...@@ -113,12 +168,49 @@ export default {
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
}); });
}, },
// 详情
goDetail(taskId) {
this.$router.push({
name: "risk-big-detail",
params: {
id: taskId
}
});
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
}, }
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
.detail {
position: absolute;
bottom: 0.32rem;
right: 15px;
color: #2a80f7;
font-weight: bolder;
z-index: 99;
}
</style> </style>
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