Skip to content

R
rongtong-app
Commit beabfc7e authored by 杨帆's avatar 杨帆
Browse files
Options

Dev yf'

parent e1ca3828
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 222 deletions
src/views/riskProject/add/taskList.vue
View file @ beabfc7e
...@@ -177,6 +177,11 @@ ...@@ -177,6 +177,11 @@
> >
<van-col span="22" @click="toRiskDetail(item)"> <van-col span="22" @click="toRiskDetail(item)">
<van-col span="5"> <van-col span="5">
<van-image
width="46"
height="46"
src="https://img01.yzcdn.cn/vant/cat.jpeg"
/>
<van-image width="46" height="46" :src="item.avatar" /> <van-image width="46" height="46" :src="item.avatar" />
</van-col> </van-col>
<van-col span="17"> <van-col span="17">
...@@ -187,7 +192,11 @@ ...@@ -187,7 +192,11 @@
</van-col> </van-col>
</van-col> </van-col>
<van-col span="2"> <van-col span="2">
<van-row> <van-row
:style="{
color: '#03b615'
}"
>
<van-icon name="arrow" size="26px" @click="goColorDetail" /> <van-icon name="arrow" size="26px" @click="goColorDetail" />
</van-row> </van-row>
</van-col> </van-col>
...@@ -338,6 +347,35 @@ ...@@ -338,6 +347,35 @@
<div>删除任务</div> <div>删除任务</div>
</div> </div>
</div> </div>
<div
v-show="pathAuth == 'riskApprove' && status == 2"
style="display: flex;
justify-content: space-around;
background-color: #fff;
border-top: 1px solid #e3e3e3;
height: 1.5rem;
width: 100%;
text-align: center;
position: fixed;
bottom: 0;"
>
<div
@click="approveTask"
style="color: #4bced0;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;">
<van-icon name="success" />
</div>
<div>审批通过</div>
</div>
<div
@click="unApproveTask"
style="color: #ec808d;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;"><van-icon name="cross" /></div>
<div>审批否决</div>
</div>
</div>
</div> </div>
</template> </template>
...@@ -386,7 +424,7 @@ export default { ...@@ -386,7 +424,7 @@ export default {
var planId = this.$route.params.id || sessionStorage.getItem("planId"); var planId = this.$route.params.id || sessionStorage.getItem("planId");
var buildingId = var buildingId =
this.$route.params.buildingId || sessionStorage.getItem("buildingId"); this.$route.params.buildingId || sessionStorage.getItem("buildingId");
this.pathAuth = sessionStorage.getItem("pathAuth");
this.postList(planId, buildingId); this.postList(planId, buildingId);
this.getRiskTaskList(planId, buildingId); this.getRiskTaskList(planId, buildingId);
}, },
...@@ -394,6 +432,7 @@ export default { ...@@ -394,6 +432,7 @@ export default {
timestampToTimes(time) { timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true); return timestampToTime(new Date(time), "DT2", true);
}, },
//执行任务
performTasks() { performTasks() {
sessionStorage.setItem( sessionStorage.setItem(
"buildingId", "buildingId",
...@@ -416,10 +455,22 @@ export default { ...@@ -416,10 +455,22 @@ export default {
//修改任务 //修改任务
editTask() { editTask() {
//TODO 修改任务 //TODO 修改任务
console.log("修改任务");
}, },
//删除任务 //删除任务
delTask() { delTask() {
//TODO 删除任务 //TODO 删除任务
console.log("删除任务");
},
//审批通过
approveTask() {
//TODO 审批通过
console.log("审批通过");
},
//审批否决
unApproveTask() {
//TODO 审批否决
console.log("审批否决");
}, },
handadd() { handadd() {
this.$router.push({ this.$router.push({
......
src/views/riskProject/approve/index.vue
View file @ beabfc7e
...@@ -175,6 +175,7 @@ export default { ...@@ -175,6 +175,7 @@ export default {
// buildingId: item.buildingId // buildingId: item.buildingId
} }
}); });
sessionStorage.setItem("pathAuth", "riskApprove");
sessionStorage.setItem("planId", item.id); sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("buildingId", ""); sessionStorage.setItem("buildingId", "");
} }
......
src/views/riskProject/assess/index.vue
View file @ beabfc7e
...@@ -278,6 +278,7 @@ export default { ...@@ -278,6 +278,7 @@ export default {
} }
}); });
sessionStorage.setItem("planId", item.id); sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("pathAuth", "riskAssess");
sessionStorage.setItem("buildingId", item.buildingId); sessionStorage.setItem("buildingId", item.buildingId);
this.showIndex = false; this.showIndex = false;
}, },
......
src/views/riskProject/manage/index.vue
View file @ beabfc7e
<template> <template>
<!-- 提交 --> <!-- 提交 -->
<div> <div>
<van-sticky offset-top="0"> <van-sticky offset-top="0">
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
</van-sticky> </van-sticky>
<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
placeholder="请输入搜索内容" placeholder="请输入搜索内容"
@search="onSearch" @search="onSearch"
>
<template #action>
<div @click="onSearch">搜索</div>
</template>
</van-search>
</van-sticky>
<van-tabs
v-model="active"
@change="
postList(searchValue);
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="2.93rem"
> >
<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"> <template #action>
<!-- 内容列表 --> <div @click="onSearch">搜索</div>
<div </template>
class="con-list" </van-search>
@touchmove="showIndex = null" </van-sticky>
v-if="key == active" <van-tabs
v-model="active"
@change="
postList(searchValue);
showIndex = null;
"
color="#2980f7"
animated
:sticky="true"
offset-top="2.93rem"
>
<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-cell-group <div style="font-size: 0.45rem;padding: 5px 0;">
inset {{ item.name }}
v-for="(item, index) in messageList" </div>
:key="index"
@click="touchstart(index, item)"
>
<div style="font-size: 0.45rem;padding: 5px 0;">{{item.name}}</div>
<van-row gutter=""> <van-row gutter="">
<van-col span="17"> <van-col span="17">
<van-row gutter=""> <van-row gutter="">
<van-col span="9">发起时间：</van-col> <van-col span="9">发起时间：</van-col>
<van-col span="15">{{timestampToTimes(item.startTime)||item.startTime }}</van-col> <van-col span="15">{{
</van-row> timestampToTimes(item.startTime) || item.startTime
<van-row gutter=""> }}</van-col>
<van-col span="9">处理人员：</van-col> </van-row>
<van-col span="15">{{ item.leaderUserName }}</van-col> <van-row gutter="">
</van-row> <van-col span="9">处理人员：</van-col>
</van-col> <van-col span="15">{{ item.leaderUserName }}</van-col>
<van-col span="7" :style="{'color':'#03b615'}"> </van-row>
{{ item.state }} </van-col>
</van-col> <van-col span="7" :style="{ color: '#03b615' }">
</van-row> {{ item.state }}
</van-col>
</van-row>
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="7">风险源：</van-col> <van-col span="7">风险源：</van-col>
<van-col span="17">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</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)" v-show="active==0"
<!-- <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
style=" style="
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -84,170 +87,170 @@ ...@@ -84,170 +87,170 @@
position: fixed; position: fixed;
top: 30%; top: 30%;
" "
v-if="messageList['length']==0" v-if="messageList['length'] == 0"
> >
暂无数据 暂无数据
</div> </div>
</div>
<!-- 暂无数据 -->
<!-- {{messageList}} -->
</van-tab>
</van-tabs>
<div style="width: 60px;position: fixed;right: 5%;top: 80%;" @click="handadd">
<img src="@/assets/accidentIcon/add.svg" alt="" width="100%" >
</div> </div>
<!-- 暂无数据 -->
<!-- {{messageList}} -->
</van-tab>
</van-tabs>
<div
style="width: 60px;position: fixed;right: 5%;top: 80%;"
@click="handadd"
>
<img src="@/assets/accidentIcon/add.svg" alt="" width="100%" />
</div> </div>
</template> </div>
</template>
<script>
import LHeader from "@/components/header.vue"; <script>
import { timestampToTime, generateId } from "@/utils/format"; import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table.js"; import { timestampToTime, generateId } from "@/utils/format";
import { getFun, postFun } from "@/service/table.js";
// import { postriskConList } from "@/service/risk"; // import { postriskConList } from "@/service/risk";
export default { export default {
name:'risk-confirme', name: "risk-confirme",
components: { components: {
LHeader, LHeader
}, },
data() { data() {
return { return {
text: "任务管理", text: "任务管理",
searchValue: "", searchValue: "",
isHaveNews: false, isHaveNews: false,
messageList: [ messageList: [],
], Loop: "", // 定时器
Loop: "", // 定时器 showIndex: null, // 是否显示遮罩层,
showIndex: null, // 是否显示遮罩层, active: 0,
active: 0, tabs: [
tabs: [ {
{ title: "待执行",
title: "待执行", api: "/risk/plan/create/list?status=wait"
api: "/risk/plan/create/list?status=wait",
},
{
title: "执行中",
api: "/risk/plan/create/list?status=running",
},
{
title: "已执行",
api: "/risk/plan/create/list?status=finish",
},
],
};
},
created() {
this.postList();
},
methods: {
timestampToTimes(time){
return timestampToTime(new Date(time),"DT1", true)
},
handadd(){
this.$router.push({
name: "riskAdd",
params: {
title:'新增'
},
})
}, },
postList(select = "") { {
this.$toast.loading({ title: "执行中",
message: "加载中...", api: "/risk/plan/create/list?status=running"
forbidClick: true, },
loadingType: "spinner", {
duration: 0, title: "已执行",
}); api: "/risk/plan/create/list?status=finish"
// let formdata = new FormData();
// formdata.append("select", select);
getFun(this.tabs[this.active]['api'])
.then((res) => {
this.$toast.clear();
this.messageList =res.data||res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
onSearch(val) {
this.postList(this.searchValue);
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null;
return;
} }
this.showIndex = index; ]
}, };
},
// 详情 created() {
goDetail(data) { this.postList();
this.$router.push({ },
name: "riskTaskList", methods: {
params: { timestampToTimes(time) {
id: data.businessId ||data.id, return timestampToTime(new Date(time), "DT1", true);
}, },
}); handadd() {
sessionStorage.setItem('planId',data.id) this.$router.push({
this.showIndex = null; name: "riskAdd",
}, params: {
// 确认 title: "新增"
goConfirm(data) { }
this.$router.push({ });
name: "risk-affirm", },
params: { postList(select = "") {
data: data, this.$toast.loading({
}, message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
// let formdata = new FormData();
// formdata.append("select", select);
getFun(this.tabs[this.active]["api"])
.then(res => {
this.$toast.clear();
this.messageList = res.data || res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
}
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
}); });
},
onSearch(val) {
this.postList(this.searchValue);
},
touchstart(index, item) {
if (this.showIndex != null) {
this.showIndex = null; this.showIndex = null;
}, return;
}
this.showIndex = index;
},
// 详情
goDetail(data) {
this.$router.push({
name: "riskTaskList",
params: {
id: data.businessId || data.id
}
});
sessionStorage.setItem("pathAuth", "riskManage");
sessionStorage.setItem("planId", data.id);
this.showIndex = null;
}, },
}; // 确认
</script> goConfirm(data) {
this.$router.push({
<style lang="less" scoped> name: "risk-affirm",
params: {
#app { data: data
font-family: ""; }
color: #2c3e50; });
this.showIndex = null;
}
} }
.con-list { };
padding: 0; </script>
background-color: #f0f1f5;
.van-cell-group--inset { <style lang="less" scoped>
margin: 0; #app {
margin-bottom: 0.26667rem; font-family: "";
padding: 0.25rem; 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; font-size: 0.4rem;
position: relative; line-height: 0.8rem;
border-radius: 4%; margin-bottom: 0;
box-shadow: 0px 0px 10px 2px #f3f3f3; }
width: 90%; .van-overlay {
margin: 0.4rem auto; position: absolute;
.van-row { .wrapper {
font-size: 0.4rem; display: flex;
line-height: 0.8rem; align-items: center;
margin-bottom: 0; justify-content: space-evenly;
} height: 100%;
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
} }
} }
} }
/deep/.van-tab__pane{ }
min-height: 8rem; /deep/.van-tab__pane {
} min-height: 8rem;
</style> }
</style>
\ No newline at end of file
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