Commit 49ca2e8f authored by 罗新东's avatar 罗新东

修改了我的权限个人中心页面显示,修改了列表详情的布局所有列表页面添加了搜索框

parent bd902c2e
Pipeline #7376 passed with stage
in 19 seconds
......@@ -89,9 +89,6 @@ export default {
</script>
<style lang="less">
// body{
// overflow: hidden;
// }
#app {
font-family: "Avenir", Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
......@@ -113,7 +110,6 @@ export default {
top: 0;
width: 100%;
overflow: hidden;
z-index: 99999999;
}
.router-view {
......
......@@ -25,7 +25,7 @@ export function postHdName(url, data) {
data
})
}
// 隐患项目编号和隐患级别
// 隐患编号和隐患级别
export function postHdInventories(url, data) {
return request({
url: url,
......
......@@ -128,9 +128,9 @@
v-model="dangerNum"
readonly
name="hdProjectId"
label="隐患项目编号"
label="隐患编号"
placeholder="请选择"
:rules="[{ required: true, message: '隐患项目编号不能为空' }]"
:rules="[{ required: true, message: '隐患编号不能为空' }]"
/>
<van-field
required
......@@ -421,7 +421,7 @@ export default {
this.dangerName = ""; //隐患项目名称
this.showDangerName = false;
this.columnsDangerName = [];
this.dangerNum = ""; //隐患项目编号
this.dangerNum = ""; //隐患编号
this.dangerLevel = ""; //隐患项目级别
this.findTime = ""; //隐患发现时间
this.showFindTime = false;
......@@ -470,7 +470,7 @@ export default {
dangerName: "", //隐患项目名称
showDangerName: false,
columnsDangerName: [],
dangerNum: "", //隐患项目编号
dangerNum: "", //隐患编号
dangerLevel: "", //隐患项目级别
findTime: "", //隐患发现时间
showFindTime: false,
......@@ -744,7 +744,7 @@ export default {
}
this.dangerName = value.hdName;
this.showDangerName = false;
// 请求隐患项目编号和隐患级别
// 请求隐患编号和隐患级别
postHdInventories(
`/hdreport/showHdInventories/${this.range}/${this.type}/${this.dangerName}`
).then((res) => {
......
......@@ -8,32 +8,32 @@
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ 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-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ 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-col span="7">超期标识:</van-col>
<van-col span="17">{{ 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-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
......
......@@ -37,42 +37,42 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">
{{ item.businessId || item.id }}
</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{
item.hdLev | dangerText
}}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">适用范围:</van-col>
<van-col span="18">{{ item.hdRange }}</van-col>
<van-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">超期标识:</van-col>
<van-col span="18">{{
<van-col span="7">超期标识:</van-col>
<van-col span="17">{{
item.dueDate | formatTime
}}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
......
......@@ -9,32 +9,32 @@
>
<!-- {{item}} -->
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.businessId || item.id}}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.businessId || item.id}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ 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-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<!-- 详情 -->
<div class="detail">详情</div>
......
......@@ -35,34 +35,34 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.businessId||item.id }}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.businessId||item.id }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{
item.hdLev | dangerText
}}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">适用范围:</van-col>
<van-col span="18">{{ item.hdRange }}</van-col>
<van-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
<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> -->
<!-- 内容列表 -->
<!-- 接口对接4 START -->
<van-tabs
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"
v-if="key == active"
<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>
<!-- 内容列表 -->
<!-- 接口对接4 START -->
<van-tabs
v-model="active"
@change="
getList();
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="3rem"
>
<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="" v-show="item.examineResult">
<van-col span="6">是否通过:</van-col>
<van-col span="17">{{ item.examineResult==1?'是':'否'}}</van-col>
</van-row>
<van-row gutter="" v-show="item.examineReason">
<van-col span="6">意见:</van-col>
<van-col span="18">{{ item.examineReason }}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<template>
<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)"
v-if="active == 0"
>审批
</van-button>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<div
class="con-list"
@touchmove="showIndex = null"
v-if="key == active"
>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="touchstart(index, item)"
>
<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 | dangerText
}}</van-col>
</van-row>
<van-row gutter="" v-show="item.examineResult">
<van-col span="7">是否通过:</van-col>
<van-col span="17">{{
item.examineResult == 1 ? "是" : "否"
}}</van-col>
</van-row>
<van-row gutter="" v-show="item.examineReason">
<van-col span="7">意见:</van-col>
<van-col span="17">{{
item.examineReason
}}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<template>
<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)"
v-if="active == 0"
>审批
</van-button>
</div>
</van-overlay>
</template>
</van-cell-group>
</div>
</van-overlay>
</template>
</van-cell-group>
</div>
</van-tab>
</van-tabs>
</div>
</van-tab>
</van-tabs>
</div>
</template>
<script>
......@@ -91,127 +106,127 @@ import { getFun, postFun } from "@/service/table.js";
import { delayList } from "@/service/danger";
export default {
components: {
LHeader,
},
data() {
return {
text: "延期审批",
searchValue: "",
isHaveNews: false,
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "待审批",
api: "/delayApply/list",
},
{
title: "已审批",
api: "/delayApply/finishList",
},
],
};
},
created() {
this.getList();
},
methods: {
getList(select) {
/*接口对接3 START*/
// 例子:
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
let formdata = new FormData();
formdata.append("select", select);
postFun(this.tabs[this.active]["api"], formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
/*接口对接3 END*/
components: {
LHeader,
},
onSearch() {
this.getList(this.searchValue);
data() {
return {
text: "延期审批",
searchValue: "",
isHaveNews: false,
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层
active: 0,
tabs: [
{
title: "待审批",
api: "/delayApply/list",
},
{
title: "已审批",
api: "/delayApply/finishList",
},
],
};
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
}
this.showIndex = index;
created() {
this.getList();
},
methods: {
getList(select) {
/*接口对接3 START*/
// 例子:
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
let formdata = new FormData();
formdata.append("select", select);
postFun(this.tabs[this.active]["api"], formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
/*接口对接3 END*/
},
onSearch() {
this.getList(this.searchValue);
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
}
this.showIndex = index;
},
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.businessId,
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.businessId,
},
});
this.showIndex = null;
},
});
this.showIndex = null;
},
// 审批
goConfirm(data) {
this.$router.push({
name: "ratify-info",
params: {
taskId: data.taskId,
// 审批
goConfirm(data) {
this.$router.push({
name: "ratify-info",
params: {
taskId: data.taskId,
},
});
this.showIndex = null;
},
});
this.showIndex = null;
},
},
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
#app {
font-family: "";
color: #2c3e50;
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%;
}
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>
......@@ -23,28 +23,28 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.id }}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.id }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ 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-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
......@@ -3,18 +3,18 @@
<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> -->
<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>
<!-- 内容列表 -->
<!-- 接口对接4 START -->
<van-tabs
......@@ -26,7 +26,7 @@
color="#2980f7"
animated
:sticky="true"
offset-top="1.5rem"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<div class="con-list" @touchmove="showIndex = null">
......@@ -37,24 +37,24 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{
<van-col span="7">隐患单编号:</van-col>
<van-col span="16">{{
item.businessId || item.id
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{
item.hdLev | dangerText
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- *接口对接4 END -->
......@@ -186,7 +186,7 @@ export default {
this.$router.push({
name: "normal-detail",
params: {
id: data.taskId||data.id,
id: data.taskId || data.id,
},
});
this.showIndex = null;
......
......@@ -23,24 +23,24 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.pid }}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.pid }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.projectName }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.projectName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{ item.hdLev | dangerText }}</van-col>
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev | dangerText }}</van-col>
</van-row>
<van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<!-- *接口对接4 END -->
......
......@@ -22,32 +22,32 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.businessId }}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.businessId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev | dangerText}}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">适用范围:</van-col>
<van-col span="18">{{ item.hdRange }}</van-col>
<van-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- {{ item.taskName }} -->
......
......@@ -36,38 +36,38 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.businessId || item.id}}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.businessId || item.id}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{
item.hdLev | dangerText
}}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">适用范围:</van-col>
<van-col span="18">{{ item.hdRange }}</van-col>
<van-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">超期标识:</van-col>
<van-col span="18">{{ item | formatTime }}</van-col>
<van-col span="7">超期标识:</van-col>
<van-col span="17">{{ item | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
......@@ -8,32 +8,32 @@
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ 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-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col>
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">超期标识:</van-col>
<van-col span="18">{{ item | formatTime }}</van-col>
<van-col span="7">超期标识:</van-col>
<van-col span="17">{{ item | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
......
<template>
<div>
<van-sticky>
<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> -->
<!-- tab标签 -->
<van-tabs v-model="active" @change="postList" color="#2980f7" animated
:sticky="true"
offset-top="1.5rem">
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<div v-show="key == active">
<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.hdDiscoveryTime }}</van-col>
<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>
<!-- tab标签 -->
<van-tabs
v-model="active"
@change="postList"
color="#2980f7"
animated
:sticky="true"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title" :sticky="true"
offset-top="3rem">
<div v-show="key == active">
<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="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 | dangerText
}}</van-col>
</van-row>
<!--<van-row gutter="">
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</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 | formatTime }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态</van-col>
<van-col span="18">{{ item | formatTime }}</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>
<div
v-if="messageList.length == 0"
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
>
暂无数据
</div>
</van-tab>
</van-tabs>
</div>
<van-row gutter="">
<van-col span="7">适用范围:</van-col>
<van-col span="17">{{ item.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">隐患类型:</van-col>
<van-col span="17">{{ item.hdType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">超期标识:</van-col>
<van-col span="17">{{
item | formatTime
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7">工单状态</van-col>
<van-col span="17">{{
item | formatTime
}}</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>
<div
v-if="messageList.length == 0"
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
>
暂无数据
</div>
</van-tab>
</van-tabs>
</div>
</template>
<script>
......@@ -93,137 +113,137 @@ import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table.js";
import { dangerStandBook } from "@/service/danger";
export default {
components: {
LHeader,
},
data() {
return {
text: "隐患历史台账",
active: 0,
searchValue: "",
isHaveNews: false,
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层
tabs: [
{
title: "已完结",
api: "/hdreport/doneList",
},
{
title: "已挂账",
api: "/hdreport/doneListRectification",
},
{
title: "已整改",
api: "/hdreport/doneListReview",
},
],
};
},
created() {
this.postList();
},
methods: {
onSearch(val) {
this.postList(this.searchValue);
components: {
LHeader,
},
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
let formdata = new FormData();
formdata.append("select", select);
postFun(this.tabs[this.active * 1]["api"], formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
data() {
return {
text: "隐患历史台账",
active: 0,
searchValue: "",
isHaveNews: false,
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层
tabs: [
{
title: "已完结",
api: "/hdreport/doneList",
},
{
title: "已挂账",
api: "/hdreport/doneListRectification",
},
{
title: "已整改",
api: "/hdreport/doneListReview",
},
],
};
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
}
this.showIndex = index;
created() {
this.postList();
},
methods: {
onSearch(val) {
this.postList(this.searchValue);
},
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
let formdata = new FormData();
formdata.append("select", select);
postFun(this.tabs[this.active * 1]["api"], formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
}
this.showIndex = index;
},
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.businessId,
// 详情
goDetail(data) {
this.$router.push({
name: "normal-detail",
params: {
id: data.businessId,
},
});
this.showIndex = null;
},
});
this.showIndex = null;
},
},
filters: {
formatTime: function (row) {
if (row.dueDate <= row.rectificationTime) {
return "超期";
} else if (
row.dueDate >= row.rectificationTime &&
row.dueDate - 259200000 <= row.rectificationTime
) {
//三天
return "临期";
} else {
return "正常";
}
filters: {
formatTime: function (row) {
if (row.dueDate <= row.rectificationTime) {
return "超期";
} else if (
row.dueDate >= row.rectificationTime &&
row.dueDate - 259200000 <= row.rectificationTime
) {
//三天
return "临期";
} else {
return "正常";
}
},
},
},
};
</script>
<style lang="less" scoped>
/* @import url(); 引入css类 */
#app {
font-family: "";
color: #2c3e50;
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%;
}
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%;
}
}
}
}
}
/deep/.van-tab__pane{
/deep/.van-tab__pane {
min-height: 8rem;
}
</style>
......@@ -15,113 +15,113 @@
<p>隐患上报</p>
<van-cell-group inset>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title">隐患单编号</span
></van-col
>
<van-col span="17">{{ hdReport.id }}</van-col>
<van-col span="18">{{ hdReport.id }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>所属项目:</span
></van-col
>
<van-col span="17">{{ hdReport.proId }}</van-col>
<van-col span="18">{{ hdReport.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患级别:</span
></van-col
>
<van-col span="17">{{ hdReport.hdLev }}</van-col>
<van-col span="18">{{ hdReport.hdLev }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>适用范围:</span
></van-col
>
<van-col span="17">{{ hdReport.hdRange }}</van-col>
<van-col span="18">{{ hdReport.hdRange }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患类型:</span
></van-col
>
<van-col span="17">{{ hdReport.hdType }}</van-col>
<van-col span="18">{{ hdReport.hdType }}</van-col>
</van-row>
<!-- 隐藏的字段 -->
<div v-show="reportOpen">
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患项目名称:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.hdProjectName
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患发现时间:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.hdDiscoveryTime
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>风险源:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.dangerSource
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>风险源因素:</span
></van-col
>
<van-col span="17">{{ hdReport.dangerId }}</van-col>
<van-col span="18">{{ hdReport.dangerId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>检查部位:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.hdPosition
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患描述:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.hdDescribe
}}</van-col>
</van-row>
<van-row gutter="" v-if="hdReport.hdPictureList">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患照片:</span
></van-col
>
<van-col span="17">
<van-col span="18">
<div
class="detail_pic"
v-for="(
......@@ -139,12 +139,12 @@
</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患视频:</span
></van-col
>
<van-col span="17">
<van-col span="18">
<div
class="detail_video"
v-for="(
......@@ -172,22 +172,22 @@
</van-col>
</van-row>
<van-row gutter="" v-if="hdReport.hdExpirationTime">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患到期时间:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.hdExpirationTime
}}</van-col>
</van-row>
<van-row gutter="" v-if="hdReport.rectificationUser">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患整改人:</span
></van-col
>
<van-col span="17">{{
<van-col span="18">{{
hdReport.rectificationUser
}}</van-col>
</van-row>
......@@ -242,12 +242,12 @@
}}</van-col>
</van-row>
<van-row gutter="" v-if="item.endTime">
<van-col span="8"
<van-col span="9"
><span class="field-title"
>整改截止时间:</span
></van-col
>
<van-col span="16">{{
<van-col span="15">{{
item.endTime
}}</van-col>
</van-row>
......@@ -382,20 +382,20 @@
:key="index"
>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>整改详情描述:</span
></van-col
>
<van-col span="17">{{ item.details }}</van-col>
<van-col span="18">{{ item.details }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患照片:</span
></van-col
>
<van-col span="17">
<van-col span="18">
<div
class="detail_pic"
v-for="(itemTwo, index) in item.hdPictureList"
......@@ -411,12 +411,12 @@
</van-col>
</van-row>
<van-row gutter="" v-if="item.hdVideoList">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>隐患视频:</span
></van-col
>
<van-col span="17">
<van-col span="18">
<div
class="detail_video"
v-for="(itemTwo, index) in item.hdVideoList"
......@@ -430,12 +430,12 @@
</van-col>
</van-row>
<van-row gutter="">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>创建时间:</span
></van-col
>
<van-col span="17">{{ item.creatTime }}</van-col>
<van-col span="18">{{ item.creatTime }}</van-col>
</van-row>
</van-cell-group>
</div>
......@@ -448,15 +448,15 @@
:key="index"
>
<van-row gutter="">
<van-col span="7">
<van-col span="6">
<span class="field-title"> 复查结果 </span>
</van-col>
<van-col span="17">{{
<van-col span="18">{{
item.reviewResult == 1 ? "合格" : "不合格"
}}</van-col>
</van-row>
<van-row gutter="" v-if="item.reviewDetails">
<van-col span="7"
<van-col span="6"
><span class="field-title">
{{
item.reviewResult == 1
......@@ -465,15 +465,15 @@
}}
</span></van-col
>
<van-col span="17">{{ item.reviewDetails }}</van-col>
<van-col span="18">{{ item.reviewDetails }}</van-col>
</van-row>
<van-row gutter="" v-if="item.hdPictureList['length']">
<van-col span="7"
<van-col span="6"
><span class="field-title"
>复查照片:</span
></van-col
>
<van-col span="17">
<van-col span="18">
<div
class="detail_pic"
v-for="(itemTwo, index) in item.hdPictureList"
......
......@@ -23,20 +23,20 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">隐患单编号:</van-col>
<van-col span="18">{{ item.pid }}</van-col>
<van-col span="7">隐患单编号:</van-col>
<van-col span="17">{{ item.pid }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.projectName }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.projectName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">隐患级别:</van-col>
<van-col span="18">{{ item.hdLev | dangerText }}</van-col>
<van-col span="7">隐患级别:</van-col>
<van-col span="17">{{ item.hdLev | dangerText }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
</van-row> -->
<!-- *接口对接4 END -->
......
......@@ -10,7 +10,7 @@
<!-- 个人信息 -->
<van-cell-group inset>
<van-row gutter="20">
<van-col span="6">
<van-col span="7">
<div>
<van-image
width="2rem"
......@@ -20,15 +20,15 @@
/>
</div>
</van-col>
<van-col span="18">
<van-col span="17">
<div class="user-info-wrap">
<div class="user-name">{{ userInfo.name }}</div>
<p>{{ userInfo.position }}</p>
<div class="tag-wrap">
<!-- <div class="tag-wrap">
<van-tag color="#cbcdfb">隐患上报人</van-tag>
<van-tag color="#b5e2f1">隐患整改人</van-tag>
<van-tag color="#bed9fd">检查专员</van-tag>
</div>
</div> -->
</div>
</van-col>
</van-row>
......@@ -90,8 +90,8 @@ export default {
],
userInfo: {
portrait: require("@/assets/myTerritory/touxiang.png"),
name: getUserInfo() ? getUserInfo().userName : "刘华强",
position: getUserInfo() ? getUserInfo().deptName : "技术安全",
name: getUserInfo() ? getUserInfo().userName : "xxx",
position: getUserInfo() ? getUserInfo().deptName : "xx",
// name: "刘华强",
// position: "技术安全部"
// jurisdiction: [
......@@ -135,7 +135,8 @@ export default {
flex-direction: column;
justify-content: space-between;
.user-name {
font-size: 17px;
padding-top:0.3rem;
font-size: 18px;
font-weight: none;
}
......
......@@ -10,16 +10,28 @@
/>
</van-sticky>
<!-- 权限卡片 -->
<div>
<template>
<div class="title">{{ userInfo.position }}</div>
<van-cell-group inset>
<div class="tag-wrap">
<van-tag :color="getColor()" plain round
>隐患上报人</van-tag
>
<van-tag :color="getColor()" plain round
>隐患整改人</van-tag
>
<van-tag :color="getColor()" plain round>检查专员</van-tag>
</div>
</van-cell-group>
</template>
</div>
<div v-for="(item, key) in role_list" :key="key">
<template v-if="item">
<div class="title">{{ key }}</div>
<van-cell-group inset>
<div class="tag-wrap">
<van-skeleton
title
:row="2"
:loading="!item['length']"
>
<van-skeleton title :row="2" :loading="!item['length']">
<van-tag
:color="getColor()"
v-for="(i, index) in item"
......@@ -42,6 +54,7 @@
<script>
import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table.js";
import { getUserInfo } from "@/utils/userInfo";
export default {
components: {
LHeader,
......@@ -57,6 +70,11 @@ export default {
"项目工程cs-001": [],
"项目工程cs-002": [],
},
userInfo: {
portrait: require("@/assets/myTerritory/touxiang.png"),
name: getUserInfo() ? getUserInfo().userName : "xxx",
position: getUserInfo() ? getUserInfo().deptName : "xx部",
},
};
},
methods: {
......
......@@ -24,40 +24,40 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item.id }}</van-col>
<van-col span="7">风险编号:</van-col>
<van-col span="17">{{ item.id }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.pId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ 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-col span="7">隐患级别:</van-col>
<van-col span="17">{{ 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-col span="7">风险源:</van-col>
<van-col span="17">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">事故类型:</van-col>
<van-col span="18">{{ item.accidentType }}</van-col>
<van-col span="7">事故类型:</van-col>
<van-col span="17">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">管控层级:</van-col>
<van-col span="18">{{ item["controlLevel"] }}</van-col>
<van-col span="7">管控层级:</van-col>
<van-col span="17">{{ item["controlLevel"] }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责部门:</van-col>
<van-col span="18">{{ item.responsibilityDept }}</van-col>
<van-col span="7">主责部门:</van-col>
<van-col span="17">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col>
<van-col span="7">主责人员:</van-col>
<van-col span="17">{{ item.responsibilityMember }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
......@@ -4,18 +4,18 @@
<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> -->
<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>
<van-tabs
v-model="active"
@change="
......@@ -25,9 +25,13 @@
color="#2980f7"
animated
:sticky="true"
offset-top="1.5rem"
offset-top="3rem"
>
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
<van-tab
v-for="(item, key) in tabs"
:key="key"
:title="item.title"
>
<div class="con-list" @touchmove="showIndex = null">
<van-cell-group
inset
......@@ -36,29 +40,29 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item.businessId }}</van-col>
<van-col span="7">风险编号:</van-col>
<van-col span="17">{{ item.businessId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险级别:</van-col>
<van-col span="18">{{ item.riskLevel }}</van-col>
<van-col span="7">风险级别:</van-col>
<van-col span="17">{{ item.riskLevel }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.startDate }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.startDate }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">风险源:</van-col>
<van-col span="18">{{ item.riskSource }}</van-col>
<van-col span="7">风险源:</van-col>
<van-col span="17">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-row gutter="">
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- *接口对接4 END -->
......@@ -142,7 +146,7 @@ export default {
this.getList();
},
methods: {
getList() {
getList(select='') {
/*接口对接3 START*/
// 例子:
this.$toast.loading({
......@@ -151,7 +155,9 @@ export default {
loadingType: "spinner",
duration: 0,
});
postFun(this.tabs[this.active]["api"])
let formdata= new FormData();
formdata.append('select',select)
postFun(this.tabs[this.active]["api"],formdata)
.then((res) => {
this.$toast.clear();
this.messageList = res.rows;
......@@ -162,7 +168,9 @@ export default {
});
/*接口对接3 END*/
},
onSearch(val) {},
onSearch(val) {
this.getList(this.searchValue)
},
touchstart(index, item) {
if (this.showIndex != null) {
......
......@@ -167,28 +167,28 @@
>
</van-row>
<van-row>
<van-col span="6"
<van-col span="7"
><span class="field-title">操作人:</span></van-col
>
<van-col span="18">{{item.userName}}</van-col>
<van-col span="17">{{item.userName}}</van-col>
</van-row>
<van-row>
<van-col span="6"
<van-col span="7"
><span class="field-title">节点:</span></van-col
>
<van-col span="18">{{item.logNode}}</van-col>
<van-col span="17">{{item.logNode}}</van-col>
</van-row>
<van-row>
<van-col span="6"
<van-col span="7"
><span class="field-title">结果:</span></van-col
>
<van-col span="18">{{item.logResult}}</van-col>
<van-col span="17">{{item.logResult}}</van-col>
</van-row>
<van-row>
<van-col span="6"
<van-col span="7"
><span class="field-title">部门:</span></van-col
>
<van-col span="18">{{item.deptName}}</van-col>
<van-col span="17">{{item.deptName}}</van-col>
</van-row>
</div>
......
......@@ -41,44 +41,44 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item['businessId']||item['id']}}</van-col>
<van-col span="7">风险编号:</van-col>
<van-col span="17">{{ item['businessId']||item['id']}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{item['proId']||item['pId']}}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{item['proId']||item['pId']}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险级别:</van-col>
<van-col span="18">{{ item.riskLevel }}</van-col>
<van-col span="7">风险级别:</van-col>
<van-col span="17">{{ item.riskLevel }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.startDate }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.startDate }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">风险源:</van-col>
<van-col span="18">{{ item.riskSource }}</van-col>
<van-col span="7">风险源:</van-col>
<van-col span="17">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">事故类型:</van-col>
<van-col span="18">{{ item.accidentType }}</van-col>
<van-col span="7">事故类型:</van-col>
<van-col span="17">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">管控层级:</van-col>
<van-col span="18">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
<van-col span="7">管控层级:</van-col>
<van-col span="17">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责部门:</van-col>
<van-col span="18">{{ item.responsibilityDept }}</van-col>
<van-col span="7">主责部门:</van-col>
<van-col span="17">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col>
<van-col span="7">主责人员:</van-col>
<van-col span="17">{{ item.responsibilityMember }}</van-col>
</van-row>
<van-row gutter="" v-show="item.taskName">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
<van-overlay :show="showIndex == index">
......
......@@ -9,36 +9,36 @@
@click="goDetail(item.taskId)"
>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险等级:</van-col>
<van-col span="18">{{ item.riskLevel }}</van-col>
<van-col span="7">风险等级:</van-col>
<van-col span="17">{{ item.riskLevel }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险源:</van-col>
<van-col span="18">{{ item.riskSource }}</van-col>
<van-col span="7">风险源:</van-col>
<van-col span="17">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">事故类型:</van-col>
<van-col span="18">{{ item.accidentType }}</van-col>
<van-col span="7">事故类型:</van-col>
<van-col span="17">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">管控层级:</van-col>
<van-col span="18">{{ item.controllevel }}</van-col>
<van-col span="7">管控层级:</van-col>
<van-col span="17">{{ item.controllevel }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责部门:</van-col>
<van-col span="18">{{ item.responsibilityDept }}</van-col>
<van-col span="7">主责部门:</van-col>
<van-col span="17">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col>
<van-col span="7">主责人员:</van-col>
<van-col span="17">{{ item.responsibilityMember }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 详情 -->
<div class="detail">详情</div>
......
......@@ -22,44 +22,44 @@
@click="touchstart(index, item)"
>
<van-row gutter="">
<van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item.businessId }}</van-col>
<van-col span="7">风险编号:</van-col>
<van-col span="17">{{ item.businessId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item.proId }}</van-col>
<van-col span="7">所属项目:</van-col>
<van-col span="17">{{ item.proId }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">风险级别:</van-col>
<van-col span="18">{{ item.riskLevel }}</van-col>
<van-col span="7">风险级别:</van-col>
<van-col span="17">{{ item.riskLevel }}</van-col>
</van-row>
<!-- <van-row gutter="">
<van-col span="6">发现时间:</van-col>
<van-col span="18">{{ item.startDate }}</van-col>
<van-col span="7">发现时间:</van-col>
<van-col span="17">{{ item.startDate }}</van-col>
</van-row> -->
<van-row gutter="">
<van-col span="6">风险源:</van-col>
<van-col span="18">{{ item.riskSource }}</van-col>
<van-col span="7">风险源:</van-col>
<van-col span="17">{{ item.riskSource }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">事故类型:</van-col>
<van-col span="18">{{ item.accidentType }}</van-col>
<van-col span="7">事故类型:</van-col>
<van-col span="17">{{ item.accidentType }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">管控层级:</van-col>
<van-col span="18">{{ item.controllevel }}</van-col>
<van-col span="7">管控层级:</van-col>
<van-col span="17">{{ item.controllevel }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责部门:</van-col>
<van-col span="18">{{ item.responsibilityDept }}</van-col>
<van-col span="7">主责部门:</van-col>
<van-col span="17">{{ item.responsibilityDept }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">主责人员:</van-col>
<van-col span="18">{{ item.responsibilityMember }}</van-col>
<van-col span="7">主责人员:</van-col>
<van-col span="17">{{ item.responsibilityMember }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col>
<van-col span="7">工单状态:</van-col>
<van-col span="17">{{ item.taskName }}</van-col>
</van-row>
<!-- 长按显示遮罩层 -->
......
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