diff --git a/src/views/WarningList/list.vue b/src/views/WarningList/list.vue index cc6d05b..853e8ad 100644 --- a/src/views/WarningList/list.vue +++ b/src/views/WarningList/list.vue @@ -218,6 +218,7 @@ const handleQuery = () => { const resetQuery = () => { queryFormRef.value?.resetFields(); + queryTime.value = []; handleQuery(); }; diff --git a/src/views/fileList/list.vue b/src/views/fileList/list.vue index 70a6bdc..6f3cff2 100644 --- a/src/views/fileList/list.vue +++ b/src/views/fileList/list.vue @@ -133,7 +133,9 @@ const data = reactive({ pageSize: 10, userName: undefined, deviceId: undefined, - queryTime: undefined + startTime: undefined, + endTime: undefined, + queryTime: [] }, rules: { id: [{ required: true, message: '主键不能为空', trigger: 'blur' }], @@ -148,9 +150,9 @@ const data = reactive({ const { queryParams, form, rules } = toRefs(data); /** 查询测试单列表 */ -const getList = async () => { +const getList = async (params?: any) => { loading.value = true; - const res = await listDemo(queryParams.value); + const res = await listDemo(params || queryParams.value); demoList.value = res.rows; total.value = res.total; loading.value = false; @@ -171,12 +173,20 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { queryParams.value.pageNum = 1; - getList(); + queryParams.value.startTime = queryParams.value.queryTime?.[0]; + queryParams.value.endTime = queryParams.value.queryTime?.[1]; + // queryParams.value.queryTime = undefined; + // getList(); + const { queryTime, ...reqParams } = queryParams.value; + getList(reqParams); }; /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value?.resetFields(); + queryParams.value.startTime = undefined; + queryParams.value.endTime = undefined; + queryParams.value.queryTime = []; handleQuery(); };