'+
'
'+
'
'+
@@ -728,10 +771,69 @@ function toggleTargetFields(){
document.getElementById('f-target_serial_wrap').style.display=mode==='serial'?'block':'none';
}
+// ===== 简单调度：cron(5段) ↔ 频率+时间 互转 =====
+const WEEKDAY_NAMES=['周日','周一','周二','周三','周四','周五','周六'];
+// cron → 简单设置 {freq: daily|hourly|everyN|weekly|custom, time:"HH:MM", interval, weekday(0-6)}
+function parseCronToFreq(cron){
+ const r={freq:'custom',time:'',interval:2,weekday:1};
+ const p=(cron||'').trim().split(/\s+/);
+ if(p.length!==5)return r;
+ const [mi,h,d,m,w]=p;
+ if(mi==='0'&&h==='*'&&d==='*'&&m==='*'&&w==='*'){r.freq='hourly';return r;}
+ const n=(h.match(/^\*\/(\d+)$/)||[])[1]; // 每隔N小时：时位是 */N
+ if(n&&mi==='0'&&d==='*'&&m==='*'&&w==='*'){r.freq='everyN';r.interval=parseInt(n)||2;return r;}
+ if(/^\d{1,2}$/.test(mi)&&/^\d{1,2}$/.test(h)&&d==='*'&&m==='*'&&w==='*'){
+ r.freq='daily';r.time=h.padStart(2,'0')+':'+mi.padStart(2,'0');return r;
+ }
+ if(/^\d{1,2}$/.test(mi)&&/^\d{1,2}$/.test(h)&&d==='*'&&m==='*'&&/^[0-7]$/.test(w)){
+ r.freq='weekly';r.time=h.padStart(2,'0')+':'+mi.padStart(2,'0');r.weekday=parseInt(w)%7;return r;
+ }
+ return r; // 解析不了 → 落到自定义
+}
+// 表单 → cron(5段)
+function buildCronFromFreq(){
+ const freq=document.getElementById('f-schedule_freq').value;
+ if(freq==='custom')return document.getElementById('f-schedule_cron').value.trim();
+ if(freq==='hourly')return '0 * * * *';
+ if(freq==='everyN'){
+ const n=parseInt(document.getElementById('f-schedule_interval').value)||2;
+ return '0 */'+Math.min(Math.max(n,1),12)+' * * *';
+ }
+ const t=(document.getElementById('f-schedule_time').value||'09:00').split(':');
+ const mi=parseInt(t[1])||0, h=parseInt(t[0])||0;
+ if(freq==='weekly'){
+ const w=parseInt(document.getElementById('f-schedule_weekday').value)||0;
+ return mi+' '+h+' * * '+w;
+ }
+ return mi+' '+h+' * * *'; // daily
+}
+// cron(5段) → 中文描述（任务列表显示）
+function cronToText(cron){
+ const r=parseCronToFreq(cron||'');
+ if(r.freq==='hourly')return '每小时';
+ if(r.freq==='everyN')return '每'+r.interval+'小时';
+ if(r.freq==='daily')return '每天 '+r.time;
+ if(r.freq==='weekly')return WEEKDAY_NAMES[r.weekday]+' '+r.time;
+ return 'cron: '+(cron||'-');
+}
function toggleScheduleFields(){
const mode=document.getElementById('f-schedule_mode').value;
- document.getElementById('f-cron_wrap').style.display=(mode==='cron'||mode==='cron_stop')?'block':'none';
- document.getElementById('f-stop_cron_wrap').style.display=mode==='cron_stop'?'block':'none';
+ const showSched=(mode==='cron'||mode==='cron_stop');
+ document.getElementById('f-freq_wrap').style.display=showSched?'block':'none';
+ document.getElementById('f-stop_wrap').style.display=mode==='cron_stop'?'block':'none';
+ if(showSched)showFreqFields();
+}
+function toggleWindowFields(){
+ const on=document.getElementById('f-window_enable').checked;
+ document.getElementById('f-window_wrap').style.display=on?'flex':'none';
+ document.getElementById('f-window_help').style.display=on?'block':'none';
+}
+function showFreqFields(){
+ const freq=document.getElementById('f-schedule_freq').value;
+ document.getElementById('f-time_wrap').style.display=(freq==='daily'||freq==='weekly')?'block':'none';
+ document.getElementById('f-interval_wrap').style.display=freq==='everyN'?'block':'none';
+ document.getElementById('f-weekday_wrap').style.display=freq==='weekly'?'block':'none';
+ document.getElementById('f-cron_wrap').style.display=freq==='custom'?'block':'none';
}
function onTaskTypeChange(){
@@ -1726,11 +1828,19 @@ async function saveTask(jobId){
const schedMode=document.getElementById('f-schedule_mode').value;
let schedule={mode:'once'};
if(schedMode==='cron'){
- schedule={mode:'cron',cron:document.getElementById('f-schedule_cron').value.trim()};
+ schedule={mode:'cron',cron:buildCronFromFreq()};
}else if(schedMode==='cron_stop'){
+ const st=(document.getElementById('f-schedule_stop_time').value||'18:00').split(':');
schedule={mode:'cron_stop',
- cron:document.getElementById('f-schedule_cron').value.trim(),
- stop_cron:document.getElementById('f-schedule_stop_cron').value.trim()};
+ cron:buildCronFromFreq(),
+ stop_cron:(parseInt(st[1])||0)+' '+(parseInt(st[0])||0)+' * * *'};
+ }
+ // 运行窗口：窗口外（定时触发 + 手动执行）不启动
+ if(document.getElementById('f-window_enable').checked){
+ schedule.window={
+ start:document.getElementById('f-window_start').value||'09:00',
+ end:document.getElementById('f-window_end').value||'18:00',
+ };
}
const data={
diff --git a/templates/admin/monitor.html b/templates/admin/monitor.html
index 2231671..c22121e 100644
--- a/templates/admin/monitor.html
+++ b/templates/admin/monitor.html
@@ -337,13 +337,13 @@ select.form-control{cursor:pointer}
任务计划管理
新建、编辑、删除任务计划，支持立即执行和定时调度
-
+
- | ID | 任务名 | 类型 | 启用 | 目标 | 调度 | 重试 | 操作 |
+ ID | 任务名 | 类型 | 启用 | 目标 | 调度 | 下次运行 | 重试 | 操作 |
diff --git a/web_server.py b/web_server.py
index e709f02..077b03a 100644
--- a/web_server.py
+++ b/web_server.py
@@ -247,15 +247,26 @@ def api_devices():
# ================== API：任务计划 CRUD ==================
+def _job_next_run(job):
+ """任务下次执行时间，格式化为 "YYYY-MM-DD HH:MM"（Flask 序列化 aware datetime 会变 GMT 格式）。"""
+ nr = mgr.next_run_of(job)
+ return nr.strftime("%Y-%m-%d %H:%M") if nr else None
+
+
@app.route("/api/jobs")
@login_required
def api_jobs_list():
- return jsonify({"ok": True, "jobs": [j.to_dict() for j in mgr.jobs.values()],
+ jobs = []
+ for j in mgr.jobs.values():
+ d = j.to_dict()
+ d["next_run"] = _job_next_run(j)
+ jobs.append(d)
+ return jsonify({"ok": True, "jobs": jobs,
"task_types": list_task_types()})
@app.route("/api/jobs", methods=["POST"])
-@login_required
+@perm_required(PERM_TASKS)
def api_jobs_create():
data = request.json or {}
name = (data.get("name") or "").strip()
@@ -271,11 +282,13 @@ def api_jobs_create():
schedule=data.get("schedule", {"mode": "once"}),
retry=data.get("retry", {"max_attempts": 1, "delay": 60}),
enabled=data.get("enabled", True))
- return jsonify({"ok": True, "msg": "任务已创建", "job": job.to_dict()})
+ d = job.to_dict()
+ d["next_run"] = _job_next_run(job)
+ return jsonify({"ok": True, "msg": "任务已创建", "job": d})
@app.route("/api/jobs/
", methods=["PUT"])
-@login_required
+@perm_required(PERM_TASKS)
def api_jobs_update(job_id):
job = mgr.jobs.get(job_id)
if not job:
@@ -288,11 +301,13 @@ def api_jobs_update(job_id):
if "task_type" in fields and not get_task_class(fields["task_type"]):
return jsonify({"ok": False, "error": f"未知任务类型: {fields['task_type']}"}), 400
mgr.update_job(job_id, **fields)
- return jsonify({"ok": True, "msg": "任务已更新", "job": job.to_dict()})
+ d = job.to_dict()
+ d["next_run"] = _job_next_run(job)
+ return jsonify({"ok": True, "msg": "任务已更新", "job": d})
@app.route("/api/jobs/", methods=["DELETE"])
-@login_required
+@perm_required(PERM_TASKS)
def api_jobs_delete(job_id):
if mgr.delete_job(job_id):
return jsonify({"ok": True, "msg": "任务已删除"})