From fa12796a50ff655105b98c472df7eef69fc66204 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期二, 21 十一月 2023 16:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/EquipmentManage/EquipSpot.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/web/src/views/EquipmentManage/EquipSpot.vue b/web/src/views/EquipmentManage/EquipSpot.vue
index c4742f6..5281d6d 100644
--- a/web/src/views/EquipmentManage/EquipSpot.vue
+++ b/web/src/views/EquipmentManage/EquipSpot.vue
@@ -3,7 +3,7 @@
<div class="main_header">
<div class="header_item">
<span class="header_label">设备编号：</span>
- <el-input v-model="bigDeviceName" clearable placeholder="请输入设备编号"></el-input>
+ <el-input v-model="bigNumber" clearable placeholder="请输入设备编号"></el-input>
</div>
<div class="header_item">
<span class="header_label">点检日期：</span>
@@ -129,7 +129,7 @@
export default {
data() {
return {
- bigDeviceName: '',
+ bigNumber: '',
timeData: '',
pageNum: 1,
pageSize: 10,
@@ -144,7 +144,10 @@
required: true,
message: '请选择设备',
trigger: ['blur', 'change']
- }]
+ }],
+ bigDeviceModel: [{
+
+ }]
},
deviceData: [],
checkTypeData: []
@@ -176,10 +179,11 @@
this.loading = true;
this.spotCheckList = [];
this.$api.Device.searchSpotCheckList({
+ 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;
@@ -299,10 +303,12 @@
// 切换页数
changePageNum(page) {
this.pageNum = page;
+ this.searchSpotCheckList();
},
// 切换每页条数
changePageSize(size) {
this.pageSize = size;
+ this.searchSpotCheckList();
}
},
watch: {
--
Gitblit v1.9.3