Web/admin-govern
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改查询统计数据

Browse Source
This commit is contained in:
guanj
2026-06-22 12:40:31 +08:00
parent 8527939eb1
commit 1dbecb19cc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/form/datePicker/index.vue
View File

@@ -83,7 +83,6 @@ const shortcuts = [
// 计算过滤后的 timeOptions // 计算过滤后的 timeOptions
const filteredTimeOptions = computed(() => { const filteredTimeOptions = computed(() => {
// console.log("🚀 ~ props.timeKeyList:", props.timeKeyList)
if (props.timeKeyList.length > 0 && !props.timeKeyList.includes(interval.value.toString())) { if (props.timeKeyList.length > 0 && !props.timeKeyList.includes(interval.value.toString())) {
interval.value = Number(props.timeKeyList[0]) interval.value = Number(props.timeKeyList[0])
@@ -91,6 +90,7 @@ const filteredTimeOptions = computed(() => {
if (!props.timeKeyList || props.timeKeyList.length === 0) { if (!props.timeKeyList || props.timeKeyList.length === 0) {
return timeOptions.value return timeOptions.value
} }
nowTime()
return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString())) return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString()))
}) })

3
src/views/govern/device/control/index.vue
View File

@@ -720,7 +720,8 @@ const nodeClick = async (e: anyObj, node?: any) => {
engineeringName.value = node?.parent.parent.data.name engineeringName.value = node?.parent.parent.data.name
await queryDictType({ await queryDictType({
lineId: e?.id, // lineId: e?.id,
lineType: e?.lineType,
conType: e.conType conType: e.conType
}).then(res => { }).then(res => {
oddAndEvenFlag.value = false oddAndEvenFlag.value = false