by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master #3

Merged
bichangxiong merged 19 commits from master into prod 2025-08-29 18:46:27 +08:00
Conversation 0 Commits 19 Files Changed 17 +14 -6
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2a5567664 - Show all commits

16
apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
View File

@@ -248,7 +248,9 @@ onMounted(() => {
}); });
}); });
const trendData = ref<any>({}); const hourTotal = ref<number>();
const dayTotal = ref<number>();
const monthTotal = ref<number>();
async function handleSelectFloor(selectedKeys, info) { async function handleSelectFloor(selectedKeys, info) {
let data = { let data = {
day: currentDay.value.format('YYYY-MM-DD'), day: currentDay.value.format('YYYY-MM-DD'),
@@ -269,6 +271,7 @@ async function handleSelectFloor(selectedKeys, info) {
// 更新日数据图表 // 更新日数据图表
if (chartInstances.value.day && trend.hour) { if (chartInstances.value.day && trend.hour) {
hourTotal.value = trend.hour.total;
chartInstances.value.day.setOption({ chartInstances.value.day.setOption({
xAxis: { xAxis: {
data: trend.hour.categories || [], data: trend.hour.categories || [],
@@ -284,6 +287,7 @@ async function handleSelectFloor(selectedKeys, info) {
// 更新月数据图表 // 更新月数据图表
if (chartInstances.value.month && trend.day) { if (chartInstances.value.month && trend.day) {
dayTotal.value = trend.day.total;
chartInstances.value.month.setOption({ chartInstances.value.month.setOption({
xAxis: { xAxis: {
data: trend.day.categories || [], data: trend.day.categories || [],
@@ -299,6 +303,7 @@ async function handleSelectFloor(selectedKeys, info) {
// 更新年数据图表 // 更新年数据图表
if (chartInstances.value.year && trend.month) { if (chartInstances.value.year && trend.month) {
monthTotal.value = trend.month.total;
chartInstances.value.year.setOption({ chartInstances.value.year.setOption({
xAxis: { xAxis: {
data: trend.month.categories || [], data: trend.month.categories || [],
@@ -332,7 +337,8 @@ async function handleSelectFloor(selectedKeys, info) {
<DatePicker <DatePicker
v-model:value="currentDay" v-model:value="currentDay"
:disabled-date="disabledDay" :disabled-date="disabledDay"
/>当日能耗总值：125.04KW.h />
<span>当日能耗总值：{{ hourTotal }}KW.h</span>
</div> </div>
</div> </div>
<div id="day" style="height: 100%; width: 100%"></div> <div id="day" style="height: 100%; width: 100%"></div>
@@ -352,7 +358,8 @@ async function handleSelectFloor(selectedKeys, info) {
v-model:value="currentMonth" v-model:value="currentMonth"
:disabled-date="disabledMonth" :disabled-date="disabledMonth"
picker="month" picker="month"
/>当月能耗总值：125.04KW.h />
<span>当日能耗总值：{{ dayTotal }}KW.h</span>
</div> </div>
</div> </div>
<div id="month" style="height: 100%; width: 100%"></div> <div id="month" style="height: 100%; width: 100%"></div>
@@ -372,7 +379,8 @@ async function handleSelectFloor(selectedKeys, info) {
v-model:value="currentYear" v-model:value="currentYear"
:disabled-date="disabledYear" :disabled-date="disabledYear"
picker="year" picker="year"
/>当年能耗总值：125.04KW.h />
<span>当日能耗总值：{{ monthTotal }}KW.h</span>
</div> </div>
</div> </div>
<div id="year" style="height: 100%; width: 100%"></div> <div id="year" style="height: 100%; width: 100%"></div>

4
apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue
View File

@@ -37,8 +37,8 @@ const gridOptions: VxeGridProps = {
return await getVisitorList({ return await getVisitorList({
pageNum: page.currentPage, pageNum: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0], begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0].format('YYYY-MM-DD'),
endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1], endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1].format('YYYY-MM-DD'),
personName: typeof formValues.personName === 'undefined' ? '' : formValues.personName, personName: typeof formValues.personName === 'undefined' ? '' : formValues.personName,
recordType: typeof formValues.recordType === 'undefined' ? '' : formValues.recordType, recordType: typeof formValues.recordType === 'undefined' ? '' : formValues.recordType,
}); });