From ca788e3a4122fbeb46947be76ec21625306fa0a7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/cGovernance/gridPatrolRecord.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/cGovernance/gridPatrolRecord.vue b/src/views/cGovernance/gridPatrolRecord.vue
index b5d0e66..e8bed72 100644
--- a/src/views/cGovernance/gridPatrolRecord.vue
+++ b/src/views/cGovernance/gridPatrolRecord.vue
@@ -46,13 +46,16 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 350,
border: false,
//stripe:true,
index: true,
@@ -102,6 +105,7 @@
},
{
+ width: 96,
slot: true,
addDisplay: false,
editDisplay: false,
@@ -111,6 +115,7 @@
},
{
+ width: 96,
slot: true,
addDisplay: false,
editDisplay: false,
@@ -134,9 +139,9 @@
span: 24,
},
{
+ width: 144,
label: "巡查时间",
prop: "patrolTime",
- width: 160,
type: "date",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
--
Gitblit v1.9.3