diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue index b823a6ba..8b5e3c4f 100644 --- a/ui/dasadmin/src/views/backend/malfunction/index.vue +++ b/ui/dasadmin/src/views/backend/malfunction/index.vue @@ -29,12 +29,12 @@ 日期 @@ -273,7 +273,7 @@ const getTreeDataList = () => { const searchData = reactive<{ fileName: ''; date: Date[] }>({ fileName: '', - date: [dayjs().toDate(), dayjs().toDate()], + date: [dayjs().startOf('month').toDate(), dayjs().toDate()], }) const shortcuts = [ { @@ -287,15 +287,15 @@ const shortcuts = [ { text: '上月', value: () => { - const start = dayjs().subtract(1, 'month').toDate() - const end = dayjs().subtract(1, 'month').toDate() + const start = dayjs().subtract(1, 'month').startOf('month').toDate() + const end = dayjs().subtract(1, 'month').endOf('month').toDate() return [start, end] }, }, { text: '近三月', value: () => { - const start = dayjs().subtract(2, 'month').toDate() + const start = dayjs().subtract(2, 'month').startOf('month').toDate() const end = dayjs().toDate() return [start, end] }, @@ -325,8 +325,8 @@ const changePageSetting = () => {} const getListForAirBlower = () => { const data = { deviceCode: curTreeData.value.code, - startTime: dayjs(searchData.date[0]).format('YYYY-MM'), - endTime: dayjs(searchData.date[1]).format('YYYY-MM'), + startTime: dayjs(searchData.date[0]).format('YYYY-MM-DD'), + endTime: dayjs(searchData.date[1]).format('YYYY-MM-DD'), } if (activeName.value === 'malFunction') { diff --git a/ui/dasadmin/src/views/backend/node/index.vue b/ui/dasadmin/src/views/backend/node/index.vue index 95979094..a7f784b5 100644 --- a/ui/dasadmin/src/views/backend/node/index.vue +++ b/ui/dasadmin/src/views/backend/node/index.vue @@ -99,8 +99,10 @@