From 15c6ad8e7d8e141931488a84fd9fdafeea63a48f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 12 Apr 2022 13:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss                | 8 ++++++++
 src/views/modules/shequ/cpts/bar-chart.vue | 3 ++-
 src/views/modules/shequ/index.vue          | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 7acb699e..794afa6f 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -813,3 +813,11 @@ img {
   background-color: #fe6252;
   border-color: #fe6252;
 }
+
+// 修改表格不换行的问题
+div.el-table div.cell {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
+}
diff --git a/src/views/modules/shequ/cpts/bar-chart.vue b/src/views/modules/shequ/cpts/bar-chart.vue
index 9e965b9c..962ff6f8 100644
--- a/src/views/modules/shequ/cpts/bar-chart.vue
+++ b/src/views/modules/shequ/cpts/bar-chart.vue
@@ -18,6 +18,7 @@ let srcData = [];
 const iniChart = function (config, srcData, total, that) {
   chart = new F2.Chart({
     id: "myChart",
+    pixelRatio: window.devicePixelRatio,
     ...config,
   });
 
@@ -91,7 +92,7 @@ const iniChart = function (config, srcData, total, that) {
       attrs: {
         x: point.x,
         y: point.y + offset,
-        text: obj.count + '人',
+        text: obj.count + "人",
         textAlign: "center",
         textBaseline: "bottom",
         fill: "#808080",
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 54e8a575..3eed29d4 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -319,7 +319,8 @@
                                    label="所属网格">
                   </el-table-column>
                   <el-table-column prop="name"
-                                   label="姓名"> </el-table-column>
+                                   label="姓名"
+                                   width="80"> </el-table-column>
                   <el-table-column prop="family"
                                    label="所属家庭">
                   </el-table-column>
@@ -328,7 +329,8 @@
                   </el-table-column>
                   <el-table-column fixed="right"
                                    label="操作"
-                                   align="center">
+                                   align="center"
+                                   width="60">
                     <template slot-scope="scope">
                       <el-button @click="handleWatchWarning(scope.$index)"
                                  type="text"