From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/foundationSet/safetyAction/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/specialWorkSystem/foundationSet/safetyAction/index.vue b/src/views/specialWorkSystem/foundationSet/safetyAction/index.vue
index cc6d5a6..daae169 100644
--- a/src/views/specialWorkSystem/foundationSet/safetyAction/index.vue
+++ b/src/views/specialWorkSystem/foundationSet/safetyAction/index.vue
@@ -48,7 +48,7 @@
</span>
</template>
</el-table-column>
- <el-table-column property="context" label="措施内容"></el-table-column>
+ <el-table-column property="context" label="措施内容" show-overflow-tooltip></el-table-column>
<el-table-column prop="correctVal" label="正确值" show-overflow-tooltip>
<template #default="scope">
<span>
@@ -60,7 +60,7 @@
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="modifiedUname" label="最后修改人" show-overflow-tooltip></el-table-column>
<el-table-column prop="gmtModified" label="最后修改时间" show-overflow-tooltip></el-table-column>
- <el-table-column property="status" label="状态" width="60" />
+<!-- <el-table-column property="status" label="状态" width="60" />-->
<el-table-column fixed="right" label="操作" align="center" width="300">
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="openSafetyActionDialog('查看', scope.row)">查看</el-button>
--
Gitblit v1.9.2