From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

---
 src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
index 8d06ee0..7f76331 100644
--- a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
@@ -106,7 +106,7 @@
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="isShowReportDialog = !isShowReportDialog" size="default">取 消</el-button>
-                    <el-button type="primary" @click="submitReport" v-throttle size="default">确 实</el-button>
+                    <el-button type="primary" @click="submitReport" v-throttle size="default">确 定</el-button>
                 </span>
             </template>
         </el-dialog>

--
Gitblit v1.9.2