diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue index ff63dbd5..c78babc1 100644 --- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue +++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue @@ -248,7 +248,9 @@ onMounted(() => { }); }); -const trendData = ref({}); +const hourTotal = ref(); +const dayTotal = ref(); +const monthTotal = ref(); async function handleSelectFloor(selectedKeys, info) { let data = { day: currentDay.value.format('YYYY-MM-DD'), @@ -269,6 +271,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新日数据图表 if (chartInstances.value.day && trend.hour) { + hourTotal.value = trend.hour.total; chartInstances.value.day.setOption({ xAxis: { data: trend.hour.categories || [], @@ -284,6 +287,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新月数据图表 if (chartInstances.value.month && trend.day) { + dayTotal.value = trend.day.total; chartInstances.value.month.setOption({ xAxis: { data: trend.day.categories || [], @@ -299,6 +303,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新年数据图表 if (chartInstances.value.year && trend.month) { + monthTotal.value = trend.month.total; chartInstances.value.year.setOption({ xAxis: { data: trend.month.categories || [], @@ -332,7 +337,8 @@ async function handleSelectFloor(selectedKeys, info) { 当日能耗总值:125.04KW.h + /> + 当日能耗总值:{{ hourTotal }}KW.h
@@ -352,7 +358,8 @@ async function handleSelectFloor(selectedKeys, info) { v-model:value="currentMonth" :disabled-date="disabledMonth" picker="month" - />当月能耗总值:125.04KW.h + /> + 当日能耗总值:{{ dayTotal }}KW.h
@@ -372,7 +379,8 @@ async function handleSelectFloor(selectedKeys, info) { v-model:value="currentYear" :disabled-date="disabledYear" picker="year" - />当年能耗总值:125.04KW.h + /> + 当日能耗总值:{{ monthTotal }}KW.h
diff --git a/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue b/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue index 95bd5498..c3438c5b 100644 --- a/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue +++ b/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue @@ -37,8 +37,8 @@ const gridOptions: VxeGridProps = { return await getVisitorList({ pageNum: page.currentPage, pageSize: page.pageSize, - begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0], - endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1], + begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0].format('YYYY-MM-DD'), + endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1].format('YYYY-MM-DD'), personName: typeof formValues.personName === 'undefined' ? '' : formValues.personName, recordType: typeof formValues.recordType === 'undefined' ? '' : formValues.recordType, });