From e434c72ecb3d99e2bd8b4113998940034b0000be Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 11:41:37 +0800
Subject: [PATCH] 冲突解决

---
 src/views/realTimePolice/real.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 8442089..74dedae 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -174,7 +174,7 @@
       option: {
         height: "auto",
         indexLabel: "序号",
-        calcHeight: 30,
+        calcHeight: 54,
         labelWidth: "100",
         size: "mini",
         border: false,

--
Gitblit v1.9.3