提交品牌删除更新

This commit is contained in:
super
2026-03-26 17:39:20 +08:00
parent d0ca28ae2d
commit 7fcdf1a761
10 changed files with 5964 additions and 1211 deletions

3
.gitignore vendored
View File

@@ -33,3 +33,6 @@ backend-java/*.iml
# desktop app # desktop app
desktop/ desktop/
ERP-Demo/ ERP-Demo/
xlsx/
app/__pycache__
backend/__pycache__

4205
app/user_data/2026_03_26.log Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
{"version": "1.0.3"} {"version": "1.0.13"}

View File

@@ -1,11 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>亚马逊 - 南日AI</title> <title>亚马逊 - 南日AI</title>
<style> <style>
* { margin: 0; padding: 0; box-sizing: border-box; } * {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body { body {
font-family: "Microsoft YaHei", "Noto Serif SC", "SimSun", "Songti SC", "Times New Roman", serif; font-family: "Microsoft YaHei", "Noto Serif SC", "SimSun", "Songti SC", "Times New Roman", serif;
background: rgba(13, 13, 13, 1); background: rgba(13, 13, 13, 1);
@@ -14,6 +20,7 @@
height: 100vh; height: 100vh;
font-weight: bold; font-weight: bold;
} }
.top-bar { .top-bar {
height: 56px; height: 56px;
display: flex; display: flex;
@@ -22,12 +29,19 @@
padding: 0 16px; padding: 0 16px;
border-bottom: 1px solid #2a2a2a; border-bottom: 1px solid #2a2a2a;
} }
.logo-area { .logo-area {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
} }
.top-bar .app-name { font-size: 18px; font-weight: 600; color: #fff; }
.top-bar .app-name {
font-size: 18px;
font-weight: 600;
color: #fff;
}
.btn-home { .btn-home {
font-size: 13px; font-size: 13px;
color: #999; color: #999;
@@ -36,7 +50,11 @@
border-radius: 6px; border-radius: 6px;
transition: all 0.2s; transition: all 0.2s;
} }
.btn-home:hover { color: #fff; background: #2a2a2a; }
.btn-home:hover {
color: #fff;
background: #2a2a2a;
}
/* 顶部栏目导航(容器化,便于后续增加栏目) */ /* 顶部栏目导航(容器化,便于后续增加栏目) */
.nav-tabs { .nav-tabs {
@@ -44,6 +62,7 @@
align-items: center; align-items: center;
gap: 0; gap: 0;
} }
.nav-tab-group { .nav-tab-group {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -51,6 +70,7 @@
background: rgba(77, 72, 72, 0.99); background: rgba(77, 72, 72, 0.99);
border-radius: 10px; border-radius: 10px;
} }
.nav-tab-sep { .nav-tab-sep {
width: 1px; width: 1px;
height: 20px; height: 20px;
@@ -59,6 +79,7 @@
flex-shrink: 0; flex-shrink: 0;
opacity: 0.9; opacity: 0.9;
} }
.nav-tab { .nav-tab {
padding: 8px 14px; padding: 8px 14px;
font-size: 13px; font-size: 13px;
@@ -69,14 +90,17 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.nav-tab:hover { .nav-tab:hover {
color: #fff; color: #fff;
background: #2a2a2a; background: #2a2a2a;
} }
.nav-tab.active { .nav-tab.active {
color: #3498db; color: #3498db;
background: rgba(52, 152, 219, 0.2); background: rgba(52, 152, 219, 0.2);
} }
.top-right { .top-right {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -87,6 +111,7 @@
display: flex; display: flex;
height: calc(100vh - 56px); height: calc(100vh - 56px);
} }
/* 栏目内容容器:每个栏目一个 .tab-panel通过 data-panel 与导航对应 */ /* 栏目内容容器:每个栏目一个 .tab-panel通过 data-panel 与导航对应 */
.tab-panel { .tab-panel {
display: none; display: none;
@@ -94,9 +119,11 @@
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
} }
.tab-panel.active { .tab-panel.active {
display: flex; display: flex;
} }
.left-panel { .left-panel {
width: 380px; width: 380px;
background: #1e1e1e; background: #1e1e1e;
@@ -104,6 +131,7 @@
overflow-y: auto; overflow-y: auto;
border-right: 1px solid #2a2a2a; border-right: 1px solid #2a2a2a;
} }
.right-panel { .right-panel {
flex: 1; flex: 1;
display: flex; display: flex;
@@ -111,11 +139,13 @@
min-width: 0; min-width: 0;
background: #1a1a1a; background: #1a1a1a;
} }
.section-title { .section-title {
font-size: 13px; font-size: 13px;
color: #bbb; color: #bbb;
margin-bottom: 10px; margin-bottom: 10px;
} }
.upload-zone { .upload-zone {
border: 1px dashed #3a3a3a; border: 1px dashed #3a3a3a;
border-radius: 10px; border-radius: 10px;
@@ -125,9 +155,25 @@
margin-bottom: 20px; margin-bottom: 20px;
transition: all 0.2s; transition: all 0.2s;
} }
.upload-zone:hover { border-color: #3498db; background: #2a2a2a; }
.upload-zone .hint { color: #888; font-size: 13px; margin-bottom: 12px; } .upload-zone:hover {
.upload-zone .btns { display: flex; gap: 10px; justify-content: center; flex-wrap: wrap; } border-color: #3498db;
background: #2a2a2a;
}
.upload-zone .hint {
color: #888;
font-size: 13px;
margin-bottom: 12px;
}
.upload-zone .btns {
display: flex;
gap: 10px;
justify-content: center;
flex-wrap: wrap;
}
.opt-btn { .opt-btn {
padding: 8px 16px; padding: 8px 16px;
font-size: 13px; font-size: 13px;
@@ -138,7 +184,14 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.opt-btn:hover { color: #fff; background: #333; border-color: #3498db; color: #3498db; }
.opt-btn:hover {
color: #fff;
background: #333;
border-color: #3498db;
color: #3498db;
}
.selected-files { .selected-files {
margin-top: 12px; margin-top: 12px;
font-size: 12px; font-size: 12px;
@@ -146,8 +199,17 @@
max-height: 72px; max-height: 72px;
overflow-y: auto; overflow-y: auto;
} }
.selected-files span { display: block; margin: 4px 0; word-break: break-all; }
.option-group { margin-bottom: 20px; } .selected-files span {
display: block;
margin: 4px 0;
word-break: break-all;
}
.option-group {
margin-bottom: 20px;
}
.radio-item { .radio-item {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
@@ -159,16 +221,35 @@
border: 1px solid #2a2a2a; border: 1px solid #2a2a2a;
margin-bottom: 8px; margin-bottom: 8px;
} }
.radio-item:hover { background: #2a2a2a; }
.radio-item input { margin-top: 3px; } .radio-item:hover {
.radio-item .label { font-weight: 500; color: #e0e0e0; font-size: 13px; } background: #2a2a2a;
.radio-item .desc { font-size: 12px; color: #888; margin-top: 2px; font-weight: normal; } }
.radio-item input {
margin-top: 3px;
}
.radio-item .label {
font-weight: 500;
color: #e0e0e0;
font-size: 13px;
}
.radio-item .desc {
font-size: 12px;
color: #888;
margin-top: 2px;
font-weight: normal;
}
.run-row { .run-row {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 12px; gap: 12px;
margin-top: 16px; margin-top: 16px;
} }
.btn-run { .btn-run {
padding: 10px 22px; padding: 10px 22px;
background: #3498db; background: #3498db;
@@ -179,9 +260,21 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.btn-run:hover { background: #2980b9; }
.btn-run:disabled { background: #555; cursor: not-allowed; color: #999; } .btn-run:hover {
.loading-msg { color: #3498db; font-size: 13px; } background: #2980b9;
}
.btn-run:disabled {
background: #555;
cursor: not-allowed;
color: #999;
}
.loading-msg {
color: #3498db;
font-size: 13px;
}
.template-download-row { .template-download-row {
margin-top: 16px; margin-top: 16px;
@@ -195,16 +288,22 @@
transition: all 0.25s ease; transition: all 0.25s ease;
cursor: pointer; cursor: pointer;
} }
.template-download-row:hover { .template-download-row:hover {
border-color: #2e7d32; border-color: #2e7d32;
background: linear-gradient(135deg, #2a2a2a 0%, #243324 100%); background: linear-gradient(135deg, #2a2a2a 0%, #243324 100%);
box-shadow: 0 4px 12px rgba(46, 125, 50, 0.15); box-shadow: 0 4px 12px rgba(46, 125, 50, 0.15);
} }
.template-download-row:hover .template-download-text .title { color: #2ecc71; }
.template-download-row:hover .template-download-text .title {
color: #2ecc71;
}
.template-download-row:hover .template-download-icon { .template-download-row:hover .template-download-icon {
transform: scale(1.05); transform: scale(1.05);
box-shadow: 0 6px 16px rgba(46, 125, 50, 0.45), inset 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: 0 6px 16px rgba(46, 125, 50, 0.45), inset 0 1px 0 rgba(255, 255, 255, 0.15);
} }
.template-download-icon { .template-download-icon {
width: 48px; width: 48px;
height: 48px; height: 48px;
@@ -217,12 +316,25 @@
box-shadow: 0 4px 12px rgba(46, 125, 50, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: 0 4px 12px rgba(46, 125, 50, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.1);
transition: transform 0.2s, box-shadow 0.2s; transition: transform 0.2s, box-shadow 0.2s;
} }
.template-download-icon svg { .template-download-icon svg {
width: 28px; width: 28px;
height: 28px; height: 28px;
} }
.template-download-text .title { font-size: 14px; color: #e0e0e0; font-weight: 600; display: block; }
.template-download-text .hint { font-size: 12px; color: #888; margin-top: 2px; font-weight: normal; } .template-download-text .title {
font-size: 14px;
color: #e0e0e0;
font-weight: 600;
display: block;
}
.template-download-text .hint {
font-size: 12px;
color: #888;
margin-top: 2px;
font-weight: normal;
}
.panel-header { .panel-header {
padding: 16px 20px; padding: 16px 20px;
@@ -235,9 +347,11 @@
justify-content: space-between; justify-content: space-between;
gap: 12px; gap: 12px;
} }
.panel-header-title { .panel-header-title {
flex: 1; flex: 1;
} }
.btn-refresh-tasks { .btn-refresh-tasks {
padding: 6px 14px; padding: 6px 14px;
font-size: 12px; font-size: 12px;
@@ -249,17 +363,23 @@
transition: all 0.2s; transition: all 0.2s;
white-space: nowrap; white-space: nowrap;
} }
.btn-refresh-tasks:hover { .btn-refresh-tasks:hover {
background: #333; background: #333;
border-color: #3498db; border-color: #3498db;
color: #3498db; color: #3498db;
} }
.task-list-wrap { .task-list-wrap {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
padding: 16px; padding: 16px;
} }
.task-list { list-style: none; }
.task-list {
list-style: none;
}
.task-item { .task-item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -270,38 +390,155 @@
margin-bottom: 10px; margin-bottom: 10px;
background: #1e1e1e; background: #1e1e1e;
} }
.task-item .left { flex: 1; min-width: 0; }
.task-item .id { font-weight: 600; color: #e0e0e0; font-size: 13px; } .task-item .left {
.task-item .files { font-size: 12px; color: #888; margin-top: 4px; } flex: 1;
.task-item .time { font-size: 12px; color: #666; margin-top: 2px; } min-width: 0;
}
.task-item .id {
font-weight: 600;
color: #e0e0e0;
font-size: 13px;
}
.task-item .files {
font-size: 12px;
color: #888;
margin-top: 4px;
}
.task-item .time {
font-size: 12px;
color: #666;
margin-top: 2px;
}
.task-item .status { .task-item .status {
padding: 4px 10px; padding: 4px 10px;
border-radius: 6px; border-radius: 6px;
font-size: 12px; font-size: 12px;
margin-right: 12px; margin-right: 12px;
} }
.task-item .status.pending { background: rgba(255,193,7,0.2); color: #d4a500; }
.task-item .status.running { background: rgba(52,152,219,0.2); color: #3498db; } .task-item .status.pending {
.task-item .status.success { background: rgba(46,204,113,0.2); color: #2ecc71; } background: rgba(255, 193, 7, 0.2);
.task-item .status.failed { background: rgba(231,76,60,0.2); color: #e74c3c; } color: #d4a500;
.task-item .status.cancelled { background: rgba(149,165,166,0.2); color: #95a5a6; } }
.task-item .progress-wrap { margin-top: 8px; margin-right: 8px; flex-shrink: 0; width: 120px; }
.task-item .progress-bar-bg { height: 6px; background: #2a2a2a; border-radius: 3px; overflow: hidden; } .task-item .status.running {
.task-item .progress-bar-fill { height: 100%; background: #3498db; border-radius: 3px; transition: width 0.2s; } background: rgba(52, 152, 219, 0.2);
.task-item .btn-cancel, .task-item .btn-delete { color: #3498db;
padding: 6px 12px; font-size: 12px; border-radius: 6px; cursor: pointer; border: none; margin-left: 6px; }
.task-item .status.success {
background: rgba(46, 204, 113, 0.2);
color: #2ecc71;
}
.task-item .status.failed {
background: rgba(231, 76, 60, 0.2);
color: #e74c3c;
}
.task-item .status.cancelled {
background: rgba(149, 165, 166, 0.2);
color: #95a5a6;
}
.task-item .progress-wrap {
margin-top: 8px;
margin-right: 8px;
flex-shrink: 0;
width: 120px;
}
.task-item .progress-bar-bg {
height: 6px;
background: #2a2a2a;
border-radius: 3px;
overflow: hidden;
}
.task-item .progress-bar-fill {
height: 100%;
background: #3498db;
border-radius: 3px;
transition: width 0.2s;
}
.task-item .btn-cancel,
.task-item .btn-delete {
padding: 6px 12px;
font-size: 12px;
border-radius: 6px;
cursor: pointer;
border: none;
margin-left: 6px;
transition: all 0.2s; transition: all 0.2s;
} }
.task-item .btn-cancel { background: #e67e22; color: #fff; }
.task-item .btn-cancel:hover { background: #d35400; } .task-item .btn-cancel {
.task-item .btn-delete { background: #444; color: #ccc; } background: #e67e22;
.task-item .btn-delete:hover { background: #e74c3c; color: #fff; } color: #fff;
.task-item .task-right { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; } }
.run-row .progress-wrap { margin-top: 10px; width: 100%; max-width: 280px; }
.run-row .progress-bar-bg { height: 8px; background: #2a2a2a; border-radius: 4px; overflow: hidden; } .task-item .btn-cancel:hover {
.run-row .progress-bar-fill { height: 100%; background: #3498db; border-radius: 4px; transition: width 0.2s; } background: #d35400;
.run-row .btn-cancel-run { margin-left: 12px; padding: 8px 16px; background: #e67e22; color: #fff; border: none; border-radius: 6px; font-size: 13px; cursor: pointer; } }
.run-row .btn-cancel-run:hover { background: #d35400; }
.task-item .btn-delete {
background: #444;
color: #ccc;
}
.task-item .btn-delete:hover {
background: #e74c3c;
color: #fff;
}
.task-item .task-right {
display: flex;
align-items: center;
gap: 8px;
flex-wrap: wrap;
}
.run-row .progress-wrap {
margin-top: 10px;
width: 100%;
max-width: 280px;
}
.run-row .progress-bar-bg {
height: 8px;
background: #2a2a2a;
border-radius: 4px;
overflow: hidden;
}
.run-row .progress-bar-fill {
height: 100%;
background: #3498db;
border-radius: 4px;
transition: width 0.2s;
}
.run-row .btn-cancel-run {
margin-left: 12px;
padding: 8px 16px;
background: #e67e22;
color: #fff;
border: none;
border-radius: 6px;
font-size: 13px;
cursor: pointer;
}
.run-row .btn-cancel-run:hover {
background: #d35400;
}
.task-item .download { .task-item .download {
padding: 6px 14px; padding: 6px 14px;
background: #3498db; background: #3498db;
@@ -314,9 +551,23 @@
white-space: nowrap; white-space: nowrap;
transition: all 0.2s; transition: all 0.2s;
} }
.task-item .download:hover { background: #2980b9; color: #fff; }
.task-item .download.hide { display: none; } .task-item .download:hover {
.empty-tasks { text-align: center; color: #666; padding: 32px; font-size: 13px; } background: #2980b9;
color: #fff;
}
.task-item .download.hide {
display: none;
}
.empty-tasks {
text-align: center;
color: #666;
padding: 32px;
font-size: 13px;
}
.toast { .toast {
position: fixed; position: fixed;
bottom: 32px; bottom: 32px;
@@ -332,9 +583,13 @@
transition: opacity 0.3s; transition: opacity 0.3s;
border: 1px solid #333; border: 1px solid #333;
} }
.toast.show { opacity: 1; }
.toast.show {
opacity: 1;
}
</style> </style>
</head> </head>
<body> <body>
<header class="top-bar"> <header class="top-bar">
<div class="logo-area"> <div class="logo-area">
@@ -344,7 +599,12 @@
<nav class="nav-tabs"> <nav class="nav-tabs">
<span class="nav-tab-group"> <span class="nav-tab-group">
<button type="button" class="nav-tab active" data-panel="brandCheck">品牌检测</button> <button type="button" class="nav-tab active" data-panel="brandCheck">品牌检测</button>
<!-- 后续增加栏目时在此添加,例如:<button type="button" class="nav-tab" data-panel="other">其他栏目</button> --> <button type="button" class="nav-tab"
onclick="window.location='/new_web_source/dedupe.html'">总数据去重</button>
<button type="button" class="nav-tab"
onclick="window.location='/new_web_source/convert.html'">格式转换</button>
<button type="button" class="nav-tab"
onclick="window.location='/new_web_source/split.html'">表格拆分</button>
</span> </span>
<!-- 多组栏目时可用分隔符:<span class="nav-tab-sep" aria-hidden="true"></span> --> <!-- 多组栏目时可用分隔符:<span class="nav-tab-sep" aria-hidden="true"></span> -->
</nav> </nav>
@@ -404,23 +664,33 @@
<button type="button" class="btn-run" id="btnRun">立即运行</button> <button type="button" class="btn-run" id="btnRun">立即运行</button>
<span class="loading-msg" id="loadingMsg" style="display:none;">生成中,请稍候…</span> <span class="loading-msg" id="loadingMsg" style="display:none;">生成中,请稍候…</span>
<div class="progress-wrap" id="runProgressWrap" style="display:none;"> <div class="progress-wrap" id="runProgressWrap" style="display:none;">
<div class="progress-bar-bg"><div class="progress-bar-fill" id="runProgressFill" style="width:0%;"></div></div> <div class="progress-bar-bg">
<div class="progress-bar-fill" id="runProgressFill" style="width:0%;"></div>
</div>
<span class="hint" style="font-size:12px;color:#888;" id="runProgressText">0 / 0</span> <span class="hint" style="font-size:12px;color:#888;" id="runProgressText">0 / 0</span>
</div> </div>
<!-- 当前文件行级进度(不经数据库中转,只读内存接口) --> <!-- 当前文件行级进度(不经数据库中转,只读内存接口) -->
<div class="progress-wrap" id="runLineProgressWrap" style="display:none;"> <div class="progress-wrap" id="runLineProgressWrap" style="display:none;">
<div class="progress-bar-bg"><div class="progress-bar-fill" id="runLineProgressFill" style="width:0%;"></div></div> <div class="progress-bar-bg">
<div class="progress-bar-fill" id="runLineProgressFill" style="width:0%;"></div>
</div>
<span class="hint" style="font-size:12px;color:#888;" id="runLineProgressText">0 / 0</span> <span class="hint" style="font-size:12px;color:#888;" id="runLineProgressText">0 / 0</span>
</div> </div>
<button type="button" class="btn-cancel-run" id="btnCancelRun" style="display:none;">取消生成</button> <button type="button" class="btn-cancel-run" id="btnCancelRun"
style="display:none;">取消生成</button>
</div> </div>
</div> </div>
<div class="template-download-row" id="templateDownloadRow" role="button" tabindex="0" title="下载品牌文档格式模板(选择保存位置)"> <div class="template-download-row" id="templateDownloadRow" role="button" tabindex="0"
title="下载品牌文档格式模板(选择保存位置)">
<span class="template-download-icon" aria-hidden="true"> <span class="template-download-icon" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z"
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
<path d="M8 13h8M8 17h5" stroke="rgba(255,255,255,0.85)" stroke-width="1.5" stroke-linecap="round"/> stroke-linejoin="round" />
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M8 13h8M8 17h5" stroke="rgba(255,255,255,0.85)" stroke-width="1.5"
stroke-linecap="round" />
</svg> </svg>
</span> </span>
<span class="template-download-text"> <span class="template-download-text">
@@ -428,12 +698,17 @@
<span class="hint">品牌文档格式_模板.xlsx · 点击选择保存位置</span> <span class="hint">品牌文档格式_模板.xlsx · 点击选择保存位置</span>
</span> </span>
</div> </div>
<div class="template-download-row" id="templateDownloadRow2" role="button" tabindex="0" title="下载模板2以文件夹方式上传"> <div class="template-download-row" id="templateDownloadRow2" role="button" tabindex="0"
title="下载模板2以文件夹方式上传">
<span class="template-download-icon" aria-hidden="true"> <span class="template-download-icon" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z"
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
<path d="M3 7v10h4v-4h2v4h8v-4h2v4h2V7H3z" stroke="rgba(255,255,255,0.85)" stroke-width="1.5" stroke-linecap="round"/> stroke-linejoin="round" />
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 7v10h4v-4h2v4h8v-4h2v4h2V7H3z" stroke="rgba(255,255,255,0.85)"
stroke-width="1.5" stroke-linecap="round" />
</svg> </svg>
</span> </span>
<span class="template-download-text"> <span class="template-download-text">
@@ -915,4 +1190,5 @@
})(); })();
</script> </script>
</body> </body>
</html> </html>

View File

@@ -1,11 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>亚马逊 - 南日AI</title> <title>亚马逊 - 南日AI</title>
<style> <style>
* { margin: 0; padding: 0; box-sizing: border-box; } * {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body { body {
font-family: "Microsoft YaHei", "Noto Serif SC", "SimSun", "Songti SC", "Times New Roman", serif; font-family: "Microsoft YaHei", "Noto Serif SC", "SimSun", "Songti SC", "Times New Roman", serif;
background: rgba(13, 13, 13, 1); background: rgba(13, 13, 13, 1);
@@ -14,6 +20,7 @@
height: 100vh; height: 100vh;
font-weight: bold; font-weight: bold;
} }
.top-bar { .top-bar {
height: 56px; height: 56px;
display: flex; display: flex;
@@ -22,12 +29,19 @@
padding: 0 16px; padding: 0 16px;
border-bottom: 1px solid #2a2a2a; border-bottom: 1px solid #2a2a2a;
} }
.logo-area { .logo-area {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
} }
.top-bar .app-name { font-size: 18px; font-weight: 600; color: #fff; }
.top-bar .app-name {
font-size: 18px;
font-weight: 600;
color: #fff;
}
.btn-home { .btn-home {
font-size: 13px; font-size: 13px;
color: #999; color: #999;
@@ -36,7 +50,11 @@
border-radius: 6px; border-radius: 6px;
transition: all 0.2s; transition: all 0.2s;
} }
.btn-home:hover { color: #fff; background: #2a2a2a; }
.btn-home:hover {
color: #fff;
background: #2a2a2a;
}
/* 顶部栏目导航(容器化,便于后续增加栏目) */ /* 顶部栏目导航(容器化,便于后续增加栏目) */
.nav-tabs { .nav-tabs {
@@ -44,6 +62,7 @@
align-items: center; align-items: center;
gap: 0; gap: 0;
} }
.nav-tab-group { .nav-tab-group {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -51,6 +70,7 @@
background: rgba(77, 72, 72, 0.99); background: rgba(77, 72, 72, 0.99);
border-radius: 10px; border-radius: 10px;
} }
.nav-tab-sep { .nav-tab-sep {
width: 1px; width: 1px;
height: 20px; height: 20px;
@@ -59,6 +79,7 @@
flex-shrink: 0; flex-shrink: 0;
opacity: 0.9; opacity: 0.9;
} }
.nav-tab { .nav-tab {
padding: 8px 14px; padding: 8px 14px;
font-size: 13px; font-size: 13px;
@@ -69,14 +90,17 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.nav-tab:hover { .nav-tab:hover {
color: #fff; color: #fff;
background: #2a2a2a; background: #2a2a2a;
} }
.nav-tab.active { .nav-tab.active {
color: #3498db; color: #3498db;
background: rgba(52, 152, 219, 0.2); background: rgba(52, 152, 219, 0.2);
} }
.top-right { .top-right {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -87,6 +111,7 @@
display: flex; display: flex;
height: calc(100vh - 56px); height: calc(100vh - 56px);
} }
/* 栏目内容容器:每个栏目一个 .tab-panel通过 data-panel 与导航对应 */ /* 栏目内容容器:每个栏目一个 .tab-panel通过 data-panel 与导航对应 */
.tab-panel { .tab-panel {
display: none; display: none;
@@ -94,9 +119,11 @@
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
} }
.tab-panel.active { .tab-panel.active {
display: flex; display: flex;
} }
.left-panel { .left-panel {
width: 380px; width: 380px;
background: #1e1e1e; background: #1e1e1e;
@@ -104,6 +131,7 @@
overflow-y: auto; overflow-y: auto;
border-right: 1px solid #2a2a2a; border-right: 1px solid #2a2a2a;
} }
.right-panel { .right-panel {
flex: 1; flex: 1;
display: flex; display: flex;
@@ -111,11 +139,13 @@
min-width: 0; min-width: 0;
background: #1a1a1a; background: #1a1a1a;
} }
.section-title { .section-title {
font-size: 13px; font-size: 13px;
color: #bbb; color: #bbb;
margin-bottom: 10px; margin-bottom: 10px;
} }
.upload-zone { .upload-zone {
border: 1px dashed #3a3a3a; border: 1px dashed #3a3a3a;
border-radius: 10px; border-radius: 10px;
@@ -125,9 +155,25 @@
margin-bottom: 20px; margin-bottom: 20px;
transition: all 0.2s; transition: all 0.2s;
} }
.upload-zone:hover { border-color: #3498db; background: #2a2a2a; }
.upload-zone .hint { color: #888; font-size: 13px; margin-bottom: 12px; } .upload-zone:hover {
.upload-zone .btns { display: flex; gap: 10px; justify-content: center; flex-wrap: wrap; } border-color: #3498db;
background: #2a2a2a;
}
.upload-zone .hint {
color: #888;
font-size: 13px;
margin-bottom: 12px;
}
.upload-zone .btns {
display: flex;
gap: 10px;
justify-content: center;
flex-wrap: wrap;
}
.opt-btn { .opt-btn {
padding: 8px 16px; padding: 8px 16px;
font-size: 13px; font-size: 13px;
@@ -138,7 +184,14 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.opt-btn:hover { color: #fff; background: #333; border-color: #3498db; color: #3498db; }
.opt-btn:hover {
color: #fff;
background: #333;
border-color: #3498db;
color: #3498db;
}
.selected-files { .selected-files {
margin-top: 12px; margin-top: 12px;
font-size: 12px; font-size: 12px;
@@ -146,8 +199,17 @@
max-height: 72px; max-height: 72px;
overflow-y: auto; overflow-y: auto;
} }
.selected-files span { display: block; margin: 4px 0; word-break: break-all; }
.option-group { margin-bottom: 20px; } .selected-files span {
display: block;
margin: 4px 0;
word-break: break-all;
}
.option-group {
margin-bottom: 20px;
}
.radio-item { .radio-item {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
@@ -159,16 +221,35 @@
border: 1px solid #2a2a2a; border: 1px solid #2a2a2a;
margin-bottom: 8px; margin-bottom: 8px;
} }
.radio-item:hover { background: #2a2a2a; }
.radio-item input { margin-top: 3px; } .radio-item:hover {
.radio-item .label { font-weight: 500; color: #e0e0e0; font-size: 13px; } background: #2a2a2a;
.radio-item .desc { font-size: 12px; color: #888; margin-top: 2px; font-weight: normal; } }
.radio-item input {
margin-top: 3px;
}
.radio-item .label {
font-weight: 500;
color: #e0e0e0;
font-size: 13px;
}
.radio-item .desc {
font-size: 12px;
color: #888;
margin-top: 2px;
font-weight: normal;
}
.run-row { .run-row {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 12px; gap: 12px;
margin-top: 16px; margin-top: 16px;
} }
.btn-run { .btn-run {
padding: 10px 22px; padding: 10px 22px;
background: #3498db; background: #3498db;
@@ -179,9 +260,21 @@
cursor: pointer; cursor: pointer;
transition: all 0.2s; transition: all 0.2s;
} }
.btn-run:hover { background: #2980b9; }
.btn-run:disabled { background: #555; cursor: not-allowed; color: #999; } .btn-run:hover {
.loading-msg { color: #3498db; font-size: 13px; } background: #2980b9;
}
.btn-run:disabled {
background: #555;
cursor: not-allowed;
color: #999;
}
.loading-msg {
color: #3498db;
font-size: 13px;
}
.template-download-row { .template-download-row {
margin-top: 16px; margin-top: 16px;
@@ -195,16 +288,22 @@
transition: all 0.25s ease; transition: all 0.25s ease;
cursor: pointer; cursor: pointer;
} }
.template-download-row:hover { .template-download-row:hover {
border-color: #2e7d32; border-color: #2e7d32;
background: linear-gradient(135deg, #2a2a2a 0%, #243324 100%); background: linear-gradient(135deg, #2a2a2a 0%, #243324 100%);
box-shadow: 0 4px 12px rgba(46, 125, 50, 0.15); box-shadow: 0 4px 12px rgba(46, 125, 50, 0.15);
} }
.template-download-row:hover .template-download-text .title { color: #2ecc71; }
.template-download-row:hover .template-download-text .title {
color: #2ecc71;
}
.template-download-row:hover .template-download-icon { .template-download-row:hover .template-download-icon {
transform: scale(1.05); transform: scale(1.05);
box-shadow: 0 6px 16px rgba(46, 125, 50, 0.45), inset 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: 0 6px 16px rgba(46, 125, 50, 0.45), inset 0 1px 0 rgba(255, 255, 255, 0.15);
} }
.template-download-icon { .template-download-icon {
width: 48px; width: 48px;
height: 48px; height: 48px;
@@ -217,12 +316,25 @@
box-shadow: 0 4px 12px rgba(46, 125, 50, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: 0 4px 12px rgba(46, 125, 50, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.1);
transition: transform 0.2s, box-shadow 0.2s; transition: transform 0.2s, box-shadow 0.2s;
} }
.template-download-icon svg { .template-download-icon svg {
width: 28px; width: 28px;
height: 28px; height: 28px;
} }
.template-download-text .title { font-size: 14px; color: #e0e0e0; font-weight: 600; display: block; }
.template-download-text .hint { font-size: 12px; color: #888; margin-top: 2px; font-weight: normal; } .template-download-text .title {
font-size: 14px;
color: #e0e0e0;
font-weight: 600;
display: block;
}
.template-download-text .hint {
font-size: 12px;
color: #888;
margin-top: 2px;
font-weight: normal;
}
.panel-header { .panel-header {
padding: 16px 20px; padding: 16px 20px;
@@ -235,9 +347,11 @@
justify-content: space-between; justify-content: space-between;
gap: 12px; gap: 12px;
} }
.panel-header-title { .panel-header-title {
flex: 1; flex: 1;
} }
.btn-refresh-tasks { .btn-refresh-tasks {
padding: 6px 14px; padding: 6px 14px;
font-size: 12px; font-size: 12px;
@@ -249,17 +363,23 @@
transition: all 0.2s; transition: all 0.2s;
white-space: nowrap; white-space: nowrap;
} }
.btn-refresh-tasks:hover { .btn-refresh-tasks:hover {
background: #333; background: #333;
border-color: #3498db; border-color: #3498db;
color: #3498db; color: #3498db;
} }
.task-list-wrap { .task-list-wrap {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
padding: 16px; padding: 16px;
} }
.task-list { list-style: none; }
.task-list {
list-style: none;
}
.task-item { .task-item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -270,38 +390,155 @@
margin-bottom: 10px; margin-bottom: 10px;
background: #1e1e1e; background: #1e1e1e;
} }
.task-item .left { flex: 1; min-width: 0; }
.task-item .id { font-weight: 600; color: #e0e0e0; font-size: 13px; } .task-item .left {
.task-item .files { font-size: 12px; color: #888; margin-top: 4px; } flex: 1;
.task-item .time { font-size: 12px; color: #666; margin-top: 2px; } min-width: 0;
}
.task-item .id {
font-weight: 600;
color: #e0e0e0;
font-size: 13px;
}
.task-item .files {
font-size: 12px;
color: #888;
margin-top: 4px;
}
.task-item .time {
font-size: 12px;
color: #666;
margin-top: 2px;
}
.task-item .status { .task-item .status {
padding: 4px 10px; padding: 4px 10px;
border-radius: 6px; border-radius: 6px;
font-size: 12px; font-size: 12px;
margin-right: 12px; margin-right: 12px;
} }
.task-item .status.pending { background: rgba(255,193,7,0.2); color: #d4a500; }
.task-item .status.running { background: rgba(52,152,219,0.2); color: #3498db; } .task-item .status.pending {
.task-item .status.success { background: rgba(46,204,113,0.2); color: #2ecc71; } background: rgba(255, 193, 7, 0.2);
.task-item .status.failed { background: rgba(231,76,60,0.2); color: #e74c3c; } color: #d4a500;
.task-item .status.cancelled { background: rgba(149,165,166,0.2); color: #95a5a6; } }
.task-item .progress-wrap { margin-top: 8px; margin-right: 8px; flex-shrink: 0; width: 120px; }
.task-item .progress-bar-bg { height: 6px; background: #2a2a2a; border-radius: 3px; overflow: hidden; } .task-item .status.running {
.task-item .progress-bar-fill { height: 100%; background: #3498db; border-radius: 3px; transition: width 0.2s; } background: rgba(52, 152, 219, 0.2);
.task-item .btn-cancel, .task-item .btn-delete { color: #3498db;
padding: 6px 12px; font-size: 12px; border-radius: 6px; cursor: pointer; border: none; margin-left: 6px; }
.task-item .status.success {
background: rgba(46, 204, 113, 0.2);
color: #2ecc71;
}
.task-item .status.failed {
background: rgba(231, 76, 60, 0.2);
color: #e74c3c;
}
.task-item .status.cancelled {
background: rgba(149, 165, 166, 0.2);
color: #95a5a6;
}
.task-item .progress-wrap {
margin-top: 8px;
margin-right: 8px;
flex-shrink: 0;
width: 120px;
}
.task-item .progress-bar-bg {
height: 6px;
background: #2a2a2a;
border-radius: 3px;
overflow: hidden;
}
.task-item .progress-bar-fill {
height: 100%;
background: #3498db;
border-radius: 3px;
transition: width 0.2s;
}
.task-item .btn-cancel,
.task-item .btn-delete {
padding: 6px 12px;
font-size: 12px;
border-radius: 6px;
cursor: pointer;
border: none;
margin-left: 6px;
transition: all 0.2s; transition: all 0.2s;
} }
.task-item .btn-cancel { background: #e67e22; color: #fff; }
.task-item .btn-cancel:hover { background: #d35400; } .task-item .btn-cancel {
.task-item .btn-delete { background: #444; color: #ccc; } background: #e67e22;
.task-item .btn-delete:hover { background: #e74c3c; color: #fff; } color: #fff;
.task-item .task-right { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; } }
.run-row .progress-wrap { margin-top: 10px; width: 100%; max-width: 280px; }
.run-row .progress-bar-bg { height: 8px; background: #2a2a2a; border-radius: 4px; overflow: hidden; } .task-item .btn-cancel:hover {
.run-row .progress-bar-fill { height: 100%; background: #3498db; border-radius: 4px; transition: width 0.2s; } background: #d35400;
.run-row .btn-cancel-run { margin-left: 12px; padding: 8px 16px; background: #e67e22; color: #fff; border: none; border-radius: 6px; font-size: 13px; cursor: pointer; } }
.run-row .btn-cancel-run:hover { background: #d35400; }
.task-item .btn-delete {
background: #444;
color: #ccc;
}
.task-item .btn-delete:hover {
background: #e74c3c;
color: #fff;
}
.task-item .task-right {
display: flex;
align-items: center;
gap: 8px;
flex-wrap: wrap;
}
.run-row .progress-wrap {
margin-top: 10px;
width: 100%;
max-width: 280px;
}
.run-row .progress-bar-bg {
height: 8px;
background: #2a2a2a;
border-radius: 4px;
overflow: hidden;
}
.run-row .progress-bar-fill {
height: 100%;
background: #3498db;
border-radius: 4px;
transition: width 0.2s;
}
.run-row .btn-cancel-run {
margin-left: 12px;
padding: 8px 16px;
background: #e67e22;
color: #fff;
border: none;
border-radius: 6px;
font-size: 13px;
cursor: pointer;
}
.run-row .btn-cancel-run:hover {
background: #d35400;
}
.task-item .download { .task-item .download {
padding: 6px 14px; padding: 6px 14px;
background: #3498db; background: #3498db;
@@ -314,9 +551,23 @@
white-space: nowrap; white-space: nowrap;
transition: all 0.2s; transition: all 0.2s;
} }
.task-item .download:hover { background: #2980b9; color: #fff; }
.task-item .download.hide { display: none; } .task-item .download:hover {
.empty-tasks { text-align: center; color: #666; padding: 32px; font-size: 13px; } background: #2980b9;
color: #fff;
}
.task-item .download.hide {
display: none;
}
.empty-tasks {
text-align: center;
color: #666;
padding: 32px;
font-size: 13px;
}
.toast { .toast {
position: fixed; position: fixed;
bottom: 32px; bottom: 32px;
@@ -332,9 +583,13 @@
transition: opacity 0.3s; transition: opacity 0.3s;
border: 1px solid #333; border: 1px solid #333;
} }
.toast.show { opacity: 1; }
.toast.show {
opacity: 1;
}
</style> </style>
</head> </head>
<body> <body>
<header class="top-bar"> <header class="top-bar">
<div class="logo-area"> <div class="logo-area">
@@ -344,7 +599,12 @@
<nav class="nav-tabs"> <nav class="nav-tabs">
<span class="nav-tab-group"> <span class="nav-tab-group">
<button type="button" class="nav-tab active" data-panel="brandCheck">品牌检测</button> <button type="button" class="nav-tab active" data-panel="brandCheck">品牌检测</button>
<!-- 后续增加栏目时在此添加,例如:<button type="button" class="nav-tab" data-panel="other">其他栏目</button> --> <button type="button" class="nav-tab"
onclick="window.location='/new_web_source/dedupe.html'">总数据去重</button>
<button type="button" class="nav-tab"
onclick="window.location='/new_web_source/convert.html'">格式转换</button>
<button type="button" class="nav-tab"
onclick="window.location='/new_web_source/split.html'">表格拆分</button>
</span> </span>
<!-- 多组栏目时可用分隔符:<span class="nav-tab-sep" aria-hidden="true"></span> --> <!-- 多组栏目时可用分隔符:<span class="nav-tab-sep" aria-hidden="true"></span> -->
</nav> </nav>
@@ -404,23 +664,33 @@
<button type="button" class="btn-run" id="btnRun">立即运行</button> <button type="button" class="btn-run" id="btnRun">立即运行</button>
<span class="loading-msg" id="loadingMsg" style="display:none;">生成中,请稍候…</span> <span class="loading-msg" id="loadingMsg" style="display:none;">生成中,请稍候…</span>
<div class="progress-wrap" id="runProgressWrap" style="display:none;"> <div class="progress-wrap" id="runProgressWrap" style="display:none;">
<div class="progress-bar-bg"><div class="progress-bar-fill" id="runProgressFill" style="width:0%;"></div></div> <div class="progress-bar-bg">
<div class="progress-bar-fill" id="runProgressFill" style="width:0%;"></div>
</div>
<span class="hint" style="font-size:12px;color:#888;" id="runProgressText">0 / 0</span> <span class="hint" style="font-size:12px;color:#888;" id="runProgressText">0 / 0</span>
</div> </div>
<!-- 当前文件行级进度(不经数据库中转,只读内存接口) --> <!-- 当前文件行级进度(不经数据库中转,只读内存接口) -->
<div class="progress-wrap" id="runLineProgressWrap" style="display:none;"> <div class="progress-wrap" id="runLineProgressWrap" style="display:none;">
<div class="progress-bar-bg"><div class="progress-bar-fill" id="runLineProgressFill" style="width:0%;"></div></div> <div class="progress-bar-bg">
<div class="progress-bar-fill" id="runLineProgressFill" style="width:0%;"></div>
</div>
<span class="hint" style="font-size:12px;color:#888;" id="runLineProgressText">0 / 0</span> <span class="hint" style="font-size:12px;color:#888;" id="runLineProgressText">0 / 0</span>
</div> </div>
<button type="button" class="btn-cancel-run" id="btnCancelRun" style="display:none;">取消生成</button> <button type="button" class="btn-cancel-run" id="btnCancelRun"
style="display:none;">取消生成</button>
</div> </div>
</div> </div>
<div class="template-download-row" id="templateDownloadRow" role="button" tabindex="0" title="下载品牌文档格式模板(选择保存位置)"> <div class="template-download-row" id="templateDownloadRow" role="button" tabindex="0"
title="下载品牌文档格式模板(选择保存位置)">
<span class="template-download-icon" aria-hidden="true"> <span class="template-download-icon" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z"
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
<path d="M8 13h8M8 17h5" stroke="rgba(255,255,255,0.85)" stroke-width="1.5" stroke-linecap="round"/> stroke-linejoin="round" />
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M8 13h8M8 17h5" stroke="rgba(255,255,255,0.85)" stroke-width="1.5"
stroke-linecap="round" />
</svg> </svg>
</span> </span>
<span class="template-download-text"> <span class="template-download-text">
@@ -428,12 +698,17 @@
<span class="hint">品牌文档格式_模板.xlsx · 点击选择保存位置</span> <span class="hint">品牌文档格式_模板.xlsx · 点击选择保存位置</span>
</span> </span>
</div> </div>
<div class="template-download-row" id="templateDownloadRow2" role="button" tabindex="0" title="下载模板2以文件夹方式上传"> <div class="template-download-row" id="templateDownloadRow2" role="button" tabindex="0"
title="下载模板2以文件夹方式上传">
<span class="template-download-icon" aria-hidden="true"> <span class="template-download-icon" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6z"
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/> stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
<path d="M3 7v10h4v-4h2v4h8v-4h2v4h2V7H3z" stroke="rgba(255,255,255,0.85)" stroke-width="1.5" stroke-linecap="round"/> stroke-linejoin="round" />
<path d="M14 2v6h6" stroke="rgba(255,255,255,0.9)" stroke-width="1.8" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 7v10h4v-4h2v4h8v-4h2v4h2V7H3z" stroke="rgba(255,255,255,0.85)"
stroke-width="1.5" stroke-linecap="round" />
</svg> </svg>
</span> </span>
<span class="template-download-text"> <span class="template-download-text">
@@ -915,4 +1190,5 @@
})(); })();
</script> </script>
</body> </body>
</html> </html>

View File

@@ -124,9 +124,8 @@ public class BrandTaskController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在") @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在")
}) })
public ApiResponse<LegacyBrandTaskDetailVo> getTask( public ApiResponse<LegacyBrandTaskDetailVo> getTask(
@Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) {
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { return ApiResponse.success(brandTaskService.getTaskDetailLegacy(taskId));
return ApiResponse.success(brandTaskService.getTaskDetailLegacy(taskId, userId));
} }
@PostMapping("/tasks/{taskId}/result") @PostMapping("/tasks/{taskId}/result")
@@ -154,9 +153,8 @@ public class BrandTaskController {
}) })
public ApiResponse<BrandSimpleVo> submitResult( public ApiResponse<BrandSimpleVo> submitResult(
@Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId,
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId,
@Valid @RequestBody BrandCrawlResultRequest request) { @Valid @RequestBody BrandCrawlResultRequest request) {
brandTaskService.submitCrawlResult(taskId, userId, request); brandTaskService.submitCrawlResult(taskId, request);
return ApiResponse.success(new BrandSimpleVo(true)); return ApiResponse.success(new BrandSimpleVo(true));
} }
@@ -170,9 +168,8 @@ public class BrandTaskController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或当前状态不可取消") @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或当前状态不可取消")
}) })
public ApiResponse<BrandSimpleVo> cancelTask( public ApiResponse<BrandSimpleVo> cancelTask(
@Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) {
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { brandTaskService.cancelTask(taskId);
brandTaskService.cancelTask(taskId, userId);
return ApiResponse.success(new BrandSimpleVo(true)); return ApiResponse.success(new BrandSimpleVo(true));
} }
@@ -186,9 +183,8 @@ public class BrandTaskController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或正在执行中不可删除") @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "任务不存在或正在执行中不可删除")
}) })
public ApiResponse<BrandSimpleVo> deleteTask( public ApiResponse<BrandSimpleVo> deleteTask(
@Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) {
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { brandTaskService.deleteTask(taskId);
brandTaskService.deleteTask(taskId, userId);
return ApiResponse.success(new BrandSimpleVo(true)); return ApiResponse.success(new BrandSimpleVo(true));
} }
@@ -202,9 +198,8 @@ public class BrandTaskController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在或无结果可下载") @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "任务不存在或无结果可下载")
}) })
public ResponseEntity<Void> download( public ResponseEntity<Void> download(
@Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId, @Parameter(description = "品牌任务 ID", required = true) @PathVariable Long taskId) {
@Parameter(description = "用户 ID", required = true) @RequestParam Long userId) { String url = brandTaskService.resolveDownloadUrl(taskId);
String url = brandTaskService.resolveDownloadUrl(taskId, userId);
return ResponseEntity.status(302) return ResponseEntity.status(302)
.header(HttpHeaders.LOCATION, url) .header(HttpHeaders.LOCATION, url)
.build(); .build();

View File

@@ -139,8 +139,8 @@ public class BrandTaskService {
return vo; return vo;
} }
public LegacyBrandTaskDetailVo getTaskDetailLegacy(Long taskId, Long userId) { public LegacyBrandTaskDetailVo getTaskDetailLegacy(Long taskId) {
BrandCrawlTaskEntity task = requireTask(taskId, userId); BrandCrawlTaskEntity task = requireTask(taskId);
LegacyBrandTaskDetailVo vo = new LegacyBrandTaskDetailVo(); LegacyBrandTaskDetailVo vo = new LegacyBrandTaskDetailVo();
vo.setTask(toLegacyTaskItem(task)); vo.setTask(toLegacyTaskItem(task));
vo.setLine_progress(buildLineProgress(taskId)); vo.setLine_progress(buildLineProgress(taskId));
@@ -204,8 +204,8 @@ public class BrandTaskService {
return vo; return vo;
} }
public void submitCrawlResult(Long taskId, Long userId, BrandCrawlResultRequest request) { public void submitCrawlResult(Long taskId, BrandCrawlResultRequest request) {
BrandCrawlTaskEntity task = requireTask(taskId, userId); BrandCrawlTaskEntity task = requireTask(taskId);
if (STATUS_CANCELLED.equalsIgnoreCase(blankToDefault(task.getStatus(), STATUS_PENDING))) { if (STATUS_CANCELLED.equalsIgnoreCase(blankToDefault(task.getStatus(), STATUS_PENDING))) {
throw new BusinessException("任务已取消"); throw new BusinessException("任务已取消");
} }
@@ -310,11 +310,10 @@ public class BrandTaskService {
} }
} }
public void cancelTask(Long taskId, Long userId) { public void cancelTask(Long taskId) {
requireTask(taskId, userId); requireTask(taskId);
int updated = brandCrawlTaskMapper.update(null, new LambdaUpdateWrapper<BrandCrawlTaskEntity>() int updated = brandCrawlTaskMapper.update(null, new LambdaUpdateWrapper<BrandCrawlTaskEntity>()
.eq(BrandCrawlTaskEntity::getId, taskId) .eq(BrandCrawlTaskEntity::getId, taskId)
.eq(BrandCrawlTaskEntity::getUserId, userId)
.in(BrandCrawlTaskEntity::getStatus, STATUS_PENDING, STATUS_RUNNING) .in(BrandCrawlTaskEntity::getStatus, STATUS_PENDING, STATUS_RUNNING)
.set(BrandCrawlTaskEntity::getStatus, STATUS_CANCELLED)); .set(BrandCrawlTaskEntity::getStatus, STATUS_CANCELLED));
if (updated == 0) { if (updated == 0) {
@@ -323,19 +322,18 @@ public class BrandTaskService {
brandTaskProgressCacheService.delete(taskId); brandTaskProgressCacheService.delete(taskId);
} }
public void deleteTask(Long taskId, Long userId) { public void deleteTask(Long taskId) {
requireTask(taskId, userId); requireTask(taskId);
int deleted = brandCrawlTaskMapper.delete(new LambdaQueryWrapper<BrandCrawlTaskEntity>() int deleted = brandCrawlTaskMapper.delete(new LambdaQueryWrapper<BrandCrawlTaskEntity>()
.eq(BrandCrawlTaskEntity::getId, taskId) .eq(BrandCrawlTaskEntity::getId, taskId)
.eq(BrandCrawlTaskEntity::getUserId, userId)
.ne(BrandCrawlTaskEntity::getStatus, STATUS_RUNNING)); .ne(BrandCrawlTaskEntity::getStatus, STATUS_RUNNING));
if (deleted == 0) { if (deleted == 0) {
throw new BusinessException("任务不存在或正在执行中无法删除"); throw new BusinessException("任务不存在或正在执行中无法删除");
} }
} }
public String resolveDownloadUrl(Long taskId, Long userId) { public String resolveDownloadUrl(Long taskId) {
BrandCrawlTaskEntity task = requireTask(taskId, userId); BrandCrawlTaskEntity task = requireTask(taskId);
Object raw = parseJsonValue(task.getResultPaths()); Object raw = parseJsonValue(task.getResultPaths());
if (!(raw instanceof Map<?, ?> map)) { if (!(raw instanceof Map<?, ?> map)) {
throw new BusinessException("无结果可下载"); throw new BusinessException("无结果可下载");