分页优化
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
"""排查:期望项 .expect-item 的 class 结构(含选中态标记)"""
|
||||
import json
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
from client.browser.cdp_lite import LiteCDP, CDPSession
|
||||
from client.browser.manager import BrowserManager
|
||||
|
||||
OUT = Path(__file__).resolve().parent / "data" / "debug" / "期望项结构.txt"
|
||||
|
||||
_JS = """JSON.stringify([...document.querySelectorAll('.expect-item')].map(e => ({
|
||||
cls: String(e.className),
|
||||
text: (e.innerText || '').trim().slice(0, 50),
|
||||
html: e.outerHTML.replace(/\\s+/g, ' ').slice(0, 300),
|
||||
})))"""
|
||||
|
||||
|
||||
def main():
|
||||
BrowserManager().ensure_browser_started()
|
||||
lite = LiteCDP()
|
||||
tab = lite.open_tab("https://www.zhipin.com/web/geek/jobs")
|
||||
time.sleep(8)
|
||||
s = CDPSession(tab["webSocketDebuggerUrl"])
|
||||
raw = s.eval_js(_JS)
|
||||
items = json.loads(raw or "[]")
|
||||
lines = [json.dumps(it, ensure_ascii=False) for it in items]
|
||||
OUT.write_text("\n".join(lines) or "(未找到 .expect-item)", encoding="utf-8")
|
||||
s.close()
|
||||
lite.close_tab(tab["id"])
|
||||
print("完成 ->", OUT)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,28 @@
|
||||
"""验证:_select_expect_js 新版返回结构(坐标/落点元素/全量项/视口)"""
|
||||
import json
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
from client.browser.applicant import _select_expect_js
|
||||
from client.browser.cdp_lite import LiteCDP, CDPSession
|
||||
from client.browser.manager import BrowserManager
|
||||
|
||||
OUT = Path(__file__).resolve().parent / "data" / "debug" / "期望定位验证.txt"
|
||||
|
||||
|
||||
def main():
|
||||
BrowserManager().ensure_browser_started()
|
||||
lite = LiteCDP()
|
||||
tab = lite.open_tab("https://www.zhipin.com/web/geek/jobs")
|
||||
time.sleep(8)
|
||||
s = CDPSession(tab["webSocketDebuggerUrl"])
|
||||
raw = s.eval_js(_select_expect_js("Java", "天津"))
|
||||
OUT.write_text(json.dumps(json.loads(raw or "{}"),
|
||||
ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
s.close()
|
||||
lite.close_tab(tab["id"])
|
||||
print("完成 ->", OUT)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+31
-5
@@ -247,11 +247,21 @@ class ServerAPI:
|
||||
return resp.json().get("applied", False)
|
||||
|
||||
def list_blacklist(self) -> list[str]:
|
||||
"""公司黑名单名单(公司名列表,拉黑后不再投递该公司)"""
|
||||
resp = self._req("get", f"{self.base_url}/api/blacklist",
|
||||
headers=self._headers(), timeout=15)
|
||||
resp.raise_for_status()
|
||||
return [i["company"] for i in resp.json()]
|
||||
"""公司黑名单名单(公司名列表,拉黑后不再投递该公司)。
|
||||
接口分页返回,这里翻页拉全(黑名单用于投递前过滤,必须拿到全量)"""
|
||||
companies: list[str] = []
|
||||
page = 1
|
||||
while True:
|
||||
resp = self._req("get", f"{self.base_url}/api/blacklist",
|
||||
params={"page": page, "page_size": 100},
|
||||
headers=self._headers(), timeout=15)
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
companies.extend(i["company"] for i in data.get("items", []))
|
||||
if page >= data.get("pages", 1) or page >= 10:
|
||||
break
|
||||
page += 1
|
||||
return companies
|
||||
|
||||
def get_stats(self) -> dict:
|
||||
resp = self._req("get", f"{self.base_url}/api/jobs/stats", headers=self._headers(), timeout=15)
|
||||
@@ -275,6 +285,22 @@ class ServerAPI:
|
||||
resp.raise_for_status()
|
||||
return resp.json()
|
||||
|
||||
def get_history_page(self, page: int = 1, page_size: int = 20,
|
||||
apply_type: str | None = None,
|
||||
start: str | None = None, end: str | None = None) -> dict:
|
||||
"""投递记录分页筛选(北京时间范围 + 投递结果,时间倒序)"""
|
||||
params: dict = {"page": page, "page_size": page_size}
|
||||
if apply_type:
|
||||
params["apply_type"] = apply_type
|
||||
if start:
|
||||
params["start"] = start
|
||||
if end:
|
||||
params["end"] = end
|
||||
resp = self._req("get", f"{self.base_url}/api/jobs/page",
|
||||
params=params, headers=self._headers(), timeout=15)
|
||||
resp.raise_for_status()
|
||||
return resp.json()
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# 连通性
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
@@ -428,6 +428,19 @@ def history(limit: int = 50, apply_type: str | None = None):
|
||||
return state.server_api.get_history(limit=limit, apply_type=apply_type)
|
||||
|
||||
|
||||
@app.get("/api/history-page")
|
||||
def history_page(page: int = 1, page_size: int = 20,
|
||||
apply_type: str | None = None,
|
||||
start: str | None = None, end: str | None = None):
|
||||
"""投递记录分页筛选(时间范围 + 投递结果,时间倒序)"""
|
||||
if not state.connected:
|
||||
return {"items": [], "total": 0, "applied": 0, "skipped": 0,
|
||||
"page": page, "page_size": page_size, "pages": 0}
|
||||
return state.server_api.get_history_page(
|
||||
page=page, page_size=page_size, apply_type=apply_type,
|
||||
start=start, end=end)
|
||||
|
||||
|
||||
@app.get("/api/stats")
|
||||
def stats():
|
||||
if not state.connected:
|
||||
|
||||
+66
-11
@@ -425,21 +425,42 @@ function startApplyPoll() {
|
||||
}
|
||||
|
||||
// ==========================================================
|
||||
// Step 5: 历史与统计
|
||||
// Step 5: 历史与统计(筛选 + 分页)
|
||||
// ==========================================================
|
||||
const histState = { range: 'today', start: '', end: '', type: '', page: 1, pageSize: 20 };
|
||||
|
||||
function fmtDate(d) {
|
||||
return d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0')
|
||||
+ '-' + String(d.getDate()).padStart(2, '0');
|
||||
}
|
||||
function histRangeDates() {
|
||||
const now = new Date(), today = fmtDate(now);
|
||||
if (histState.range === 'today') return [today, today];
|
||||
if (histState.range === 'week') {
|
||||
const d = new Date(now); d.setDate(d.getDate() - ((d.getDay() + 6) % 7)); // 周一
|
||||
return [fmtDate(d), today];
|
||||
}
|
||||
if (histState.range === 'month') {
|
||||
return [fmtDate(new Date(now.getFullYear(), now.getMonth(), 1)), today];
|
||||
}
|
||||
return [histState.start, histState.end]; // 自定义
|
||||
}
|
||||
|
||||
async function loadHistory() {
|
||||
try {
|
||||
const [stats, history] = await Promise.all([
|
||||
api('/api/stats'),
|
||||
api('/api/history?limit=50'),
|
||||
]);
|
||||
const [start, end] = histRangeDates();
|
||||
if (histState.range === 'custom' && (!start || !end)) return;
|
||||
const params = new URLSearchParams({ page: histState.page, page_size: histState.pageSize });
|
||||
if (start) params.set('start', start);
|
||||
if (end) params.set('end', end);
|
||||
if (histState.type) params.set('apply_type', histState.type);
|
||||
const d = await api('/api/history-page?' + params);
|
||||
$('statsGrid').innerHTML = `
|
||||
<div class="stat-card"><div class="num">${stats.total_applied || 0}</div><div class="label">累计投递</div></div>
|
||||
<div class="stat-card"><div class="num">${stats.total_chat || 0}</div><div class="label">立即沟通</div></div>
|
||||
<div class="stat-card"><div class="num">${stats.total_deliver || 0}</div><div class="label">投递简历</div></div>
|
||||
<div class="stat-card"><div class="num">${stats.today_applied || 0}</div><div class="label">今日投递</div></div>
|
||||
<div class="stat-card"><div class="num">${d.applied || 0}</div><div class="label">已投递(筛选范围)</div></div>
|
||||
<div class="stat-card"><div class="num">${d.skipped || 0}</div><div class="label">已跳过(筛选范围)</div></div>
|
||||
<div class="stat-card"><div class="num">${d.total || 0}</div><div class="label">处理总数(筛选范围)</div></div>
|
||||
`;
|
||||
$('historyBody').innerHTML = history.map(h => `
|
||||
$('historyBody').innerHTML = (d.items || []).map(h => `
|
||||
<tr>
|
||||
<td title="${escapeHtml(recordDetail(h))}">${escapeHtml(h.job_title || '-')}</td>
|
||||
<td>${escapeHtml(h.company || '-')}</td>
|
||||
@@ -448,7 +469,10 @@ async function loadHistory() {
|
||||
<td>${h.ai_score >= 0 ? h.ai_score : '-'}</td>
|
||||
<td>${formatTime(h.applied_at)}</td>
|
||||
</tr>
|
||||
`).join('') || '<tr><td colspan="6" style="text-align:center;color:#999">暂无记录</td></tr>';
|
||||
`).join('') || '<tr><td colspan="6" style="text-align:center;color:#999">该筛选条件下暂无记录</td></tr>';
|
||||
$('histPageInfo').textContent = `共 ${d.total} 条 · 第 ${d.page} / ${Math.max(d.pages, 1)} 页`;
|
||||
$('btnHistPrev').disabled = d.page <= 1;
|
||||
$('btnHistNext').disabled = d.page >= d.pages;
|
||||
} catch (e) { console.error(e); }
|
||||
}
|
||||
|
||||
@@ -478,6 +502,37 @@ function escapeHtml(s) {
|
||||
}[c]));
|
||||
}
|
||||
|
||||
// ---------- 记录筛选/分页事件 ----------
|
||||
document.querySelectorAll('[data-hrange]').forEach(el => el.addEventListener('click', () => {
|
||||
document.querySelectorAll('[data-hrange]').forEach(c => c.classList.toggle('active', c === el));
|
||||
histState.range = el.dataset.hrange;
|
||||
$('histCustomRange').classList.toggle('hidden', histState.range !== 'custom');
|
||||
if (histState.range !== 'custom') { histState.page = 1; loadHistory(); }
|
||||
}));
|
||||
$('btnHistQuery').onclick = () => {
|
||||
histState.start = $('histDateStart').value;
|
||||
histState.end = $('histDateEnd').value;
|
||||
if (!histState.start || !histState.end) { toast('请选择起止日期'); return; }
|
||||
if (histState.start > histState.end) { toast('起始日期不能晚于结束日期'); return; }
|
||||
histState.page = 1; loadHistory();
|
||||
};
|
||||
document.querySelectorAll('[data-htype]').forEach(el => el.addEventListener('click', () => {
|
||||
document.querySelectorAll('[data-htype]').forEach(c => c.classList.toggle('active', c === el));
|
||||
histState.type = el.dataset.htype;
|
||||
histState.page = 1; loadHistory();
|
||||
}));
|
||||
$('histPageSize').onchange = e => {
|
||||
histState.pageSize = parseInt(e.target.value, 10);
|
||||
histState.page = 1; loadHistory();
|
||||
};
|
||||
$('btnHistPrev').onclick = () => { if (histState.page > 1) { histState.page--; loadHistory(); } };
|
||||
$('btnHistNext').onclick = () => { histState.page++; loadHistory(); };
|
||||
|
||||
// ---------- 启动 ----------
|
||||
{ // 自定义日期默认填入今天
|
||||
const today = fmtDate(new Date());
|
||||
$('histDateStart').value = today;
|
||||
$('histDateEnd').value = today;
|
||||
}
|
||||
refreshStatus();
|
||||
setInterval(refreshStatus, 8000);
|
||||
|
||||
@@ -314,6 +314,24 @@ body {
|
||||
.tag.deliver { background: #dbeafe; color: var(--primary); }
|
||||
.tag.skipped { background: #f3f4f6; color: var(--text-light); }
|
||||
|
||||
/* ===== 记录筛选栏与分页 ===== */
|
||||
.filters-bar { display: flex; flex-wrap: wrap; align-items: center; gap: 8px 16px; margin-bottom: 12px; font-size: 13px; }
|
||||
.filters-bar .grp { display: flex; align-items: center; gap: 6px; }
|
||||
.filters-bar .grp > label { color: var(--text-light); }
|
||||
.chip {
|
||||
padding: 4px 12px; border: 1px solid var(--border); border-radius: 14px;
|
||||
cursor: pointer; color: var(--text-light); background: #fff; font-size: 12px;
|
||||
}
|
||||
.chip:hover { border-color: var(--primary); color: var(--primary); }
|
||||
.chip.active { background: var(--primary); border-color: var(--primary); color: #fff; }
|
||||
.filters-bar input[type=date] { padding: 3px 6px; border: 1px solid var(--border); border-radius: 6px; font-size: 12px; }
|
||||
.filters-bar select { padding: 3px 6px; border: 1px solid var(--border); border-radius: 6px; font-size: 12px; }
|
||||
.btn-query { padding: 4px 14px; background: var(--primary); border: none; color: #fff; border-radius: 6px; cursor: pointer; font-size: 12px; }
|
||||
.pager-bar { display: flex; align-items: center; justify-content: flex-end; gap: 10px; margin-top: 12px; font-size: 13px; color: var(--text-light); }
|
||||
.pager-bar button { padding: 4px 12px; border: 1px solid var(--border); background: #fff; border-radius: 6px; cursor: pointer; font-size: 12px; }
|
||||
.pager-bar button:hover:not(:disabled) { border-color: var(--primary); color: var(--primary); }
|
||||
.pager-bar button:disabled { color: #ccc; cursor: not-allowed; }
|
||||
|
||||
/* ===== Toast ===== */
|
||||
.toast {
|
||||
position: fixed;
|
||||
|
||||
@@ -145,6 +145,34 @@
|
||||
<section class="panel hidden" id="panel-5">
|
||||
<h2>投递记录与统计</h2>
|
||||
<p class="hint">将鼠标悬停在职位名上,可查看归档的 JD 摘要与跳过原因。</p>
|
||||
<div class="filters-bar">
|
||||
<div class="grp">
|
||||
<label>时间:</label>
|
||||
<span class="chip active" data-hrange="today">今日</span>
|
||||
<span class="chip" data-hrange="week">本周</span>
|
||||
<span class="chip" data-hrange="month">本月</span>
|
||||
<span class="chip" data-hrange="custom">自定义</span>
|
||||
<span id="histCustomRange" class="hidden">
|
||||
<input type="date" id="histDateStart"> ~ <input type="date" id="histDateEnd">
|
||||
<button class="btn-query" id="btnHistQuery">查询</button>
|
||||
</span>
|
||||
</div>
|
||||
<div class="grp">
|
||||
<label>结果:</label>
|
||||
<span class="chip active" data-htype="">全部</span>
|
||||
<span class="chip" data-htype="chat">已沟通</span>
|
||||
<span class="chip" data-htype="deliver">已投递</span>
|
||||
<span class="chip" data-htype="skipped">已跳过</span>
|
||||
</div>
|
||||
<div class="grp">
|
||||
<label>每页:</label>
|
||||
<select id="histPageSize">
|
||||
<option value="20" selected>20</option>
|
||||
<option value="50">50</option>
|
||||
<option value="100">100</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="stats-grid" id="statsGrid"></div>
|
||||
<table class="history-table">
|
||||
<thead>
|
||||
@@ -154,6 +182,11 @@
|
||||
</thead>
|
||||
<tbody id="historyBody"></tbody>
|
||||
</table>
|
||||
<div class="pager-bar">
|
||||
<span id="histPageInfo"></span>
|
||||
<button id="btnHistPrev">上一页</button>
|
||||
<button id="btnHistNext">下一页</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user