Skip to content

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

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

parents b5bb8cbb 3b9d0486
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 999 additions and 335 deletions
src/App.vue
View file @ e3ccc85d
This diff is collapsed.
src/router/index.js
View file @ e3ccc85d
...@@ -3,199 +3,204 @@ import VueRouter from 'vue-router' ...@@ -3,199 +3,204 @@ import VueRouter from 'vue-router'
Vue.use(VueRouter) Vue.use(VueRouter)
const routes = [{ const routes = [{
path: '/', path: '/',
redirect: '/login' redirect: '/login'
}, },
// 登录页 // 登录页
{ {
path: '/login', path: '/login',
name: 'login', name: 'login',
component: () => import('../views/login.vue'), component: () => import('../views/login.vue'),
}, },
// 我的地盘页面 // 我的地盘页面
{ {
path: '/my', path: '/my',
name: 'my', name: 'my',
component: () => import('../views/my'), component: () => import('../views/my'),
}, },
{ {
path: '/my-role', path: '/my-role',
name: 'my-role', name: 'my-role',
meta: { meta: {
title: '我的权限' title: '我的权限'
}, },
component: () => import('@/views/my/role') component: () => import('@/views/my/role')
}, },
{ {
path: '/my-reset-pas', path: '/my-reset-pas',
name: 'my-reset-pas', name: 'my-reset-pas',
meta: { meta: {
title: '修改密码' title: '修改密码'
}, },
component: () => import('@/views/my/resetPas') component: () => import('@/views/my/resetPas')
}, },
// 安全工作台页面 // 安全工作台页面
{ {
path: '/save-workbench', path: '/save-workbench',
name: 'save-workbench', name: 'save-workbench',
component: () => import('../views/saveWorkbench'), component: () => import('../views/saveWorkbench'),
}, },
// 创建任务页面 // 创建任务页面
{ {
path: '/create-task', path: '/create-task',
name: 'create-task', name: 'create-task',
component: () => import('../views/createTask'), component: () => import('../views/createTask'),
}, },
// 选择任务类型 // 选择任务类型
{ {
path: '/task-type', path: '/task-type',
name: 'task-type', name: 'task-type',
component: () => import('../views/createTask/taskSubPage/taskType.vue'), component: () => import('../views/createTask/taskSubPage/taskType.vue'),
}, },
// 选择作业任务 // 选择作业任务
{ {
path: '/work-task', path: '/work-task',
name: 'work-task', name: 'work-task',
component: () => import('../views/createTask/taskSubPage/workTask'), component: () => import('../views/createTask/taskSubPage/workTask'),
}, },
// 选择作业综合班 // 选择作业综合班
{ {
path: '/work-class', path: '/work-class',
name: 'work-class', name: 'work-class',
component: () => import('../views/createTask/taskSubPage/workClass'), component: () => import('../views/createTask/taskSubPage/workClass'),
}, },
// 选择作业综合组 // 选择作业综合组
{ {
path: '/work-group', path: '/work-group',
name: 'work-group', name: 'work-group',
component: () => import('../views/createTask/taskSubPage/workGroup'), component: () => import('../views/createTask/taskSubPage/workGroup'),
}, },
// 选择作业负责人 // 选择作业负责人
{ {
path: '/work-leader', path: '/work-leader',
name: 'work-leader', name: 'work-leader',
component: () => import('../views/createTask/taskSubPage/workLeader'), component: () => import('../views/createTask/taskSubPage/workLeader'),
}, },
// 选择作业其他人员 // 选择作业其他人员
{ {
path: '/work-other-per', path: '/work-other-per',
name: 'work-other-per', name: 'work-other-per',
component: () => import('../views/createTask/taskSubPage/workOtherPer'), component: () => import('../views/createTask/taskSubPage/workOtherPer'),
}, },
// 选择微流域 // 选择微流域
{ {
path: '/micro-watersh', path: '/micro-watersh',
name: 'micro-watersh', name: 'micro-watersh',
component: () => import('../views/createTask/taskSubPage/microWatersh'), component: () => import('../views/createTask/taskSubPage/microWatersh'),
}, },
// 选择管段 // 选择管段
{ {
path: '/pipe-section', path: '/pipe-section',
name: 'pipe-section', name: 'pipe-section',
component: () => import('../views/createTask/taskSubPage/pipeSection'), component: () => import('../views/createTask/taskSubPage/pipeSection'),
}, },
// 选择车牌号 // 选择车牌号
{ {
path: '/license-plate', path: '/license-plate',
name: 'license-plate', name: 'license-plate',
component: () => import('../views/createTask/taskSubPage/licensePlate'), component: () => import('../views/createTask/taskSubPage/licensePlate'),
}, },
// 选择手杆爬行器 // 选择手杆爬行器
{ {
path: '/work-device', path: '/work-device',
name: 'work-device', name: 'work-device',
component: () => import('../views/createTask/taskSubPage/workDevice'), component: () => import('../views/createTask/taskSubPage/workDevice'),
}, },
//风险项目新增 //风险项目新增
{ {
path: '/riskAdd', path: '/riskAdd',
name: 'riskAdd', name: 'riskAdd',
component: () => import('../views/riskProject/add'), component: () => import('../views/riskProject/add'),
}, },
//风险项目管理 //风险项目管理
{ {
path: '/riskManage', path: '/riskManage',
name: 'riskManage', name: 'riskManage',
component: () => import('../views/riskProject/manage'), component: () => import('../views/riskProject/manage'),
}, },
//风险评估 //风险评估
{ {
path: '/riskAssess', path: '/riskAssess',
name: 'riskAssess', name: 'riskAssess',
component: () => import('../views/riskProject/assess'), component: () => import('../views/riskProject/assess'),
}, },
//风险审批 //风险审批
{ {
path: '/riskApprove', path: '/riskApprove',
name: 'riskApprove', name: 'riskApprove',
component: () => import('../views/riskProject/approve'), component: () => import('../views/riskProject/approve'),
}, },
//风险台账 //风险台账
{ {
path: '/riskLedger', path: '/riskLedger',
name: 'riskLedger', name: 'riskLedger',
component: () => import('../views/riskProject/ledger'), component: () => import('../views/riskProject/ledger'),
}, },
//任务单 //任务单
{ {
path: '/riskTaskList', path: '/riskTaskList',
name: 'riskTaskList', name: 'riskTaskList',
component: () => import('../views/riskProject/add/taskList.vue'), component: () => import('../views/riskProject/add/taskList.vue'),
}, },
//固有风险列表 //固有风险列表
{ {
path: '/riskInherent', path: '/riskInherent',
name: 'riskInherent', name: 'riskInherent',
component: () => import('../views/riskProject/add/inherentRisks.vue'), component: () => import('../views/riskProject/add/inherentRisks.vue'),
}, },
//新增固有风险 //新增固有风险
{ {
path: '/addInherent', path: '/addInherent',
name: 'addInherent', name: 'addInherent',
component: () => import('../views/riskProject/add/addInherent.vue'), component: () => import('../views/riskProject/add/addInherent.vue'),
}, },
{//编辑固有风险 {//编辑固有风险
path: '/addCurrent', path: '/addCurrent',
name: 'addCurrent', name: 'addCurrent',
component: () => import('../views/riskProject/add/addCurrent.vue'), component: () => import('../views/riskProject/add/addCurrent.vue'),
}, },
{//新增现状风险 {//新增现状风险
path: '/addPresent ', path: '/addPresent ',
name: 'addPresent', name: 'addPresent',
component: () => import('../views/riskProject/add/addPresent.vue'), component: () => import('../views/riskProject/add/addPresent.vue'),
}, },
{//风险评估列表详情页 {//风险评估列表详情页
path: '/riskBigDetail', path: '/riskBigDetail',
name: 'riskBigDetail', name: 'riskBigDetail',
component: () => import('../views/riskProject/assess/riskBigDetail.vue'), component: () => import('../views/riskProject/assess/riskBigDetail.vue'),
}, },
{//执行情况管理 {//执行情况管理
path: '/riskExecution', path: '/riskExecution',
name: 'riskExecution', name: 'riskExecution',
component: () => import('../views/riskProject/execution/index.vue'), component: () => import('../views/riskProject/execution/index.vue'),
}, },
{//四色图 {//四色图
path: '/riskView', path: '/riskView',
name: 'riskView', name: 'riskView',
component: () => import('../views/drawCanvas/riskView.vue'), component: () => import('../views/drawCanvas/riskView.vue'),
}, },
{//任务台账 {//任务台账
path: '/taskLedger', path: '/taskLedger',
name: 'taskLedger', name: 'taskLedger',
component: () => import('../views/riskProject/taskLedger/index.vue'), component: () => import('../views/riskProject/taskLedger/index.vue'),
}, },
{//任务台账 {//任务台账
path: '/taskDetail', path: '/taskDetail',
name: 'taskDetail', name: 'taskDetail',
component: () => import('../views/riskProject/taskLedger/taskDetail.vue'), component: () => import('../views/riskProject/taskLedger/taskDetail.vue'),
}, },
{//任务台账 {//任务台账
path: '/resultPage', path: '/resultPage',
name: 'resultPage', name: 'resultPage',
component: () => import('../views/riskProject/add/resultPage.vue'), component: () => import('../views/riskProject/add/resultPage.vue'),
}, },
{//任务台账
path: '/riskAppvoreText',
name: 'riskAppvoreText',
component: () => import('../views/riskProject/add/riskAppvoreText.vue'),
}
] ]
const router = new VueRouter({ const router = new VueRouter({
......
src/views/riskProject/add/addInherent.vue
View file @ e3ccc85d
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank" <van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank"
@select="onSelectSetRank"> @select="onSelectSetRank">
<template #reference> <template #reference>
<van-field v-model="severityValue" readonly required name="level" label="发生的可能性" <van-field v-model="severityValue" readonly required name="level" label="后果严重程度"
placeholder="请选择" /> placeholder="请选择" />
</template> </template>
</van-popover> </van-popover>
......
src/views/riskProject/add/addPresent.vue
View file @ e3ccc85d
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
:rules="[{ required: true, message: '准事故类型不能为空' }]" :rules="[{ required: true, message: '准事故类型不能为空' }]"
/> />
<van-field <!-- <van-field
readonly readonly
v-model="form.level" v-model="form.level"
required required
...@@ -95,7 +95,9 @@ ...@@ -95,7 +95,9 @@
placeholder="请选择" placeholder="请选择"
@click="seletGrade('level')" @click="seletGrade('level')"
:rules="[{ required: true, message: '风险等级不能为空' }]" :rules="[{ required: true, message: '风险等级不能为空' }]"
/> /> -->
<van-field readonly v-model="form.level" required name="level" label="风险等级" placeholder="请选择"
@click="seletGrade" :rules="[{ required: true, message: '风险等级不能为空' }]" />
<van-field <van-field
required required
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" > <div v-if="this.$route.params.isView" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" >
<img src="@/assets/accidentIcon/bookmark.svg" alt="" style="position: relative;top: 32%;transform: translateY(-50%);" > <img src="@/assets/accidentIcon/bookmark.svg" alt="" style="position: relative;top: 32%;transform: translateY(-50%);" >
参考依据 参考依据
</div> </div>
...@@ -330,13 +332,42 @@ ...@@ -330,13 +332,42 @@
/> />
</van-popup> </van-popup>
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0" v-if="this.$route.params.isView" >
<van-button round block type="info" native-type="submit" <van-button round block type="info" native-type="submit"
>上报</van-button >上报</van-button
> >
</div> </div>
</van-form> </van-form>
<div style="margin: 10px 16px 0px; padding-bottom: 16px"> <van-dialog v-model="showGradeDialog" title="风险评测配置" :show-cancel-button="false" :show-confirm-button="false" >
<div class="dialogContain">
<van-collapse v-model="activeNames">
<van-collapse-item title="风险模型" name="1">
<van-field readonly required name="level" label="当前风险模型" placeholder="LS风险矩阵评估模型" />
</van-collapse-item>
<van-collapse-item title="风险模型配置" name="2">
<van-popover v-model="showPopover" trigger="click" :actions="columnsRiskRank"
@select="onSelect">
<template #reference>
<van-field v-model="possibleValue" readonly required name="level" label="发生的可能性"
placeholder="请选择" />
</template>
</van-popover>
<van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank"
@select="onSelectSetRank">
<template #reference>
<van-field v-model="severityValue" readonly required name="level" label="后果严重程度"
placeholder="请选择" />
</template>
</van-popover>
</van-collapse-item>
</van-collapse>
<van-row type="flex" justify="center" style="margin-top:10px">
<van-col span="6"><van-button size="small" plain type="info" @click="showGradeDialog = false">取消</van-button></van-col>
<van-col span="6"><van-button size="small" type="info" @click="goResultPage">开始测评</van-button></van-col>
</van-row>
</div>
</van-dialog>
<div v-if="this.$route.params.isView" style="margin: 10px 16px 0px; padding-bottom: 16px">
<van-button round block type="warning" @click.native="cancel" <van-button round block type="warning" @click.native="cancel"
>取消</van-button >取消</van-button
> >
...@@ -393,6 +424,10 @@ export default { ...@@ -393,6 +424,10 @@ export default {
}, },
data() { data() {
return { return {
showPopoveSetRank: false,
activeNames: ["1"],
showPopover: false,
showGradeDialog: false,
taskId: "", taskId: "",
text: "添加现状风险", text: "添加现状风险",
id: "", id: "",
...@@ -459,6 +494,10 @@ export default { ...@@ -459,6 +494,10 @@ export default {
urgentImg: [], //应急措施图片 urgentImg: [], //应急措施图片
returnCause: "", // 退回原因 returnCause: "", // 退回原因
isShowreturnCause: false, isShowreturnCause: false,
possibleValue: "",
possibleScore:0,
severityValue: "",
severityScore:0,
}; };
}, },
created() { created() {
...@@ -546,22 +585,42 @@ export default { ...@@ -546,22 +585,42 @@ export default {
] ]
}, },
seletGrade(name){ seletGrade(name){
this.showTrouble=true this.getGradeList('possibility')
this.riskName=name this.getGradeList('severity')
this.columnsTrouble=[ this.showGradeDialog = true
{ },
name:'重大风险', //风险模型配置
}, getGradeList(type) {
{ // possibility 可能性 severity 严重性
name:'较大风险', getFun(`/risk/plan/matrix/${type}/list`).then(res => {
}, let arr = []
{ res.data.forEach(item => {
name:'一般风险', arr.push({ text: item.title, type: item.type, sort: item.sort, score: item.score })
}, })
{ if (type === 'possibility') {
name:'较小风险', this.columnsRiskRank = arr
}, } else {
] this.columnsSetRank = arr
}
})
},
onSelect(data) {
this.possibleValue = data.text
this.possibleScore = data.score
},
onSelectSetRank(data) {
this.severityValue = data.text
this.severityScore = data.score
},
//开始测评
goResultPage(){
this.$router.push({
name:'resultPage',
params:{
score:this.severityScore * this.possibleScore
}
})
}, },
performTasks(){ performTasks(){
......
src/views/riskProject/add/riskAppvoreText.vue 0 → 100644
View file @ e3ccc85d
<template>
<div>
<LHeader text="备注"></LHeader>
<van-field
v-model="messageText"
rows="10"
autosize
label="备注信息"
type="textarea"
maxlength="500"
placeholder="请输入备注信息"
show-word-limit
/>
<div
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="appvore"
style="color: #4bced0;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;"><van-icon name="success" /></div>
<div>保存</div>
</div>
</div>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import { getFun, postFun } from "@/service/table.js";
export default {
name: "risk-appvore-text",
components: {
LHeader
},
data() {
return {
messageText: null,
result: null,
buildingIds: [],
planId: 0
};
},
created() {
this.result = this.$route.params.result;
this.buildingIds = this.$route.params.buildingIds;
this.planId = this.$route.params.planId;
},
methods: {
//审批
appvore() {
var buildingDtos = [];
for (let i = 0; i < this.buildingIds.length; i++) {
var buildingDto = {
buildingId: this.buildingIds[0],
taskResult: this.result,
taskOpinion: this.messageText
};
buildingDtos[i] = buildingDto;
}
console.log(buildingDtos);
var params = {
id: this.planId,
taskResult: this.result,
taskOpinion: this.messageText,
buildingDtos: buildingDtos
};
postFun("/risk/plan/approve", params)
.then(res => {
console.log(res);
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
this.$router.replace({
name: "riskApprove",
params: {}
});
}
},
watch: {}
};
</script>
src/views/riskProject/add/taskList.vue
View file @ e3ccc85d
...@@ -44,12 +44,7 @@ ...@@ -44,12 +44,7 @@
<van-step>评估审核</van-step> <van-step>评估审核</van-step>
<van-step>项目完成</van-step> <van-step>项目完成</van-step>
</van-steps> </van-steps>
<van-tabs <van-tabs v-model="active" color="#2980f7" animated offset-top="2.93rem">
v-model="active"
color="#2980f7"
animated
offset-top="2.93rem"
>
<van-tab title="任务详情"> <van-tab title="任务详情">
<van-form <van-form
:scroll-to-error="true" :scroll-to-error="true"
...@@ -359,7 +354,7 @@ ...@@ -359,7 +354,7 @@
bottom: 0;" bottom: 0;"
> >
<div <div
@click="approveTask" @click="approveTask(1)"
style="color: #4bced0;font-size: 14px;font-weight: 600;" style="color: #4bced0;font-size: 14px;font-weight: 600;"
> >
<div style="font-size: 22px;"> <div style="font-size: 22px;">
...@@ -375,6 +370,132 @@ ...@@ -375,6 +370,132 @@
<div>审批否决</div> <div>审批否决</div>
</div> </div>
</div> </div>
<!-- 否决弹出层 -->
<van-popup
v-model="isShowAppvoreList"
closeable
round
position="right"
:style="{ width: '90%', height: '100%' }"
>
<van-cell-group title="审批否决">
<!-- 内容列表 -->
<div class="con-list">
<van-checkbox-group v-model="checkValue">
<van-cell-group
inset
v-for="(item, index) in buildingList"
:key="index"
>
<van-row gutter="">
<van-col span="2">
<van-checkbox :name="item.buildingId" />
</van-col>
<van-col span="14">{{ item.buildingName }}</van-col>
<van-col
span="8"
:style="{
color:
item.status == 'wait'
? '#F79648'
: item.status == 'finish'
? '#03B615'
: '#FF041D'
}"
>{{
item.status == "wait"
? "待评估"
: item.status == "finish"
? "已完成"
: "已退回"
}}</van-col
>
</van-row>
<van-row>
<van-col span="18">
<van-row gutter="">
<van-col span="8">创 建 人：</van-col>
<van-col span="16">{{ item.createUserName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="8">处理人员：</van-col>
<van-col span="16">{{ item.workUserNames }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="8">发起时间：</van-col>
<van-col span="16"
>{{ timestampToTimes(item.startTime) }}
</van-col>
</van-row>
</van-col>
<van-col span="6">
<van-row>
<van-button
type="info"
size="mini"
@click="
{
checkValue = [item.buildingId];
approveTask(0);
}
"
>审批否决</van-button
>
</van-row></van-col
>
</van-row>
</van-cell-group>
</van-checkbox-group>
<div
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="
{
checkValue = [];
isShowAppvoreList = false;
}
"
style="color: #FB6260;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;"><van-icon name="cross" /></div>
<div>返回</div>
</div>
<div
@click="approveTask(0)"
style="color: #4bced0;font-size: 14px;font-weight: 600;"
>
<div style="font-size: 22px;"><van-icon name="success" /></div>
<div>确认</div>
</div>
</div>
<div
style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="buildingList['length'] == 0"
>
暂无数据
</div>
</div>
</van-cell-group>
</van-popup>
</div> </div>
</template> </template>
...@@ -391,11 +512,17 @@ export default { ...@@ -391,11 +512,17 @@ export default {
return { return {
text: "任务单", text: "任务单",
searchValue: "", searchValue: "",
messageText: "",
checkValue: [],
plan: 0,
showIndex: false,
isShowAppvoreList: false,
isShowText: false,
isHaveNews: false, isHaveNews: false,
messageList: [], messageList: [],
riskLogList: [], riskLogList: [],
buildingList: [],
Loop: "", // 定时器 Loop: "", // 定时器
showIndex: null, // 是否显示遮罩层,
active: 0, active: 0,
status: 0, status: 0,
pathAuth: "", pathAuth: "",
...@@ -420,12 +547,12 @@ export default { ...@@ -420,12 +547,12 @@ export default {
}; };
}, },
created() { created() {
var planId = this.$route.params.id || sessionStorage.getItem("planId"); this.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.pathAuth = sessionStorage.getItem("pathAuth");
this.postList(planId, buildingId); this.postList(this.planId, buildingId);
this.getRiskTaskList(planId, buildingId); this.getRiskTaskList(this.planId, buildingId);
}, },
methods: { methods: {
timestampToTimes(time) { timestampToTimes(time) {
...@@ -462,15 +589,43 @@ export default { ...@@ -462,15 +589,43 @@ export default {
console.log("删除任务"); console.log("删除任务");
}, },
//审批通过 //审批通过
approveTask() { approveTask(result) {
//TODO 审批通过 //TODO 审批通过
this.$router.push({
name: "riskAppvoreText",
params: {
planId: this.planId,
buildingIds: this.checkValue,
result: result
}
});
console.log("审批通过"); console.log("审批通过");
}, },
//审批否决 //审批否决
unApproveTask() { unApproveTask() {
if (this.status == 2) {
this.lookdetail(this.planId);
} else if (this.status == 3) {
this.approveTask(0);
}
//TODO 审批否决 //TODO 审批否决
console.log("审批否决"); console.log("审批否决");
}, },
//否决楼栋列表
lookdetail(id) {
this.isShowAppvoreList = true;
getFun("/risk/plan/allocation/building/list/" + id)
.then(res => {
console.log(res);
this.buildingList = res.data;
this.checkValue = this.buildingList.map(item => item.buildingId);
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
handadd() { handadd() {
this.$router.push({ this.$router.push({
name: "riskAdd", name: "riskAdd",
...@@ -504,6 +659,9 @@ export default { ...@@ -504,6 +659,9 @@ export default {
this.messageList = res.data || res.rows; this.messageList = res.data || res.rows;
console.log(this.messageList); console.log(this.messageList);
this.form = this.messageList.detailsDto; this.form = this.messageList.detailsDto;
this.checkValue = this.messageList.riskBuildingListDtos.map(
item => item.buildingId
);
this.riskLogList = this.messageList.approveListDtos; this.riskLogList = this.messageList.approveListDtos;
console.log(this.messageList.statusKey, 111); console.log(this.messageList.statusKey, 111);
switch (this.messageList.statusKey) { switch (this.messageList.statusKey) {
......
src/views/riskProject/taskLedger/tabDetail.vue 0 → 100644
View file @ e3ccc85d
This diff is collapsed.
src/views/riskProject/taskLedger/taskDetail.vue
View file @ e3ccc85d
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
</van-sticky> </van-sticky>
<div class="section"> <div class="section">
<van-tabs v-model="activeName" color="#2980f7" animated> <van-tabs v-model="activeName" color="#2980f7" animated @click="onClick">
<van-tab title="固有风险信息" name="a"> <van-tab title="固有风险信息" name="a">
<TabDetail :InherentRisk="InherentRisk"/>
</van-tab> </van-tab>
<van-tab title="现状风险" name="b"> <van-tab title="现状风险" name="b">
<div class="quolist"> <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"> <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" @click="goDetail(item)">
<div style="font-size: 0.45rem;padding: 5px 0;"> <div style="font-size: 0.45rem;padding: 5px 0;">
{{ item.name }} {{ item.name }}
</div> </div>
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<script type="text/ecmascript-6"> <script type="text/ecmascript-6">
import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
import drawCanvas from '@/views/drawCanvas/riskView.vue' import drawCanvas from '@/views/drawCanvas/riskView.vue'
import TabDetail from "./tabDetail.vue"
import { getFun, postFun } from "@/service/table.js"; import { getFun, postFun } from "@/service/table.js";
import { timestampToTime } from "@/utils/format"; import { timestampToTime } from "@/utils/format";
export default { export default {
...@@ -70,13 +71,14 @@ export default { ...@@ -70,13 +71,14 @@ export default {
text: "固有风险列表", text: "固有风险列表",
activeName: 'a', activeName: 'a',
quoRiskList: [],//现状风险列表 quoRiskList: [],//现状风险列表
InherentRisk: [],//固有风险 InherentRisk: {},//固有风险
inherentId: '' inherentId: ''
} }
}, },
components: { components: {
LHeader, LHeader,
drawCanvas drawCanvas,
TabDetail
}, },
created() { created() {
this.inherentId = this.$route.params.id this.inherentId = this.$route.params.id
...@@ -88,7 +90,7 @@ export default { ...@@ -88,7 +90,7 @@ export default {
methods: { methods: {
getInherentRiskList(inherentId){ getInherentRiskList(inherentId){
getFun(`/risk/plan/inherent/details/${inherentId}`).then(res=>{ getFun(`/risk/plan/inherent/details/${inherentId}`).then(res=>{
console.log(res.data,'lllll') this.InherentRisk= res.data
}) })
}, },
getQuoRiskList(inherentId) { getQuoRiskList(inherentId) {
...@@ -99,6 +101,28 @@ export default { ...@@ -99,6 +101,28 @@ export default {
timestampToTimes(time) { timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true); return timestampToTime(new Date(time), "DT2", true);
}, },
goDetail(item){
console.log(item,'???')
this.$router.push({
name:'addPresent',
params:{
isView:false,
// buildingId:,
// planId:,
// floorId:,
// roomId:,
// inherentId:,
// roomName:,
}
})
},
onClick(name){
if(name==='a'){
this.getQuoRiskList(this.$route.params.id)
}else if(name==='b'){
this.getInherentRiskList(this.$route.params.id)
}
}
}, },
} }
</script> </script>
......
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