Commit 5cf5a65e authored by 罗新东's avatar 罗新东

风险和隐患添加了标签页

parent 5a469b0e
...@@ -16,14 +16,19 @@ ...@@ -16,14 +16,19 @@
</van-search> </van-search>
</van-sticky> </van-sticky>
<!-- tab标签 --> <!-- tab标签 -->
<van-tabs <van-tabs
v-model="active"
@change="
postList();
showIndex = null;
"
color="#2980f7" color="#2980f7"
@click="onClickTab($event, searchValue)"
animated animated
:sticky="true" :sticky="true"
offset-top="3rem" offset-top="3rem"
> >
<van-tab title="隐患整改"> <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<!-- 内容列表 --> <!-- 内容列表 -->
<div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
<van-cell-group <van-cell-group
...@@ -34,7 +39,11 @@ ...@@ -34,7 +39,11 @@
> >
<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 || item.id
}}
</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">所属项目:</van-col> <van-col span="6">所属项目:</van-col>
...@@ -42,7 +51,9 @@ ...@@ -42,7 +51,9 @@
</van-row> </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.hdLev | dangerText }}</van-col> <van-col span="18">{{
item.hdLev | dangerText
}}</van-col>
</van-row> </van-row>
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col> <van-col span="6">发现时间:</van-col>
...@@ -58,7 +69,9 @@ ...@@ -58,7 +69,9 @@
</van-row> </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.dueDate | formatTime }}</van-col> <van-col span="18">{{
item.dueDate | formatTime
}}</van-col>
</van-row> </van-row>
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="6">工单状态:</van-col> <van-col span="6">工单状态:</van-col>
...@@ -68,13 +81,24 @@ ...@@ -68,13 +81,24 @@
<!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
<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
> >
<van-button round type="info" @click="goConfirm(item)" <van-button
round
type="info"
@click="goConfirm(item)"
v-if="active!==2"
>隐患整改</van-button >隐患整改</van-button
> >
<van-button round type="info" @click="goDelay(item)" <van-button
round
type="info"
@click="goDelay(item)"
v-if="active!==2"
>申请延期</van-button >申请延期</van-button
> >
<!-- <van-button round type="warning " @click="goClose(item)" <!-- <van-button round type="warning " @click="goClose(item)"
...@@ -98,114 +122,45 @@ ...@@ -98,114 +122,45 @@
暂无数据 暂无数据
</div> </div>
</van-tab> </van-tab>
<van-tab title="隐患整改(已退回)">
<!-- 内容列表 -->
<div class="con-list" @touchmove="showIndex = null">
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患编号:</van-col>
<van-col span="18">{{ item.businessId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{ item.hdLev | dangerText }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">适用范围:</van-col>
<van-col span="18">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">超期标识:</van-col>
<van-col span="18">{{ item.dueDate | formatTime }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row> -->
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop="showIndex = null">
<van-button round type="primary" @click="goDetail(item)"
>详情</van-button
>
<van-button round type="info" @click="goConfirm(item)"
>隐患整改</van-button
>
<van-button round type="info" @click="goDelay(item)"
>申请延期</van-button
>
<!-- <van-button round type="warning" @click="goClose(item)"
>关闭</van-button
> -->
</div>
</van-overlay>
</van-cell-group>
</div>
<!-- 暂无数据 -->
<!-- {{messageList}} -->
<div
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="messageList.length == 0"
>
暂无数据
</div>
</van-tab>
</van-tabs> </van-tabs>
<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 { dangerRect, list1, list2 } from "@/service/danger";
import { dangerRect, list1, list2 } from "@/service/danger";
import { Dialog } from "vant"; import { Dialog } from "vant";
export default { export default {
components: { components: {
LHeader, LHeader,
tabBar,
}, },
data() { data() {
return { return {
text: "隐患整改", text: "隐患整改",
appHeight: "",
searchValue: "", searchValue: "",
isHaveNews: false,
messageList: [], messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层 showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "隐患整改",
api: "/rectification/list1",
},
{
title: "隐患整改(已退回)",
api: "/rectification/list2",
},
{
title: "隐患整改(已整改)",
api: "/rectification/finishList",
},
],
}; };
}, },
created() { created() {
this.onClickTab(0); this.postList();
}, },
methods: { methods: {
// 关闭 // 关闭
goClose(val) { goClose(val) {
...@@ -229,7 +184,7 @@ export default { ...@@ -229,7 +184,7 @@ export default {
message: "关闭成功", message: "关闭成功",
duration: 2000, duration: 2000,
}); });
this.onClickTab(0, this.searchValue) this.onClickTab(0, this.searchValue);
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
...@@ -246,34 +201,55 @@ export default { ...@@ -246,34 +201,55 @@ export default {
onSearch(val) { onSearch(val) {
this.onClickTab(0, this.searchValue); this.onClickTab(0, this.searchValue);
}, },
onClickTab(val, select = "") { postList(select = "") {
this.showIndex = null;
this.$toast.loading({ this.$toast.loading({
message: "加载中...", message: "加载中...",
forbidClick: true, forbidClick: true,
loadingType: "spinner", loadingType: "spinner",
duration: 0, duration: 0,
}); });
// 这里根据tab切换调用接口
let formdata = new FormData(); let formdata = new FormData();
formdata.append("select", select); formdata.append("select", select);
[list1, list2] postFun(this.tabs[this.active]["api"], formdata)
[val](formdata)
.then((res) => { .then((res) => {
console.log(res.rows) console.log(res);
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList = res.rows || res.data;
// 判断有无数据返回
// if (this.messageList.length == 0) {
// this.isHaveNews = true;
// }
}) })
.catch(() => { .catch((err) => {
console.log(err);
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
}); });
}, },
// onClickTab(val, select = "") {
// this.showIndex = null;
// this.$toast.loading({
// message: "加载中...",
// forbidClick: true,
// loadingType: "spinner",
// duration: 0,
// });
// // 这里根据tab切换调用接口
// let formdata = new FormData();
// formdata.append("select", select);
// [list1, list2]
// [val](formdata)
// .then((res) => {
// console.log(res.rows);
// this.$toast.clear();
// this.messageList = res.rows;
// // 判断有无数据返回
// // if (this.messageList.length == 0) {
// // this.isHaveNews = true;
// // }
// })
// .catch(() => {
// this.$toast.clear();
// this.$toast.fail("加载失败,请稍后再试");
// });
// },
// 此接口暂时废弃 // 此接口暂时废弃
// postList() { // postList() {
...@@ -389,7 +365,10 @@ export default { ...@@ -389,7 +365,10 @@ export default {
} }
} }
} }
/deep/.van-tab__pane-wrapper{ /deep/.van-tab__pane-wrapper {
min-height: 8rem; min-height: 8rem;
} }
.van-tabs__track{
min-height: 3rem;
}
</style> </style>
...@@ -176,6 +176,7 @@ export default { ...@@ -176,6 +176,7 @@ export default {
}, },
data() { data() {
return { return {
taskId: "", taskId: "",
messageList: [], messageList: [],
radio: "1", radio: "1",
......
...@@ -13,6 +13,19 @@ ...@@ -13,6 +13,19 @@
</template> </template>
</van-search> </van-search>
</van-sticky> </van-sticky>
<van-tabs
v-model="active"
@change="
postList();
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<!-- 内容列表 --> <!-- 内容列表 -->
<div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
<van-cell-group <van-cell-group
...@@ -31,7 +44,9 @@ ...@@ -31,7 +44,9 @@
</van-row> </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.hdLev | dangerText }}</van-col> <van-col span="18">{{
item.hdLev | dangerText
}}</van-col>
</van-row> </van-row>
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col> <van-col span="6">发现时间:</van-col>
...@@ -52,10 +67,16 @@ ...@@ -52,10 +67,16 @@
<!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
<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
> >
<van-button round type="info" @click="goConfirm(item)" <van-button
round
type="info"
@click="goConfirm(item)"
>确认</van-button >确认</van-button
> >
</div> </div>
...@@ -72,26 +93,37 @@ ...@@ -72,26 +93,37 @@
position: fixed; position: fixed;
top: 30%; top: 30%;
" "
v-if="messageList['length']==0" v-if="messageList['length'] == 0"
> >
暂无数据 暂无数据
</div> </div>
<tab-bar :index="1"></tab-bar> </van-tab>
</van-tabs>
</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 { dangerConfirm } from "@/service/danger"; import { dangerConfirm } from "@/service/danger";
export default { export default {
components: { components: {
LHeader, LHeader,
tabBar,
}, },
data() { data() {
return { return {
// dangerConfirm("/confirm/list", formdata)
active: 0,
tabs: [
{
title: "待确认",
api: "/confirm/list",
},
{
title: "已确认",
api: "/confirm/finishList",
},
],
text: "隐患确认", text: "隐患确认",
isHaveNews: false, isHaveNews: false,
searchValue: "", searchValue: "",
...@@ -116,7 +148,7 @@ export default { ...@@ -116,7 +148,7 @@ export default {
}); });
let formdata = new FormData(); let formdata = new FormData();
formdata.append("select", select); formdata.append("select", select);
dangerConfirm("/confirm/list", formdata) postFun(this.tabs[this.active]['api'], formdata)
.then((res) => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList = res.rows;
......
<template> <template>
<div> <div>
<van-sticky>
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
</van-sticky>
<van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
<van-search <van-search
v-model="searchValue" v-model="searchValue"
...@@ -13,7 +15,19 @@ ...@@ -13,7 +15,19 @@
</template> </template>
</van-search> </van-search>
</van-sticky> </van-sticky>
<!-- 内容列表 -->
<van-tabs
v-model="active"
@change="
postList();
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
<van-cell-group <van-cell-group
inset inset
...@@ -23,7 +37,7 @@ ...@@ -23,7 +37,7 @@
> >
<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 || item.id}}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">所属项目:</van-col> <van-col span="6">所属项目:</van-col>
...@@ -31,7 +45,9 @@ ...@@ -31,7 +45,9 @@
</van-row> </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.hdLev | dangerText }}</van-col> <van-col span="18">{{
item.hdLev | dangerText
}}</van-col>
</van-row> </van-row>
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col> <van-col span="6">发现时间:</van-col>
...@@ -56,10 +72,18 @@ ...@@ -56,10 +72,18 @@
<!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
<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
> >
<van-button round type="info" @click="goConfirm(item)" <van-button
round
type="info"
@click="goConfirm(item)"
v-if="active==0"
>隐患复查</van-button >隐患复查</van-button
> >
</div> </div>
...@@ -75,23 +99,23 @@ ...@@ -75,23 +99,23 @@
position: fixed; position: fixed;
top: 30%; top: 30%;
" "
v-if="isHaveNews" v-if="messageList['length'] == 0"
> >
暂无数据 暂无数据
</div> </div>
<tab-bar :index="1"></tab-bar> </van-tab>
</van-tabs>
</div> </div>
</template> </template>
<script> <script>
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,
}, },
data() { data() {
return { return {
...@@ -101,6 +125,18 @@ export default { ...@@ -101,6 +125,18 @@ export default {
messageList: [], messageList: [],
Loop: "", // 定时器 Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层 showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "待复查",
api: "/review/list",
},
{
title: "已复查",
api: "/review/finishList",
},
],
}; };
}, },
created() { created() {
...@@ -110,7 +146,6 @@ export default { ...@@ -110,7 +146,6 @@ export default {
onSearch(val) { onSearch(val) {
this.postList(this.searchValue); this.postList(this.searchValue);
}, },
postList(select = "") { postList(select = "") {
this.$toast.loading({ this.$toast.loading({
message: "加载中...", message: "加载中...",
...@@ -120,10 +155,10 @@ export default { ...@@ -120,10 +155,10 @@ export default {
}); });
let formdata = new FormData(); let formdata = new FormData();
formdata.append("select", select); formdata.append("select", select);
dangerReview("/review/list", formdata) postFun(this.tabs[this.active]["api"], formdata)
.then((res) => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList = res.rows||res.data;
// 判断有无数据返回 // 判断有无数据返回
if (this.messageList.length == 0) { if (this.messageList.length == 0) {
this.isHaveNews = true; this.isHaveNews = true;
...@@ -171,7 +206,8 @@ export default { ...@@ -171,7 +206,8 @@ export default {
return "超期"; return "超期";
} else if ( } else if (
new Date(row.dueDate).getTime() >= row.rectificationTime && new Date(row.dueDate).getTime() >= row.rectificationTime &&
new Date(row.dueDate).getTime() - 259200000 <= row.rectificationTime new Date(row.dueDate).getTime() - 259200000 <=
row.rectificationTime
) { ) {
//三天 //三天
return "临期"; return "临期";
......
<template>
<div>
<van-sticky offset-top="0">
<LHeader :text="text"></LHeader>
</van-sticky>
<!-- <van-sticky offset-top="1.5rem">
<van-search
v-model="searchValue"
show-action
placeholder="请输入检查名称"
@search="onSearch"
>
<template #action>
<div @click="onSearch">搜索</div>
</template>
</van-search>
</van-sticky> -->
<div class="con-list" @touchmove="showIndex = null">
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item.id }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.pId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{ item.riskLevel | riskText }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险源:</van-col>
<van-col span="18">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">事故类型:</van-col>
<van-col span="18">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">管控层级:</van-col>
<van-col span="18">{{
item["controlLevel"]
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责部门:</van-col>
<van-col span="18">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop="showIndex = null">
<van-button round type="primary" @click="goDetail(item)"
>详情</van-button
>
</div>
</van-overlay>
</van-cell-group>
</div>
<div
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="messageList['length'] == 0"
>
暂无数据
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table.js";
import { dangerReturnDel, myHDList } from "@/service/danger";
export default {
components: {
LHeader,
},
data() {
return {
value: "",
text: "我的上报",
searchValue: "",
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "我的上报",
api: "/riskMain/myList",
},
{
title: "上报退回",
api: "/riskMain/list",
},
],
};
},
created() {
this.postList();
},
methods: {
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
let formdata = new FormData();
formdata.append("select", select);
postFun("/riskMain/myList", formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows || [];
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
onSearch() {
// console.log(this.value)
this.postList(this.value);
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
}
this.showIndex = index;
},
goDetail(data) {
this.$router.push({
// name: "insert-danger-detail",
name: "risk-big-detail",
params: {
id: data.processinstanceId,
},
});
this.showIndex = null;
},
// 提交
goSubmit(data) {
this.$router.push({
name: "add-danger",
params: {
status: "退回",
taskId: data.taskId,
},
});
this.showIndex = null;
},
// 删除
goDelete(data) {
this.$toast.loading({
message: "删除中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
dangerReturnDel(`/hdreport/delete/${data.taskId}`)
.then((res) => {
this.$toast.clear();
this.$toast.success({
message: "删除成功",
duration: 2000,
});
this.postList();
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("删除失败,请稍后再试");
});
this.showIndex = null;
},
},
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
#app {
font-family: "";
color: #2c3e50;
}
.con-list {
padding: 0;
background-color: #f0f1f5;
.van-cell-group--inset {
margin: 0;
margin-bottom: 0.26667rem;
padding: 0.25rem;
font-size: 0.4rem;
position: relative;
border-radius: 4%;
box-shadow: 0px 0px 10px 2px #f3f3f3;
width: 90%;
margin: 0.4rem auto;
.van-row {
font-size: 0.4rem;
line-height: 0.8rem;
margin-bottom: 0;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
}
</style>
<template> <template>
<div> <div>
<!-- 可提交 -->
<van-sticky offset-top="0">
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
</van-sticky>
<!-- <van-sticky offset-top="1.5rem"> <!-- <van-sticky offset-top="1.5rem">
<van-search <van-search
v-model="searchValue" v-model="searchValue"
...@@ -13,8 +16,18 @@ ...@@ -13,8 +16,18 @@
</template> </template>
</van-search> </van-search>
</van-sticky> --> </van-sticky> -->
<!-- 内容列表 --> <van-tabs
<!-- 接口对接4 START --> v-model="active"
@change="
getList();
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="1.5rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
<van-cell-group <van-cell-group
inset inset
...@@ -54,7 +67,7 @@ ...@@ -54,7 +67,7 @@
</van-overlay> </van-overlay>
</van-cell-group> </van-cell-group>
</div> </div>
<!-- 暂无数据 -->
<div <div
style=" style="
width: 100%; width: 100%;
...@@ -63,16 +76,18 @@ ...@@ -63,16 +76,18 @@
position: fixed; position: fixed;
top: 30%; top: 30%;
" "
v-if="isHaveNews" v-if="messageList['length']==0"
> >
暂无数据 暂无数据
</div> </div>
</van-tab>
</van-tabs>
</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 { postriskBook } from "@/service/risk"; import { postriskBook } from "@/service/risk";
/*接口对接2 START*/ /*接口对接2 START*/
...@@ -102,6 +117,17 @@ export default { ...@@ -102,6 +117,17 @@ export default {
isHaveNews: false, isHaveNews: false,
Loop: "", // 定时器 Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层 showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "已挂账",
api: "/riskMain/doneList",
},
{
title: "待确认",
api: "/riskMain/doneListConfirm",
},
],
}; };
}, },
created() { created() {
...@@ -117,14 +143,10 @@ export default { ...@@ -117,14 +143,10 @@ export default {
loadingType: "spinner", loadingType: "spinner",
duration: 0, duration: 0,
}); });
postriskBook("/riskMain/doneList") postFun(this.tabs[this.active]['api'])
.then((res) => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList = res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
......
<template> <template>
<!-- 提交 -->
<div> <div>
<van-sticky offset-top="0">
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
</van-sticky>
<van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
<van-search <van-search
v-model="searchValue" v-model="searchValue"
...@@ -13,9 +16,24 @@ ...@@ -13,9 +16,24 @@
</template> </template>
</van-search> </van-search>
</van-sticky> </van-sticky>
<van-tabs
v-model="active"
@change="
postList();
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<!-- 内容列表 --> <!-- 内容列表 -->
<div class="con-list" @touchmove="showIndex = null"> <div
class="con-list"
@touchmove="showIndex = null"
v-if="key == active"
>
<van-cell-group <van-cell-group
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
...@@ -24,11 +42,11 @@ ...@@ -24,11 +42,11 @@
> >
<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','id'][active]] }}</van-col>
</van-row> </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.proId }}</van-col> <van-col span="18">{{ item[['proId','pId'][active]] }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">风险级别:</van-col> <van-col span="6">风险级别:</van-col>
...@@ -48,7 +66,7 @@ ...@@ -48,7 +66,7 @@
</van-row> </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.controllevel }}</van-col> <van-col span="18">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">主责部门:</van-col> <van-col span="6">主责部门:</van-col>
...@@ -58,36 +76,47 @@ ...@@ -58,36 +76,47 @@
<van-col span="6">主责人员:</van-col> <van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col> <van-col span="18">{{ item.responsibilityMember }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <!-- <van-row gutter="" v-show="item.taskName">
<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">
<van-button round type="primary" @click="goDetail(item)" <van-button round type="primary" @click="goDetail(item)"
>详情</van-button >详情</van-button
> >
<van-button round type="info" @click="goConfirm(item)" <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
>确认</van-button >确认</van-button
> >
</div> </div>
</van-overlay> </van-overlay>
</van-cell-group> </van-cell-group>
</div>
<!-- 暂无数据 -->
<div <div
style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;" style="
v-if="isHaveNews" width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="messageList['length']==0"
> >
暂无数据 暂无数据
</div> </div>
</div> </div>
<!-- 暂无数据 -->
<!-- {{messageList}} -->
</van-tab>
</van-tabs>
</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 { postriskConList } from "@/service/risk"; import { postriskConList } from "@/service/risk";
export default { export default {
components: { components: {
...@@ -96,31 +125,41 @@ export default { ...@@ -96,31 +125,41 @@ export default {
data() { data() {
return { return {
text: "风险确认", text: "风险确认",
active: "1",
searchValue: "", searchValue: "",
isHaveNews: false, isHaveNews: false,
messageList:[], messageList: [],
Loop: "", // 定时器 Loop: "", // 定时器
showIndex: null // 是否显示遮罩层 showIndex: null, // 是否显示遮罩层,
active: 0,
tabs: [
{
title: "待确认",
api: "/riskConfirm/list",
},
{
title: "已确认",
api: "/riskConfirm/finishList",
},
],
}; };
}, },
created() { created() {
this.postList() this.postList();
}, },
methods: { methods: {
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);
postFun("/riskConfirm/list",formdata) postFun(this.tabs[this.active]['api'], 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;
...@@ -133,12 +172,12 @@ export default { ...@@ -133,12 +172,12 @@ export default {
}, },
onSearch(val) { onSearch(val) {
this.postList(this.searchValue) this.postList(this.searchValue);
}, },
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;
}, },
...@@ -148,8 +187,8 @@ export default { ...@@ -148,8 +187,8 @@ export default {
this.$router.push({ this.$router.push({
name: "risk-big-detail", name: "risk-big-detail",
params: { params: {
id: data.taskId id: data.taskId||data.processinstanceId,
} },
}); });
this.showIndex = null; this.showIndex = null;
}, },
...@@ -159,27 +198,36 @@ export default { ...@@ -159,27 +198,36 @@ export default {
name: "risk-affirm", name: "risk-affirm",
params: { params: {
data: data, data: data,
} },
}); });
this.showIndex = null; this.showIndex = null;
} },
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* @import url(); 引入css类 */
#app {
font-family: "";
color: #2c3e50;
}
.con-list { .con-list {
padding: 10px 10px .533333rem; padding: 0;
background-color: #f0f1f5; background-color: #f0f1f5;
.van-cell-group--inset { .van-cell-group--inset {
margin: 0; margin: 0;
margin-bottom: 10px; margin-bottom: 0.26667rem;
padding: 10px; padding: 0.25rem;
font-size: 13px; font-size: 0.4rem;
position: relative; position: relative;
border-radius: 4%;
box-shadow: 0px 0px 10px 2px #f3f3f3;
width: 90%;
margin: 0.4rem auto;
.van-row { .van-row {
margin-bottom: 0.133333rem; font-size: 0.4rem;
line-height: 0.64rem; line-height: 0.8rem;
margin-bottom: 0;
} }
.van-overlay { .van-overlay {
position: absolute; position: absolute;
......
...@@ -128,6 +128,13 @@ export default { ...@@ -128,6 +128,13 @@ export default {
imgUrl: require("@/assets/workbench/risk-report.png"), imgUrl: require("@/assets/workbench/risk-report.png"),
text: "风险上报", text: "风险上报",
}, },
{
key: "12",
// path: "/danger",
path: "/insert-risk",
imgUrl: require("@/assets/workbench/risk-confirm.png"),
text: "我的上报",
},
{ {
key: "3", key: "3",
path: "/risk-confirme", path: "/risk-confirme",
......
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