From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
index 37cb2c1..d958349 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
@@ -42,6 +42,8 @@
</div>
<el-table :data="reportData.data" style="width: 100%">
<el-table-column type="index" label="序号" width="60" />
+ <el-table-column prop="reportTime" label="上报时间" show-overflow-tooltip width="170px"></el-table-column>
+ <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="dangerDesc" label="隐患情况描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="produceDeviceName" label="生产装置名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="riskUnitName" label="风险分析单元名称" show-overflow-tooltip></el-table-column>
--
Gitblit v1.9.2