From 8ff8b4dbccd93d4dbc7976b50148088fef77af0b Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期五, 08 十二月 2023 08:56:26 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/EquipmentManage/EquipSpot.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/web/src/views/EquipmentManage/EquipSpot.vue b/web/src/views/EquipmentManage/EquipSpot.vue
index 036c4b9..5281d6d 100644
--- a/web/src/views/EquipmentManage/EquipSpot.vue
+++ b/web/src/views/EquipmentManage/EquipSpot.vue
@@ -144,7 +144,10 @@
required: true,
message: '请选择设备',
trigger: ['blur', 'change']
- }]
+ }],
+ bigDeviceModel: [{
+
+ }]
},
deviceData: [],
checkTypeData: []
@@ -179,8 +182,8 @@
bigNumber: this.bigNumber,
pageNum: this.pageNum,
pageSize: this.pageSize,
- startTime: this.timeData ? this.timeData[0] : '',
- endTime: this.timeData ? this.timeData[1] : ''
+ startTime: this.timeData ? this.timeData[0] + ' 00:00:00' : '',
+ endTime: this.timeData ? this.timeData[1] + ' 23:59:59' : ''
}).then(res => {
if(res.success) {
this.total = res.data.total;
@@ -300,10 +303,12 @@
// 切换页数
changePageNum(page) {
this.pageNum = page;
+ this.searchSpotCheckList();
},
// 切换每页条数
changePageSize(size) {
this.pageSize = size;
+ this.searchSpotCheckList();
}
},
watch: {
--
Gitblit v1.9.3