Merge branch 'dev-cjw' into shenzhen-dev

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
         }
       })

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,

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,

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,

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()
     },