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/realHistory.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/realTimePolice/realHistory.vue b/src/views/realTimePolice/realHistory.vue
index 0ef6bbc..fe4caff 100644
--- a/src/views/realTimePolice/realHistory.vue
+++ b/src/views/realTimePolice/realHistory.vue
@@ -113,7 +113,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
menuWidth: 240,
size: "mini",
border: false,
--
Gitblit v1.9.3