From 9a719f3277abc8f758f7993c27517078c4c105ac Mon Sep 17 00:00:00 2001
From: vce <daisy_vce@yeah.net>
Date: Thu, 21 Mar 2024 20:34:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E5=92=8C=E6=9C=BA=E6=A2=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AE=9A=E4=BD=8D=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataPay/dataModule/dataPayAlarmRecord.vue              | 4 ++--
 .../dataPay/dataModule/dataPayRealTimeData.vue             | 2 +-
 .../smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue | 2 +-
 .../dataPay/dataModule/dataPayRealTimeData.vue             | 2 +-
 src/views/projectFront/vehiclePosition/realTimeMonitor.vue | 7 ++++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
index 395c6b61..ff643ae2 100644
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
@@ -68,7 +68,7 @@ export default {
       pageInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
-        total: 1 //总条数
+        total: 0 //总条数
       },
       searchForm: {
         pageNo: 1,
@@ -95,7 +95,7 @@ export default {
         alarmTime_end:this.searchForm.alarmTime_end,
       }).then(result => {
         if (result.success) {
-          this.List = result.result.records
+          this.tableData = result.result.records
           this.pageInfo.total = result.result.total
         }
       })
diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
index 38cc84f4..d481508e 100644
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
@@ -92,7 +92,7 @@ export default {
       pageInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
-        total: 1 //总条数
+        total: 0 //总条数
       },
       searchForm: {
         pageNo: 1,
diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
index 87434a31..6ab7145a 100644
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
@@ -71,7 +71,7 @@ export default {
       pageInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
-        total: 1 //总条数
+        total: 0 //总条数
       },
       searchForm: {
         pageNo: 1,
diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
index 0ff1f931..14394a58 100644
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
@@ -72,7 +72,7 @@ export default {
       pageInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
-        total: 1 //总条数
+        total: 0 //总条数
       },
       searchForm: {
         pageNo: 1,
diff --git a/src/views/projectFront/vehiclePosition/realTimeMonitor.vue b/src/views/projectFront/vehiclePosition/realTimeMonitor.vue
index 1fad245b..f95e0529 100644
--- a/src/views/projectFront/vehiclePosition/realTimeMonitor.vue
+++ b/src/views/projectFront/vehiclePosition/realTimeMonitor.vue
@@ -170,7 +170,7 @@
                     <div class="fence-shape">多边形</div>
                   </el-form-item>
                   <div class="create-footer">
-                    <el-button class="cancleBtn" @click="fenceCreateShow = false" icon="el-icon-circle-close" size="medium"
+                    <el-button class="cancleBtn" @click="handleCancel" icon="el-icon-circle-close" size="medium"
                       >{{ $t('message.alarmValueSet.cancel') }}
                     </el-button>
                     <el-button type="primary" icon="el-icon-circle-check" @click="submitFence" size="medium"
@@ -573,6 +573,11 @@ export default {
     }
   },
   methods: {
+    handleCancel(){
+      this.fenceCreateShow = false
+      this.closeFenceCreate()
+    },
+
     devTypeChange() {
       this.$refs.addEditForm.resetFields()
     },