diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index 2662115..99be024 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -83,7 +83,6 @@ const shortcuts = [ // 计算过滤后的 timeOptions const filteredTimeOptions = computed(() => { - // console.log("🚀 ~ props.timeKeyList:", props.timeKeyList) if (props.timeKeyList.length > 0 && !props.timeKeyList.includes(interval.value.toString())) { interval.value = Number(props.timeKeyList[0]) @@ -91,6 +90,7 @@ const filteredTimeOptions = computed(() => { if (!props.timeKeyList || props.timeKeyList.length === 0) { return timeOptions.value } + nowTime() return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString())) }) diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index 8f3bfbf..6524626 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -720,7 +720,8 @@ const nodeClick = async (e: anyObj, node?: any) => { engineeringName.value = node?.parent.parent.data.name await queryDictType({ - lineId: e?.id, + // lineId: e?.id, + lineType: e?.lineType, conType: e.conType }).then(res => { oddAndEvenFlag.value = false