From 6094c0ed1baa40ffa0ce587704660b2a6d493bbf Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Mon, 25 Jul 2022 19:15:38 +0800
Subject: [PATCH] #D
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index 6b12c45..5f6e594 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -36,7 +36,7 @@
style="width: 100%;"
>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
- <el-table-column label="安全风险事件名称" prop="riskEventId" align="center">
+ <el-table-column label="安全风险事件名称" prop="riskEventId" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<div v-for="item in riskEventList">
<div v-if="item.id === scope.row.riskEventId">
@@ -47,7 +47,7 @@
</el-table-column>
<el-table-column label="管控方式" prop="dataSrc" align="center">
</el-table-column>
- <el-table-column label="管控方式描述" prop="riskMeasureDesc" align="center">
+ <el-table-column label="管控方式描述" prop="riskMeasureDesc" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column label="管控措施分类1" prop="classify1" align="center">
</el-table-column>
@@ -55,9 +55,13 @@
</el-table-column>
<el-table-column label="管控措施分类3" prop="classify3" align="center">
</el-table-column>
- <el-table-column label="隐患排查内容" prop="troubleshootContent" align="center">
+ <el-table-column label="隐患排查内容" prop="troubleshootContent" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column label="检查类型" prop="hazardLiablePerson" align="center">
+ </el-table-column>
+ <el-table-column label="周期" prop="timeEffect" align="center">
+ </el-table-column>
+ <el-table-column label="单位" prop="timeUnit" align="center">
</el-table-column>
<el-table-column label="创建人" prop="createBy" align="center">
</el-table-column>
@@ -141,6 +145,20 @@
<el-form-item label="隐患排查内容" prop="troubleshootContent">
<el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input>
</el-form-item>
+ <el-form-item label="周期" prop="timeEffect">
+ <el-input v-model="riskControlMeasureForm.timeEffect" type="number" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ <el-form-item label="单位" prop="timeUnit">
+ <el-select v-model="riskControlMeasureForm.timeUnit" class="analyseUnit_input">
+ <el-option
+ v-for="item in timeUnitList"
+ :key="item.id"
+ :value="item.name"
+ :label="item.name"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<div align="right">
<el-button @click="riskControlMeasureVisible = false">取消</el-button>
@@ -206,6 +224,7 @@
classifyOneList:[],
classifyTwoList:[],
riskControlMeasureIdList:[],
+ timeUnitList:[{id:1,name:'小时'},{id:2,name:'天'},{id:3,name:'周'},{id:4,name:'月'},],
listLoading: false,
showCurrent:true,
showOther:false,
@@ -225,8 +244,9 @@
riskMeasureDesc: [{ required: true, message: '管控方式描述不能为空', trigger: 'blur' }],
classify1: [{ required: true, message: '管控措施分类1不能为空', trigger: 'change' }],
classify2: [{ required: true, message: '管控措施分类2不能为空', trigger: 'change' }],
- classify3: [{ required: true, message: '管控措施分类3不能为空', trigger: 'blur' }],
troubleshootContent: [{ required: true, message: '隐患排查内容不能为空', trigger: 'change' }],
+ timeEffect: [{ required: true, message: '周期不能为空', trigger: 'blur' }],
+ timeUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }],
},
riskControlMeasureForm:{
id: null,
@@ -243,7 +263,9 @@
createBy: "",
updateBy: "",
riskEvent: {
- }
+ },
+ timeEffect:"",
+ timeUnit:"",
},
listQuery:{
pageIndex:1,
@@ -354,7 +376,9 @@
createBy: "",
updateBy: "",
riskEvent: {
- }
+ },
+ timeEffect:"",
+ timeUnit:"",
}
}else{
this.title = '修改'
--
Gitblit v1.9.2