Commit 3ec97d5f authored by 13841799530's avatar 13841799530

2222

parents de470e2e bde79239
Pipeline #7111 passed with stage
in 13 seconds
...@@ -27,7 +27,11 @@ ...@@ -27,7 +27,11 @@
@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 +51,11 @@ ...@@ -47,7 +51,11 @@
@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"
...@@ -66,8 +74,9 @@ ...@@ -66,8 +74,9 @@
placeholder="请选择" placeholder="请选择"
@click="showType = true" @click="showType = true"
:rules="[{ required: true, message: '隐患类型不能为空' }]" :rules="[{ required: true, message: '隐患类型不能为空' }]"
:class="{'gray':isShowreturnCause}"
/> />
<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 +96,11 @@ ...@@ -87,7 +96,11 @@
@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"
...@@ -216,7 +229,29 @@ ...@@ -216,7 +229,29 @@
:max-count="5" :max-count="5"
upload-text="最多上传五个" upload-text="最多上传五个"
v-model="uploaderImg" v-model="uploaderImg"
/> >
<template slot="default">
<!-- 11111111111 -->
<div
style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src="@/assets/upload/pic.png"
alt=""
style="width: 0.64rem; height: 0.64rem"
/>
<span class="van-uploader__upload-text">最多上传五个</span>
</div>
</template>
</van-uploader>
</template> </template>
</van-field> </van-field>
...@@ -228,7 +263,29 @@ ...@@ -228,7 +263,29 @@
upload-text="最多上传五个" upload-text="最多上传五个"
v-model="uploaderVideo" v-model="uploaderVideo"
accept="video/*" accept="video/*"
/> >
<template slot="default">
<!-- 11111111111 -->
<div
style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src="@/assets/upload/video.png"
alt=""
style="width: 0.64rem; height: 0.64rem"
/>
<span class="van-uploader__upload-text">最多上传五个</span>
</div>
</template>
</van-uploader>
</template> </template>
</van-field> </van-field>
<van-field <van-field
...@@ -370,6 +427,7 @@ export default { ...@@ -370,6 +427,7 @@ export default {
data() { data() {
return { return {
id: 0,
text: "新增隐患", text: "新增隐患",
taskId: "", taskId: "",
projectId: "", // 所属工程 projectId: "", // 所属工程
...@@ -443,6 +501,7 @@ export default { ...@@ -443,6 +501,7 @@ export default {
onSubmit(values) { onSubmit(values) {
let formdata = new FormData(); let formdata = new FormData();
formdata.append("id", this.id);
formdata.append("proId", this.projectId); formdata.append("proId", this.projectId);
// formdata.append("projectName", this.projectName); // formdata.append("projectName", this.projectName);
formdata.append("hdRange", values.hdRange); formdata.append("hdRange", values.hdRange);
...@@ -526,8 +585,9 @@ export default { ...@@ -526,8 +585,9 @@ export default {
// 对数据进行赋值 // 对数据进行赋值
this.returnCause = res.data.reason; this.returnCause = res.data.reason;
let msg = res.data.hdReport; let msg = res.data.hdReport;
msg.hdPictureList=msg.hdPictureList||[]; // msg.hdPictureList=msg.hdPictureList||[];
msg.hdVideoList=msg.hdVideoList||[]; // msg.hdVideoList=msg.hdVideoList||[];
this.id = msg.id;
this.projectId = msg.proId; this.projectId = msg.proId;
this.projectName = res.data.projectInformations.filter( this.projectName = res.data.projectInformations.filter(
(item) => item.id == msg.proId (item) => item.id == msg.proId
...@@ -544,20 +604,28 @@ export default { ...@@ -544,20 +604,28 @@ export default {
this.describe = msg.hdDescribe; this.describe = msg.hdDescribe;
this.expireTime = msg.hdExpirationTime; this.expireTime = msg.hdExpirationTime;
this.recPeople = msg.rectificationUser; this.recPeople = msg.rectificationUser;
this.uploaderImg = msg.hdPictureList.map(item=>{ this.uploaderImg = (res.data.imgsysFiles || []).map((item) => {
return { return {
...item, ...item,
url:item.filePath url: item.filePath,
} };
}) });
this.uploaderVideo = msg.hdVideoList.map(item=>{ console.log(this.uploaderImg);
this.uploaderVideo = (res.data.videosysFiles || []).map((item) => {
return { return {
...item, ...item,
url:item.filePath url: item.filePath,
};
});
postHdShowPeople(`/hdreport/showPeople/${msg.proId}`).then(
(res) => {
this.columnsRecPeople = res.data;
} }
}) );
}) })
.catch(() => { .catch((err) => {
console.log(err);
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
}); });
......
...@@ -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>
......
<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;
......
...@@ -38,6 +38,10 @@ ...@@ -38,6 +38,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>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
:scroll-to-error="true" :scroll-to-error="true"
validate-trigger="onSubmit" validate-trigger="onSubmit"
> >
<van-field name="isResult" label="隐患复查结果"> <van-field name="isResult" label="审批结果">
<template #input> <template #input>
<van-radio-group <van-radio-group
v-model="radio" v-model="radio"
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
@change="selectResult" @change="selectResult"
> >
<van-radio name="1">同意</van-radio> <van-radio name="1">同意</van-radio>
<van-radio name="0">重新认定隐患级别</van-radio> <van-radio name="0">退回</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
......
...@@ -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">
......
...@@ -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>
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
> >
<van-col span="18">{{ item.createTime }}</van-col> <van-col span="18">{{ item.createTime }}</van-col>
</van-row> </van-row>
<van-row> <van-row v-if="item.thinkHdLev">
<van-col span="9" <van-col span="9"
><span class="field-title">认定隐患级别:</span></van-col ><span class="field-title">认定隐患级别:</span></van-col
> >
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
v-for="(item, index) in hdReviewList" v-for="(item, index) in hdReviewList"
:key="index" :key="index"
> >
<van-row gutter=""> <van-row gutter="" v-if="item.hdPictureList['length']">
<van-col span="7" <van-col span="7"
><span class="field-title">隐患照片:</span></van-col ><span class="field-title">隐患照片:</span></van-col
> >
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</van-col> </van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="" v-if="item.reviewDetails">
<van-col span="7" <van-col span="7"
><span class="field-title">详情描述:</span></van-col ><span class="field-title">详情描述:</span></van-col
> >
......
This diff is collapsed.
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<van-col span="6">工单状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </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">
......
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<div> <div>
<!-- 头部标签 --> <!-- 头部标签 -->
<van-sticky> <van-sticky>
<header class="header-wrap"> <header class="header-wrap">首开集团安全隐患排查治理体系</header>
首开集团安全隐患排查治理体系
</header>
</van-sticky> </van-sticky>
<!-- 搜索 --> <!-- 搜索 -->
...@@ -94,7 +92,7 @@ import tabBar from "@/components/TabBar"; ...@@ -94,7 +92,7 @@ import tabBar from "@/components/TabBar";
import { postWork } from "@/service/workbench"; import { postWork } from "@/service/workbench";
export default { export default {
components: { components: {
tabBar tabBar,
}, },
data() { data() {
return { return {
...@@ -104,23 +102,23 @@ export default { ...@@ -104,23 +102,23 @@ export default {
{ {
key: "1", key: "1",
imgUrl: require("@/assets/workbench/notice.png"), imgUrl: require("@/assets/workbench/notice.png"),
text: "通知公告" text: "通知公告",
}, },
{ {
key: "2", key: "2",
imgUrl: require("@/assets/workbench/wait-do.png"), imgUrl: require("@/assets/workbench/wait-do.png"),
text: "待办事项" text: "待办事项",
}, },
{ {
key: "3", key: "3",
imgUrl: require("@/assets/workbench/news.png"), imgUrl: require("@/assets/workbench/news.png"),
text: "消息提醒" text: "消息提醒",
}, },
{ {
key: "4", key: "4",
imgUrl: require("@/assets/workbench/set-up.png"), imgUrl: require("@/assets/workbench/set-up.png"),
text: "我的设置" text: "我的设置",
} },
], ],
riskList: [ riskList: [
// 风控分级管控 // 风控分级管控
...@@ -128,84 +126,84 @@ export default { ...@@ -128,84 +126,84 @@ export default {
key: "1", key: "1",
path: "/risk-add", path: "/risk-add",
imgUrl: require("@/assets/workbench/risk-report.png"), imgUrl: require("@/assets/workbench/risk-report.png"),
text: "风险上报" text: "风险上报",
}, },
{ {
key: "3", key: "3",
path: "/risk-confirme", path: "/risk-confirme",
imgUrl: require("@/assets/workbench/risk-confirm.png"), imgUrl: require("@/assets/workbench/risk-confirm.png"),
text: "风险确认" text: "风险确认",
}, },
{ {
key: "4", key: "4",
path: "/risk-account", path: "/risk-account",
imgUrl: require("@/assets/workbench/risk-account.png"), imgUrl: require("@/assets/workbench/risk-account.png"),
text: "风险台账" text: "风险台账",
} },
], ],
dangerList: [ dangerList: [
{
key: "11",
// path: "/danger",
path: "/insert-danger",
imgUrl: require("@/assets/workbench/risk-confirm.png"),
text: "我的上报"
},
// 隐患排查治理 // 隐患排查治理
{ {
key: "1", key: "1",
// path: "/danger", // path: "/danger",
path: "/add-danger", path: "/add-danger",
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",
imgUrl: require("@/assets/workbench/danger-confirm.png"), imgUrl: require("@/assets/workbench/danger-confirm.png"),
text: "隐患确认" text: "隐患确认",
}, },
{ {
key: "4", key: "4",
path: "/change-danger", path: "/change-danger",
imgUrl: require("@/assets/workbench/danger-rectification.png"), imgUrl: require("@/assets/workbench/danger-rectification.png"),
text: "隐患整改" text: "隐患整改",
}, },
{ {
key: "5", key: "5",
path: "/review-danger", path: "/review-danger",
imgUrl: require("@/assets/workbench/danger-acceptance.png"), imgUrl: require("@/assets/workbench/danger-acceptance.png"),
text: "隐患复查" text: "隐患复查",
}, },
{ {
key: "6", key: "6",
path: "/stand-book", path: "/stand-book",
imgUrl: require("@/assets/workbench/danger-account.png"), imgUrl: require("@/assets/workbench/danger-account.png"),
text: "隐患台账" text: "隐患台账",
}, },
{ {
key: "7", key: "7",
path: "/major-danger", path: "/major-danger",
imgUrl: require("@/assets/workbench/retification-acceptance.png"), imgUrl: require("@/assets/workbench/retification-acceptance.png"),
text: "重大隐患" text: "重大隐患",
}, },
{ {
key: "8", key: "8",
path: "/delay-approval", path: "/delay-approval",
imgUrl: require("@/assets/workbench/inspect-plane.png"), imgUrl: require("@/assets/workbench/inspect-plane.png"),
text: "延期审批" text: "延期审批",
}, },
{ {
key: "9", key: "9",
path: "/supervise-danger", path: "/supervise-danger",
imgUrl: require("@/assets/workbench/retification-acceptance.png"), imgUrl: require("@/assets/workbench/retification-acceptance.png"),
text: "隐患督办" text: "隐患督办",
}, },
{ {
key: "10", key: "10",
path: "/manager-danger", path: "/manager-danger",
imgUrl: require("@/assets/workbench/inspect-plane.png"), imgUrl: require("@/assets/workbench/inspect-plane.png"),
text: "经理督办" text: "经理督办",
}, },
], ],
safetyCheckList: [ safetyCheckList: [
...@@ -214,37 +212,37 @@ export default { ...@@ -214,37 +212,37 @@ export default {
key: "1", key: "1",
path: "", path: "",
imgUrl: require("@/assets/workbench/inspect-plane.png"), imgUrl: require("@/assets/workbench/inspect-plane.png"),
text: "检查计划" text: "检查计划",
}, },
{ {
key: "2", key: "2",
path: "", path: "",
imgUrl: require("@/assets/workbench/plane-approval.png"), imgUrl: require("@/assets/workbench/plane-approval.png"),
text: "计划审批" text: "计划审批",
}, },
{ {
key: "3", key: "3",
path: "/checked", path: "/checked",
imgUrl: require("@/assets/workbench/check-implement.png"), imgUrl: require("@/assets/workbench/check-implement.png"),
text: "检查执行" text: "检查执行",
}, },
{ {
key: "4", key: "4",
path: "/notice", path: "/notice",
imgUrl: require("@/assets/workbench/rectification-notice.png"), imgUrl: require("@/assets/workbench/rectification-notice.png"),
text: "整改通知" text: "整改通知",
}, },
{ {
key: "5", key: "5",
path: "", path: "",
imgUrl: require("@/assets/workbench/issue-rectification.png"), imgUrl: require("@/assets/workbench/issue-rectification.png"),
text: "问题整改" text: "问题整改",
}, },
{ {
key: "6", key: "6",
path: "/correct", path: "/correct",
imgUrl: require("@/assets/workbench/retification-acceptance.png"), imgUrl: require("@/assets/workbench/retification-acceptance.png"),
text: "整改验收" text: "整改验收",
}, },
{ {
key: "7", key: "7",
...@@ -266,7 +264,7 @@ export default { ...@@ -266,7 +264,7 @@ export default {
finalNewsCenterList: [], finalNewsCenterList: [],
finalRiskList: [], finalRiskList: [],
finalDangerList: [], finalDangerList: [],
finalSafetyCheckList: [] finalSafetyCheckList: [],
}; };
}, },
created() { created() {
...@@ -274,8 +272,7 @@ export default { ...@@ -274,8 +272,7 @@ export default {
this.getWorkList(); this.getWorkList();
}, },
methods: { methods: {
myClick(data) { myClick(data) {},
},
jump(path) { jump(path) {
if (path) { if (path) {
this.$router.push(path); this.$router.push(path);
...@@ -293,27 +290,27 @@ export default { ...@@ -293,27 +290,27 @@ export default {
}, },
// 搜索事件 // 搜索事件
onSearch(val) { onSearch(val) {
this.postList(this.searchValue) this.postList(this.searchValue);
}, },
// 请求工作台列表 // 请求工作台列表
getWorkList() { getWorkList() {
postWork("/mobile/menu").then(res => { postWork("/mobile/menu").then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.powerObj = res.data; this.powerObj = res.data;
if (this.powerObj.风险分级管控) { if (this.powerObj.风险分级管控) {
// 对两个数组进行比较 拿到需要的数据 赋值给新数组 (赋值给新数组是为了解决页面闪屏问题) // 对两个数组进行比较 拿到需要的数据 赋值给新数组 (赋值给新数组是为了解决页面闪屏问题)
this.finalRiskList = [...this.riskList].filter(x => this.finalRiskList = [...this.riskList].filter((x) =>
[...this.powerObj.风险分级管控].some(y => y.menuName === x.text) [...this.powerObj.风险分级管控].some((y) => y.menuName === x.text)
); );
// 如果有隐患上报权限 则在添加一个 上报退回的权限 // 如果有隐患上报权限 则在添加一个 上报退回的权限
this.powerObj.风险分级管控.map(item => { this.powerObj.风险分级管控.map((item) => {
if (item.menuName == "风险上报") { if (item.menuName == "风险上报") {
let obj = { let obj = {
key: "2", key: "2",
path: "/risk-return", path: "/risk-return",
imgUrl: require("@/assets/workbench/plane-approval.png"), imgUrl: require("@/assets/workbench/plane-approval.png"),
text: "上报退回" text: "上报退回",
}; };
this.finalRiskList.splice(1, 0, obj); this.finalRiskList.splice(1, 0, obj);
} }
...@@ -323,17 +320,17 @@ export default { ...@@ -323,17 +320,17 @@ export default {
} }
// 隐患排查治理 // 隐患排查治理
if (this.powerObj.隐患排查治理) { if (this.powerObj.隐患排查治理) {
this.finalDangerList = [...this.dangerList].filter(x => this.finalDangerList = [...this.dangerList].filter((x) =>
[...this.powerObj.隐患排查治理].some(y => y.menuName === x.text) [...this.powerObj.隐患排查治理].some((y) => y.menuName === x.text)
); );
// 如果有隐患上报权限 则在添加一个 上报退回的权限 // 如果有隐患上报权限 则在添加一个 上报退回的权限
this.powerObj.隐患排查治理.map(item => { this.powerObj.隐患排查治理.map((item) => {
if (item.menuName == "隐患上报") { if (item.menuName == "隐患上报") {
let obj = { let obj = {
key: "2", key: "2",
path: "/report-return", path: "/report-return",
imgUrl: require("@/assets/workbench/rectification-notice.png"), imgUrl: require("@/assets/workbench/rectification-notice.png"),
text: "上报退回" text: "上报退回",
}; };
this.finalDangerList.splice(1, 0, obj); this.finalDangerList.splice(1, 0, obj);
} }
...@@ -344,8 +341,8 @@ export default { ...@@ -344,8 +341,8 @@ export default {
// this.finalDangerList = this.dangerList // this.finalDangerList = this.dangerList
// 安全监督检查 // 安全监督检查
if (this.powerObj.安全监督检查) { if (this.powerObj.安全监督检查) {
this.finalSafetyCheckList = [...this.safetyCheckList].filter(x => this.finalSafetyCheckList = [...this.safetyCheckList].filter((x) =>
[...this.powerObj.安全监督检查].some(y => y.menuName === x.text) [...this.powerObj.安全监督检查].some((y) => y.menuName === x.text)
); );
} else { } else {
this.finalSafetyCheckList = []; this.finalSafetyCheckList = [];
...@@ -356,8 +353,8 @@ export default { ...@@ -356,8 +353,8 @@ export default {
this.powerObj = []; this.powerObj = [];
} }
}); });
} },
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
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