From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/views/hiddenDangerRegistration/hiddenDangerAdd.vue |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
index 8835df8..b6442e7 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
@@ -115,8 +115,28 @@
                     <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
                     <el-table-column prop="ht_branch"  align="center" label="隐患部门"></el-table-column>
                     <el-table-column prop="address"  align="center" label="地点"></el-table-column>
-                    <el-table-column prop="ht_content"  align="center" label="隐患内容"></el-table-column>
-                    <el-table-column prop="measure"  align="center" label="整改措施"></el-table-column>
+                    <el-table-column prop="ht_content"  align="center" label="隐患内容">
+                        <template slot-scope="scope">
+                            <el-popover trigger="hover" placement="top">
+                                <p>{{ scope.row.ht_content }}</p>
+                                <div slot="reference" class="name-wrapper">{{
+                                        scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+                                    }}
+                                </div>
+                            </el-popover>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="measure"  align="center" label="整改措施">
+                        <template slot-scope="scope">
+                            <el-popover trigger="hover" placement="top">
+                                <p>{{ scope.row.measure }}</p>
+                                <div slot="reference" class="name-wrapper">{{
+                                        scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+                                    }}
+                                </div>
+                            </el-popover>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="ht_typesub"  align="center" label="隐患类别"></el-table-column>
                     <el-table-column prop="dangerousSource"  align="center" label="关联危险源"></el-table-column>
                     <el-table-column prop="DTRisk_level"  align="center" label="风险等级"></el-table-column>

--
Gitblit v1.9.2