From c81064b040e1afeaef7a403773d22233da4008c6 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Tue, 16 Dec 2025 16:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/schoolNews/Dockerfile.base-serv | 12 ----------- .../admin/manage/crontab/NewsCrawlerView.vue | 20 +++++++++++++------ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/docker/schoolNews/Dockerfile.base-serv b/docker/schoolNews/Dockerfile.base-serv index 86f2066..2b8d047 100644 --- a/docker/schoolNews/Dockerfile.base-serv +++ b/docker/schoolNews/Dockerfile.base-serv @@ -14,18 +14,6 @@ ENV LANG=C.UTF-8 \ PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple \ PIP_TRUSTED_HOST=pypi.tuna.tsinghua.edu.cn -# 设置阿里云Debian源和时区 -RUN echo "deb https://mirrors.aliyun.com/debian/ bookworm main non-free non-free-firmware contrib" > /etc/apt/sources.list && \ - echo "deb-src https://mirrors.aliyun.com/debian/ bookworm main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb https://mirrors.aliyun.com/debian/ bookworm-updates main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb-src https://mirrors.aliyun.com/debian/ bookworm-updates main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb https://mirrors.aliyun.com/debian/ bookworm-backports main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb-src https://mirrors.aliyun.com/debian/ bookworm-backports main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb https://mirrors.aliyun.com/debian-security/ bookworm-security main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo "deb-src https://mirrors.aliyun.com/debian-security/ bookworm-security main non-free non-free-firmware contrib" >> /etc/apt/sources.list && \ - echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid && \ - apt-get update && apt-get install -y --no-install-recommends gnupg2 ca-certificates - # 安装系统依赖和工具 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue b/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue index d8b86bc..238379c 100644 --- a/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue +++ b/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue @@ -981,15 +981,23 @@ async function handleSubmit() { const processedParams = { ...dynamicParams.value }; if (selectedMethod.value.params) { for (const param of selectedMethod.value.params) { - if (param.type === 'DateRangePicker' && processedParams[param.name]) { + if (param.type === 'DateRangePicker') { const dateRange = processedParams[param.name]; - if (Array.isArray(dateRange) && dateRange.length === 2) { - // 拆分为startKey和endKey - const startKey = (param as any).startKey || 'startDate'; - const endKey = (param as any).endKey || 'endDate'; + const startKey = (param as any).startKey || 'startDate'; + const endKey = (param as any).endKey || 'endDate'; + + if (Array.isArray(dateRange) && dateRange.length === 2 && dateRange[0] && dateRange[1]) { + // 选择了完整的时间范围 processedParams[startKey] = dateRange[0]; processedParams[endKey] = dateRange[1]; - // 删除原始的range参数 + } else { + // 未选择或选择不完整,仍然按 key 传递,只是值为空 + processedParams[startKey] = ''; + processedParams[endKey] = ''; + } + + // 无论如何都删除原始的 range 字段,避免传 dateRange 给后端 + if (processedParams.hasOwnProperty(param.name)) { delete processedParams[param.name]; } }