From 9e671efdbb3f53465cfcf2ab77b952370fa7d2b5 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 14:47:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/shijianchuli/event-info.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 9713d7e9..8e602fee 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -18,7 +18,7 @@
               <span>{{ eventInfo.gridName }}</span>
             </div>
             <div class="info-prop">
-              <span>上报时间：</span>
+              <span>发生时间：</span>
               <span>{{ eventInfo.happenTime }}</span>
             </div>
 

From 881bf5c1765ebe873c9975068f4fd400e5613bd6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 1 Jun 2022 09:41:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/shequzhili/event-info.scss       | 3 ++-
 src/views/modules/shequzhili/event/cpts/event-detail.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index 39f48b60..ad8cad49 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -396,7 +396,8 @@
                 display: flex;
 
                 .detail-field {
-                    width: 100px;
+                    flex:0 0 100px;
+              
                     text-align: justify;
                     text-align-last: justify;
                 }
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 4fa2288c..13709ebd 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -79,7 +79,7 @@
         </div>
       </div>
 
-      <div v-if="info.operationId||!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
+      <div v-if="info.operationId&&!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
            class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>