From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/poweranalysis/perPassu/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
index b37d75a..d38108c 100644
--- a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
@@ -156,7 +156,7 @@
function handleNodeClick(data) {
queryParams.value.nodeId = data.id
queryParams.value.nodeName = data.label
- handleTimeType(period.value[1].value)
+ handleTimeType("MONTH")
listEnergyTypeList().then((res) => {
energyTypeList.value = res.data
queryParams.value.energyType = energyTypeList.value[0].enersno
@@ -168,11 +168,11 @@
function handleTimeType(e) {
queryParams.value.timeType = e
if (e == "MONTH") {
- queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY-MM")
+ queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
} else if (e == "YEAR") {
- queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY")
+ queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
} else {
- queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY-MM-DD")
+ queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
}
}
function handleEnergyType(item) {
@@ -200,6 +200,7 @@
proxy.addDateRange({
...queryParams.value,
...query.value,
+ timeCode: queryParams.value.dataTime,
})
).then((res) => {
if (!!res.code && res.code == 200) {
@@ -554,11 +555,11 @@
// 鑳借�楀姣斿垎鏋�-閲嶇疆
function resetQuery() {
proxy.resetForm("queryRef")
- handleTimeType(period.value[1].value)
queryParams.value.energyType = energyTypeList.value[0].enersno
queryParams.value.enername = energyTypeList.value[0].enername
queryParams.value.muid = energyTypeList.value[0].muid
queryParams.value.analysisType = "MOM"
+ handleTimeType(period.value[1].value)
handleQuery()
}
// 鑳借�楀姣斿垎鏋�-瀵煎嚭
--
Gitblit v1.9.3