Skip to content

R
rongtong-app
Commit ce5d2251 authored by 胡占生's avatar 胡占生 🇨🇳
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

parents fddcc558 4a105568
Expand all Show whitespace changes
Inline Side-by-side
Showing with 917 additions and 662 deletions
src/components/selectDept/index.vue
View file @ ce5d2251
<template>
<div style="width:100%">
<LHeader :text="text"></LHeader>
<!-- 搜索 -->
<div class="content-wrap">
<!-- <div class="search-wrap">
......@@ -70,7 +69,6 @@
</template>
<script>
import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table";
import { getUserInfo } from "@/utils/userInfo";
import { debounce } from "@/utils/common.js";
......@@ -78,9 +76,6 @@ import { Toast } from "vant";
export default {
name: "select-people",
components: {
LHeader
},
created() {
this.getInsideUser(getUserInfo().secondaryUnit);
},
......@@ -106,7 +101,7 @@ export default {
this.resultName = this.allDeptList.find(
item => item.deptId == this.result
).deptName;
this.$emit("changeDept", this.result);
this.$emit("changeDept", this.result, this.resultName);
},
// 查询内部人员
getInsideUser(id, val) {
......
src/views/riskProject/add/index.vue
View file @ ce5d2251
......@@ -86,8 +86,8 @@
<van-field
required
clickable
name="deptId"
:value="form.deptId"
name="deptName"
:value="form.deptName"
label="评估小组选择"
placeholder="请选择"
@click="selectDept()"
......@@ -430,9 +430,10 @@ export default {
selectDept() {
this.projectDept = true;
},
changeDept(id) {
changeDept(id, name) {
console.log(id);
this.form.deptId = id;
this.form.deptName = name;
},
closeDept() {
console.log(this.form.deptId);
......
src/views/riskProject/add/taskList.vue
View file @ ce5d2251
This diff is collapsed.
src/views/riskProject/approve/index.vue
View file @ ce5d2251
......@@ -175,6 +175,7 @@ export default {
// buildingId: item.buildingId
}
});
sessionStorage.setItem("pathAuth", "riskApprove");
sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("buildingId", "");
}
......
src/views/riskProject/assess/index.vue
View file @ ce5d2251
......@@ -278,20 +278,10 @@ export default {
}
});
sessionStorage.setItem("planId", item.id);
sessionStorage.setItem("pathAuth", "riskAssess");
sessionStorage.setItem("buildingId", item.buildingId);
this.showIndex = false;
},
// 详情
goDetail(data) {
this.$router.push({
name: "riskBigDetail",
params: {
id: data.businessId || data.id
}
});
this.showIndex = false;
},
// 确认
goConfirm(data) {
this.$router.push({
......
src/views/riskProject/manage/index.vue
View file @ ce5d2251
......@@ -40,20 +40,24 @@
:key="index"
@click="touchstart(index, item)"
>
<div style="font-size: 0.45rem;padding: 5px 0;">{{item.name}}</div>
<div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.name }}
</div>
<van-row gutter="">
<van-col span="17">
<van-row gutter="">
<van-col span="9">发起时间：</van-col>
<van-col span="15">{{timestampToTimes(item.startTime)||item.startTime }}</van-col>
<van-col span="15">{{
timestampToTimes(item.startTime) || item.startTime
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">处理人员：</van-col>
<van-col span="15">{{ item.leaderUserName }}</van-col>
</van-row>
</van-col>
<van-col span="7" :style="{'color':'#03b615'}">
<van-col span="7" :style="{ color: '#03b615' }">
{{ item.state }}
</van-col>
</van-row>
......@@ -67,7 +71,6 @@
<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-show="active==0"
......@@ -84,86 +87,87 @@
position: fixed;
top: 30%;
"
v-if="messageList['length']==0"
v-if="messageList['length'] == 0"
>
暂无数据
</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
style="width: 60px;position: fixed;right: 5%;top: 80%;"
@click="handadd"
>
<img src="@/assets/accidentIcon/add.svg" alt="" width="100%" />
</div>
</div>
</template>
</template>
<script>
import LHeader from "@/components/header.vue";
import { timestampToTime, generateId } from "@/utils/format";
import { getFun, postFun } from "@/service/table.js";
<script>
import LHeader from "@/components/header.vue";
import { timestampToTime, generateId } from "@/utils/format";
import { getFun, postFun } from "@/service/table.js";
// import { postriskConList } from "@/service/risk";
export default {
name:'risk-confirme',
export default {
name: "risk-confirme",
components: {
LHeader,
LHeader
},
data() {
return {
text: "任务管理",
searchValue: "",
isHaveNews: false,
messageList: [
],
messageList: [],
Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层,
active: 0,
tabs: [
{
title: "待执行",
api: "/risk/plan/create/list?status=wait",
api: "/risk/plan/create/list?status=wait"
},
{
title: "执行中",
api: "/risk/plan/create/list?status=running",
api: "/risk/plan/create/list?status=running"
},
{
title: "已执行",
api: "/risk/plan/create/list?status=finish",
},
],
api: "/risk/plan/create/list?status=finish"
}
]
};
},
created() {
this.postList();
},
methods: {
timestampToTimes(time){
return timestampToTime(new Date(time),"DT1", true)
timestampToTimes(time) {
return timestampToTime(new Date(time), "DT1", true);
},
handadd(){
handadd() {
this.$router.push({
name: "riskAdd",
params: {
title:'新增'
},
})
title: "新增"
}
});
},
postList(select = "") {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
duration: 0
});
// let formdata = new FormData();
// formdata.append("select", select);
getFun(this.tabs[this.active]['api'])
.then((res) => {
getFun(this.tabs[this.active]["api"])
.then(res => {
this.$toast.clear();
this.messageList =res.data||res.rows;
this.messageList = res.data || res.rows;
// 判断有无数据返回
if (this.messageList.length == 0) {
this.isHaveNews = true;
......@@ -191,10 +195,11 @@
this.$router.push({
name: "riskTaskList",
params: {
id: data.businessId ||data.id,
},
id: data.businessId || data.id
}
});
sessionStorage.setItem('planId',data.id)
sessionStorage.setItem("pathAuth", "riskManage");
sessionStorage.setItem("planId", data.id);
this.showIndex = null;
},
// 确认
......@@ -202,22 +207,21 @@
this.$router.push({
name: "risk-affirm",
params: {
data: data,
},
data: data
}
});
this.showIndex = null;
},
},
};
</script>
<style lang="less" scoped>
}
}
};
</script>
#app {
<style lang="less" scoped>
#app {
font-family: "";
color: #2c3e50;
}
.con-list {
}
.con-list {
padding: 0;
background-color: #f0f1f5;
.van-cell-group--inset {
......@@ -245,9 +249,8 @@
}
}
}
}
/deep/.van-tab__pane{
}
/deep/.van-tab__pane {
min-height: 8rem;
}
</style>
\ No newline at end of file
}
</style>
src/views/riskProject/taskLedger/taskDetail.vue
View file @ ce5d2251
......@@ -4,29 +4,32 @@
<LHeader :text="text"></LHeader>
</van-sticky>
<div class="section">
<van-tabs v-model="activeName" color="#2980f7" animated >
<van-tabs v-model="activeName" color="#2980f7" animated>
<van-tab title="固有风险信息" name="a">
</van-tab>
<van-tab title="现状风险" name="b">
<van-cell-group
inset
v-for="(item, index) in quoRiskList"
:key="index"
>
<div class="quolist">
<van-cell-group style="padding: 10px;box-sizing: border-box;background-color: #fff;margin: 8px;border-radius: 10px;" v-for="(item, index) in quoRiskList" :key="index">
<div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.name }}
</div>
<van-row gutter="">
<van-row gutter="4">
<van-col span="17">
<van-row gutter="">
<van-col span="9">创建人：</van-col>
<van-col span="15">{{ item.leaderUserName }}</van-col>
<van-col span="9">风险系数：</van-col>
<van-col span="15">{{ item.coefficient }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">创建时间：</van-col>
<van-col span="15">{{
timestampToTimes(item.createTime)
}}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">发起时间：</van-col>
<van-col span="9">风险描述：</van-col>
<van-col span="15">{{
timestampToTimes(item.startTime)
item.describe
}}</van-col>
</van-row>
</van-col>
......@@ -34,20 +37,21 @@
<van-row>
{{ item.state }}
</van-row>
<van-row>
<van-button
type="info"
size="mini"
@click="todetail(index, item)"
>{{ active == 2 ? "去处理" : "去审批" }}</van-button
>
<van-row type="flex" style="flex-direction: column;align-items: center;">
<van-col>
<van-image round width="34" height="34" src="https://img01.yzcdn.cn/vant/cat.jpeg" />
</van-col>
<van-col>
{{ item.userName }}
</van-col>
</van-row>
</van-col>
</van-row>
</van-cell-group>
</div>
</van-tab>
<van-tab title="四色图" name="c">
<drawCanvas/>
<drawCanvas />
</van-tab>
</van-tabs>
</div>
......@@ -58,33 +62,43 @@
import LHeader from "@/components/header.vue";
import drawCanvas from '@/views/drawCanvas/riskView.vue'
import { getFun, postFun } from "@/service/table.js";
import { timestampToTime } from "@/utils/format";
export default {
name: 'taskDetail',
data() {
return {
text: "固有风险列表",
activeName: 'a',
quoRiskList:[],//现状风险列表
InherentRisk:[],//固有风险
inherentId:''
quoRiskList: [],//现状风险列表
InherentRisk: [],//固有风险
inherentId: ''
}
},
components: {
LHeader,
drawCanvas
},
created(){
created() {
this.inherentId = this.$route.params.id
},
mounted() {
this.getInherentRiskList(this.$route.params.id)
this.getQuoRiskList(this.$route.params.id)
},
methods: {
getQuoRiskList(inherentId){
getFun(`/risk/plan/existing/list/${inherentId}`).then(res=>{
getInherentRiskList(inherentId){
getFun(`/risk/plan/inherent/details/${inherentId}`).then(res=>{
console.log(res.data,'lllll')
})
},
getQuoRiskList(inherentId) {
getFun(`/risk/plan/existing/list/${inherentId}`).then(res => {
this.quoRiskList = res.data
})
}
},
timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true);
},
},
}
</script>
......@@ -100,4 +114,8 @@ export default {
height: 100%;
overflow-y: auto;
}
.quolist{
padding: 10px;
box-sizing: border-box;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment