diff --git a/app/.env b/app/.env index e40b987..856e41a 100644 --- a/app/.env +++ b/app/.env @@ -12,6 +12,7 @@ zn_username=%E8%87%AA%E5%8A%A8%E5%8C%96_Robot client_name=ShuFuAI -java_api_base=http://8.136.19.173:18080 +java_api_base=http://127.0.0.1:18080 +# java_api_base=http://8.136.19.173:18080 diff --git a/app/amazon/__pycache__/main.cpython-312.pyc b/app/amazon/__pycache__/main.cpython-312.pyc index 702fd9b..e5f9bda 100644 Binary files a/app/amazon/__pycache__/main.cpython-312.pyc and b/app/amazon/__pycache__/main.cpython-312.pyc differ diff --git a/app/assets/delete-brand.js b/app/assets/delete-brand.js index 4c1fe87..36c4f8f 100644 --- a/app/assets/delete-brand.js +++ b/app/assets/delete-brand.js @@ -1 +1 @@ -import{d as Ae,o as Me,J as Re,a as o,c as u,b as Be,B as qe,e as a,F as D,r as Z,t as c,f,K as Ue,L as ke,n as me,g as p,h as L,M as He,i as A,E as v,j as Je,N as Ke,O as Oe,P as Le,Q as je,_ as Ve,q as ze,s as Ge}from"./pywebview-Dee3nQjE.js";const Qe={class:"page-shell module-page"},Xe={class:"main-content"},We={class:"left-panel"},Ye={class:"upload-zone"},Ze={class:"selected-files clean-placeholder split-selected-files"},es={key:0,class:"more-line"},ss={key:1},ts={class:"run-row"},ns=["disabled"],as={class:"loading-msg"},ls={key:0,class:"queue-debug-card"},rs={key:0,class:"queue-debug-line"},os={key:1,class:"queue-debug-payload"},us={class:"right-panel"},is={class:"task-list-wrap"},cs={class:"clean-result-summary"},ds={class:"summary-card"},fs={class:"summary-card"},vs={class:"summary-card"},hs={class:"result-list-wrap"},ps={key:0,class:"empty-tasks"},_s={key:0,class:"result-subsection"},gs={class:"task-list clean-result-list"},ys={class:"left split-result-main"},ks=["title"],ms={class:"files"},Is={class:"files"},bs={key:0,class:"files"},ws={key:1,class:"files"},Ss={key:2,class:"files"},Cs={key:3,class:"time"},Ts={key:4,class:"delete-brand-progress-block"},xs={class:"delete-brand-progress-header"},Fs={class:"delete-brand-progress-bar"},Ns={class:"files delete-brand-progress"},$s={key:5,class:"files split-entry-list delete-brand-preview"},Es={key:6,class:"files"},Ps={class:"task-right split-result-actions"},Ds=["onClick"],As=["onClick"],Ms=["onClick"],Rs={key:1,class:"result-subsection"},Bs={class:"task-list clean-result-list"},qs={class:"left split-result-main"},Us=["title"],Hs={class:"files"},Js={class:"files"},Ks={key:0,class:"files"},Os={key:1,class:"files"},Ls={key:2,class:"time"},js={key:3,class:"delete-brand-progress-block"},Vs={class:"delete-brand-progress-header"},zs={class:"delete-brand-progress-bar"},Gs={class:"files delete-brand-progress"},Qs={key:4,class:"files split-entry-list delete-brand-preview"},Xs={key:5,class:"files"},Ws={class:"task-right split-result-actions"},Ys=["onClick"],Zs=["onClick"],et=Ae({__name:"BrandDeleteBrandTab",setup(tt){function F(){return`delete-brand:current-tasks:${typeof window<"u"&&window.localStorage.getItem("uid")||"0"}`}const S=p([]),M=p([]),N=p(!1),ee=p([]),d=p([]),R=p([]),B=p({total:0,successCount:0,failedCount:0,items:[]}),I=p(""),k=p(""),_=p({}),g=p(null),j=p(!1),C=p(!1),T=p(""),q=p(!1),V=L(()=>S.value.slice(0,10)),m=L(()=>{const e=[];return d.value.forEach(s=>{e.push(...s.items)}),e});function Ie(){try{const e=typeof window<"u"?window.localStorage.getItem(F()):null;if(e){if(d.value=JSON.parse(e),d.value.length>0){const s=d.value[d.value.length-1];I.value=s.queuePushResult||"",k.value=s.queuePayloadText||""}}else d.value=[]}catch{d.value=[]}}function se(e,s,t,n){const l=s.filter(h=>h.matchStatus==="MATCHED"&&h.success!==!1);if(l.length===0)return;const i={taskId:e,items:l,createdAt:Date.now(),queuePushResult:t,queuePayloadText:n},r=d.value.findIndex(h=>h.taskId===e);r>=0?d.value[r]=i:d.value.push(i),typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}function te(e){const s=d.value.length;d.value=d.value.filter(t=>t.taskId!==e),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}const U=L(()=>R.value.filter(e=>!m.value.some(s=>s.taskId===e.taskId||s.resultId&&s.resultId===e.resultId))),be=L(()=>m.value.length>0||U.value.length>0);function ne(){typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}function $(e){return e?(d.value.find(t=>t.taskId===e)?.items.length||0)>1:!1}function z(e){return e&&d.value.find(s=>s.taskId===e)||null}function G(e,s){return!e||!s?!1:e.resultId!=null&&s.resultId!=null?e.resultId===s.resultId:e.fileKey&&s.fileKey?e.fileKey===s.fileKey:e.sourceFilename===s.sourceFilename}function x(e,s){const t=z(e);return t&&t.items.find(n=>G(n,s))||null}function ae(e){if(!e)return!1;const s=z(e);if(!s)return!1;let t=!1;const n=_.value[e]?.line_progress?.info;if($(e)&&n?.finished_files!=null&&n.finished_files>=0){const l=s.items.filter(r=>r._pushed),i=Math.max(0,Math.min(n.finished_files,l.length));for(let r=0;r0&&n.current_line>=n.total_lines){const l=m.value.find(r=>P(r)===T.value),i=l&&l.taskId===e?x(e,l):s.items.find(r=>r.sourceFilename===n.file_name);i&&!i._completed&&(i._completed=!0,t=!0)}return t&&ne(),t}function we(e){return e&&_.value[e]?.task?.status||""}function H(e){if(e.error)return e.error;if(e.matchStatus&&e.matchStatus!=="MATCHED")return e.matchMessage||"";const s=e.taskId;return s&&_.value[s]?.task?.errorMessage||""}function le(e){const s=e.taskId;if(!s)return!1;const t=_.value[s]?.line_progress,n=$(s),l=w(e);return l==="本文件解析完毕"||l==="已被全局判定为终态"?!1:n?x(s,e)?._pushed?t?.has_progress&&t?.info?.file_name?t.info.file_name===e.sourceFilename:!0:!1:t?.has_progress||t?.info?!0:l==="已入队"||l==="处理中"}function re(e){return e.map(s=>s.matchStatus==="MATCHED"?{...s,_pushed:!1,_completed:!1}:{...s,matched:!1,openStoreUrl:void 0,error:s.error||void 0,_pushed:!1,_completed:!1})}function oe(e){return e.matchStatus==="MATCHED"?`已匹配 ${e.shopId||""}`.trim():e.matchMessage?e.matchMessage:e.matchStatus==="CONFLICT"?"存在多个同名店铺，请人工确认":e.matchStatus==="PENDING"||e.matchStatus==="INDEX_STALE"?"店铺索引暂未就绪":e.matchStatus?e.matchStatus:e.matched?`已匹配 ${e.shopId||""}`.trim():"待匹配"}function Se(){ee.value=[...m.value,...U.value]}function b(){Se(),Ce(ee.value)}function Ce(e){B.value={total:e.length,successCount:e.filter(s=>s.success).length,failedCount:e.filter(s=>!s.success).length,items:e}}function ue(e){if(!e)return"";const s=_.value[e],t=s?.line_progress?.info;if(!s?.line_progress?.has_progress||!t){const l=s?.task?.status;return l?`任务状态：${l}`:""}const n=[];if(t.phase&&n.push(`阶段：${t.phase}`),t.file_index&&t.file_total&&n.push(`文件：${t.file_index}/${t.file_total}`),t.file_name&&n.push(`当前文件：${t.file_name}`),t.current_line!=null&&t.total_lines!=null&&n.push(`${$(e)?"当前文件进度":"进度"}：${t.current_line}/${t.total_lines}`),t.current_country&&n.push(`国家：${t.current_country}`),t.current_asin&&n.push(`ASIN：${t.current_asin}`),t.finished_files!=null){const l=t.file_total&&t.file_total>0?`/${t.file_total}`:"";n.push(`已完成文件：${t.finished_files}${l}`)}return n.join("｜")}function J(e){if(!e)return 0;const s=_.value[e]?.line_progress?.info;return s?s.current_line!=null&&s.total_lines&&s.total_lines>0?Math.max(0,Math.min(100,Math.round(s.current_line/s.total_lines*100))):s.finished_files!=null&&s.file_total&&s.file_total>0?Math.max(0,Math.min(100,Math.round(s.finished_files/s.file_total*100))):_.value[e]?.task?.status==="SUCCESS"?100:0:0}function ie(e){const s=_.value[e]?.task?.status;return s==="SUCCESS"||s==="FAILED"}function E(){const e=new Set;return d.value.forEach(s=>{s.items.some(t=>t._pushed)&&e.add(s.taskId)}),Array.from(e)}function w(e){const s=e.taskId;if(!s||!z(s))return"";const n=x(s,e),l=we(s),i=_.value[s]?.line_progress,r=$(s);if(!r&&(l==="SUCCESS"||l==="FAILED"||e.taskStatus==="SUCCESS"||e.taskStatus==="FAILED"))return"已被全局判定为终态";if(r&&!n?._pushed&&!n?._completed)return"未入队";if(n?._completed)return"本文件解析完毕";if(l==="RUNNING"&&i?.has_progress&&i?.info?.file_name===e.sourceFilename)return"处理中";if(r&&l==="SUCCESS")return"本文件解析完毕";if(!r){const h=_.value[s];if(h?.items&&h.items.find(Y=>G(Y,e))&&l==="SUCCESS")return"本文件解析完毕"}return n?._pushed?"已入队":"未入队"}function ce(e){if(e.downloadUrl)return!0;const s=e.taskId;return s?_.value[s]?.task?.status==="SUCCESS":!1}function Te(e){const s=e?.task?.id;if(!s||!e?.items?.length)return!1;const t=d.value.find(r=>r.taskId===s);if(!t)return!1;let n=!1;const i=t.items.map(r=>{const h=e.items?.find(Y=>G(Y,r));if(!h)return r;const y={...r,...h,success:r.success??h.success,_pushed:r._pushed,_completed:r._completed};return JSON.stringify(y)!==JSON.stringify(r)&&(n=!0),y}).filter(r=>r.matchStatus==="MATCHED"&&r.success!==!1);return JSON.stringify(i)!==JSON.stringify(t.items)&&(t.items=i,n=!0),n&&ne(),n}async function Q(e){const s=e||E();if(s.length)try{const t=await He(s);let n=!1;for(const l of t.items||[]){const i=l?.task?.id;typeof i=="number"&&i>0&&(_.value[i]=l,Te(l)&&(n=!0),ae(i)&&(n=!0))}n&&b()}catch{}}function xe(){return document.visibilityState==="visible"?4500:1e4}function X(e=!1){if(g.value){if(!e)return;clearTimeout(g.value),g.value=null}const s=async()=>{if(g.value=null,j.value){X();return}const t=E();if(!t.length)return;j.value=!0;let n=!1;try{await Q(t),await Pe();for(const l of t)ie(l)&&(te(l),n=!0)}finally{j.value=!1}n&&(O(),b()),E().length>0&&X()};e?s():g.value=window.setTimeout(s,xe())}function W(e=!1){g.value&&!e||X(e)}function K(e){const s=e.taskId?_.value[e.taskId]?.task?.status:null;return s==="SUCCESS"?{className:"success",text:"已完成"}:s==="FAILED"?{className:"failed",text:"失败"}:s==="RUNNING"?{className:"running",text:"执行中"}:e.taskStatus==="SUCCESS"?{className:"success",text:"已完成"}:e.taskStatus==="FAILED"?{className:"failed",text:"失败"}:e.taskStatus==="RUNNING"?{className:"running",text:"执行中"}:e.success?{className:"success",text:"已完成"}:{className:"failed",text:"失败"}}function de(){g.value&&(window.clearTimeout(g.value),g.value=null)}async function fe(e){const s=A();if(!s?.upload_file_to_java)throw new Error("当前桌面端未提供文件上传桥接能力");const t=[];for(const n of e){const l=typeof n=="string"?n:n.absolutePath,i=typeof n=="string"?void 0:n.relativePath,r=await s.upload_file_to_java(l,i);if(!r?.success||!r.data)throw new Error(r?.error||r?.message||`上传失败：${l}`);t.push(r.data)}return t}async function Fe(){const e=A();if(!e?.select_brand_xlsx_files){v.warning("当前环境不支持文件选择，请在本机客户端中打开");return}try{const s=await e.select_brand_xlsx_files();if(!s?.length)return;S.value=s,M.value=await fe(s),v.success(`已选择 ${s.length} 个删除品牌文件`)}catch(s){v.error(s instanceof Error?s.message:"选择失败")}}async function Ne(){const e=A();if(!e?.select_brand_folder){v.warning("当前环境不支持文件夹选择，请在本机客户端中打开");return}try{const s=await e.select_brand_folder();if(!s)return;const t=await Je(s);if(!t.success||!t.items?.length){v.warning(t.error||"该文件夹下没有 xlsx 文件");return}S.value=t.items.map(n=>n.relativePath||n.absolutePath),M.value=await fe(t.items),v.success(`已选择文件夹内 ${t.items.length} 个 xlsx 文件`)}catch(s){v.error(s instanceof Error?s.message:"选择失败")}}async function $e(){if(!M.value.length){v.warning("请先选择待处理文件");return}try{N.value=!0;const e=await Ke({files:M.value.map(l=>({fileKey:l.fileKey,originalFilename:l.originalFilename,relativePath:l.relativePath}))}),s=re(e.items||[]),t=s.some(l=>l.matchStatus==="MATCHED"),n=s.some(l=>l.matchStatus&&l.matchStatus!=="MATCHED");I.value="解析完成，等待手动点击打开紫鸟进行单任务处理",k.value="",s.length&&s[0].taskId&&se(s[0].taskId,s,I.value,k.value),b(),n?v.warning("部分文件尚未命中可用店铺索引，已保留状态信息，请等待后台刷新后重试。"):t?v.success("删除品牌解析完成，请手动推送"):v.warning("当前没有可推送的已匹配文件，请先等待店铺索引刷新。"),await O()}catch(e){v.error(e instanceof Error?e.message:"执行失败")}finally{N.value=!1}}async function ve(e){const s=e.taskId;if(!s){v.warning("未找到任务ID");return}const t=A(),n=Oe(s),l=e.outputFilename||e.sourceFilename||`delete-brand_${s}.xlsx`;if(t?.save_file_from_url){const i=await t.save_file_from_url(n,l);i.success?v.success(`已保存：${i.path||l}`):i.error&&i.error!=="用户取消"&&v.error(i.error);return}window.open(n,"_blank")}async function O(){try{const e=await Le();R.value=re(e.items||[]),b(),await Q(),W(!0)}catch(e){console.error("loadHistory error:",e)}}function he(e){d.value.forEach(t=>{t.items=t.items.filter(n=>n.resultId!==e)});const s=d.value.length;d.value=d.value.filter(t=>t.items.length>0),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value)),R.value=R.value.filter(t=>t.resultId!==e),b(),E().length===0&&de()}async function pe(e){try{await je(e),he(e),await O(),v.success("已删除")}catch(s){const t=s instanceof Error?s.message:"删除失败";if(typeof t=="string"&&t.includes("记录不存在")){he(e),v.success("已删除");return}v.error(t)}}function _e(e){const s=e.slice(0,5).map(n=>`${n.country}:${n.asin}${n.status?`（${n.status}）`:""}`);return e.length-s.length>0?`${s.join("、")} 等 ${e.length} 条`:s.join("、")}function nt(e,s){}function ge(){for(const e of d.value)for(const s of e.items){const t=w(s);if(t==="已入队"||t==="处理中")return!0}return!1}function P(e){return e.resultId!=null?`result:${e.resultId}`:`task:${e.taskId||0}:${e.sourceFilename||""}`}function Ee(){return m.value.find(e=>!e.openStoreUrl||P(e)===T.value||x(e.taskId,e)?._completed?!1:w(e)==="未入队")}async function ye(e,s){if(s?.auto&&ge())return e.taskId,e.sourceFilename,!1;const t=A(),n=e.taskId;if(!n)return!1;const l=d.value.find(y=>y.taskId===n);if(!l)return!1;if(!t?.enqueue_json)return v.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）"),!1;const i={type:"delete-brand-run",ts:Date.now(),data:{taskId:n,items:[e]}};k.value=JSON.stringify(i,null,2);const r=await t.enqueue_json(i);let h="";if(r?.success){h=`已推送文件 ${e.sourceFilename}，当前队列长度：${r.queue_size??"-"}`;const y=x(n,e);y&&(y._pushed=!0,y._completed=!1),T.value=P(e),se(n,l.items,h,k.value),W(!0)}else h=`推送到 Python 队列失败：${r?.error||"未知错误"}`;return I.value=h,!!r?.success}async function Pe(){if(!C.value||q.value){C.value,q.value;return}if(ge())return;const e=T.value;if(e){const t=m.value.find(n=>P(n)===e);if(t){const n=t.taskId,l=$(n);l&&(ae(n),w(t),void 0);const i=w(t);if(i==="已入队"||i==="处理中"){t.sourceFilename;return}if(l){const r=x(n,t);if(r&&!r._completed){t.sourceFilename,r._pushed,r._completed;return}}}}const s=Ee();if(!s){T.value="",C.value=!1;return}q.value=!0;try{s.taskId,s.sourceFilename,P(s),await ye(s,{auto:!0})||(s.taskId,s.sourceFilename,C.value=!1)}finally{q.value=!1}}async function De(e){C.value=!0,await ye(e)||(C.value=!1,T.value="")}return Me(()=>{Ie();const e=E();e.length>0?Q(e).then(()=>{let s=!1;for(const t of e)ie(t)&&(te(t),s=!0);s&&b(),W(!0)}):b(),O().catch(()=>{})}),Re(()=>{de()}),(e,s)=>(o(),u("div",Qe,[Be(qe,{active:"delete-brand"}),a("div",Xe,[a("aside",We,[s[2]||(s[2]=a("div",{class:"section-title"},"选择文件",-1)),a("div",Ye,[s[0]||(s[0]=a("div",{class:"hint"},"上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。",-1)),a("div",{class:"btns"},[a("button",{type:"button",class:"opt-btn",onClick:Fe},"选择 Excel 文件"),a("button",{type:"button",class:"opt-btn",onClick:Ne},"选择文件夹")]),a("div",Ze,[S.value.length?(o(),u(D,{key:0},[(o(!0),u(D,null,Z(V.value,t=>(o(),u("span",{key:t},c(t),1))),128)),S.value.length>V.value.length?(o(),u("span",es," 还有 "+c(S.value.length-V.value.length)+" 个文件未展开显示 ",1)):f("",!0)],64)):(o(),u("span",ss,"暂未选择删除品牌文件"))])]),s[3]||(s[3]=Ue('
执行说明
',2)),a("div",ts,[a("button",{type:"button",class:"btn-run",disabled:N.value,onClick:$e},c(N.value?"解析中...":"开始解析"),9,ns),a("span",as,c(N.value?"正在读取删除品牌数据，请稍候…":"解析后会在右侧展示按国家分组的去重结果"),1)]),I.value||k.value?(o(),u("div",ls,[s[1]||(s[1]=a("div",{class:"section-title queue-debug-title"},"Python 队列推送结果",-1)),I.value?(o(),u("div",rs,c(I.value),1)):f("",!0),k.value?(o(),u("pre",os,c(k.value),1)):f("",!0)])):f("",!0)]),a("section",us,[s[12]||(s[12]=a("div",{class:"panel-header"},"删除品牌结果",-1)),a("div",is,[a("div",cs,[a("div",ds,[s[4]||(s[4]=a("span",{class:"summary-label"},"已处理文件",-1)),a("strong",null,c(B.value.total),1)]),a("div",fs,[s[5]||(s[5]=a("span",{class:"summary-label"},"成功结果",-1)),a("strong",null,c(B.value.successCount),1)]),a("div",vs,[s[6]||(s[6]=a("span",{class:"summary-label"},"失败文件",-1)),a("strong",null,c(B.value.failedCount),1)])]),a("div",hs,[s[11]||(s[11]=a("div",{class:"result-list-header"},[a("span",null,"删除品牌结果列表")],-1)),be.value?(o(),u(D,{key:1},[m.value.length?(o(),u("div",_s,[s[8]||(s[8]=a("div",{class:"result-subsection-title"},"当前任务",-1)),a("ul",gs,[(o(!0),u(D,null,Z(m.value,t=>(o(),u("li",{key:`current-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[a("div",ys,[a("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,ks),a("div",ms,"店铺名："+c(t.shopName||"-"),1),a("div",Is,"匹配结果："+c(oe(t)),1),t.platform?(o(),u("div",bs,"平台："+c(t.platform),1)):f("",!0),w(t)?(o(),u("div",ws,"队列状态："+c(w(t)),1)):f("",!0),t.countryCount!==void 0&&t.matched?(o(),u("div",Ss,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(o(),u("div",Cs,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),le(t)?(o(),u("div",Ts,[a("div",xs,[s[7]||(s[7]=a("span",null,"任务进度",-1)),a("span",null,c(J(t.taskId))+"%",1)]),a("div",Fs,[a("div",{class:"delete-brand-progress-bar-fill",style:ke({width:`${J(t.taskId)}%`})},null,4)]),a("div",Ns,c(ue(t.taskId)),1)])):f("",!0),t.previewRows?.length?(o(),u("div",$s,c(_e(t.previewRows)),1)):f("",!0),H(t)?(o(),u("div",Es,"错误信息："+c(H(t)),1)):f("",!0)]),a("div",Ps,[a("span",{class:me(["status",K(t).className])},c(K(t).text),3),t.openStoreUrl?(o(),u("button",{key:0,type:"button",class:"download",onClick:n=>De(t)}," 打开紫鸟 ",8,Ds)):f("",!0),ce(t)?(o(),u("button",{key:1,type:"button",class:"download",onClick:n=>ve(t)}," 下载 ",8,As)):f("",!0),t.resultId?(o(),u("button",{key:2,type:"button",class:"btn-delete",onClick:n=>pe(t.resultId)}," 删除 ",8,Ms)):f("",!0)])]))),128))])])):f("",!0),U.value.length?(o(),u("div",Rs,[s[10]||(s[10]=a("div",{class:"result-subsection-title"},"历史记录",-1)),a("ul",Bs,[(o(!0),u(D,null,Z(U.value,t=>(o(),u("li",{key:`history-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[a("div",qs,[a("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,Us),a("div",Hs,"店铺名："+c(t.shopName||"-"),1),a("div",Js,"匹配结果："+c(oe(t)),1),t.platform?(o(),u("div",Ks,"平台："+c(t.platform),1)):f("",!0),t.countryCount!==void 0&&t.matched?(o(),u("div",Os,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(o(),u("div",Ls,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),le(t)?(o(),u("div",js,[a("div",Vs,[s[9]||(s[9]=a("span",null,"任务进度",-1)),a("span",null,c(J(t.taskId))+"%",1)]),a("div",zs,[a("div",{class:"delete-brand-progress-bar-fill",style:ke({width:`${J(t.taskId)}%`})},null,4)]),a("div",Gs,c(ue(t.taskId)),1)])):f("",!0),t.previewRows?.length?(o(),u("div",Qs,c(_e(t.previewRows)),1)):f("",!0),H(t)?(o(),u("div",Xs,"错误信息："+c(H(t)),1)):f("",!0)]),a("div",Ws,[a("span",{class:me(["status",K(t).className])},c(K(t).text),3),ce(t)?(o(),u("button",{key:0,type:"button",class:"download",onClick:n=>ve(t)}," 下载 ",8,Ys)):f("",!0),t.resultId?(o(),u("button",{key:1,type:"button",class:"btn-delete",onClick:n=>pe(t.resultId)}," 删除 ",8,Zs)):f("",!0)])]))),128))])])):f("",!0)],64)):(o(),u("div",ps," 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])]))}}),st=Ve(et,[["__scopeId","data-v-7fbcf490"]]);ze(st).use(Ge).mount("#app"); +import{d as Me,o as Ae,J as Be,a as u,c as i,b as qe,B as Ue,e as r,F as R,r as Z,t as c,f,K as Ke,L as Ie,n as be,g as p,h as j,M as He,i as M,E as h,j as Je,N as Oe,O as Le,P as je,Q as Ve,_ as ze,q as Ge,s as Qe}from"./pywebview-Dee3nQjE.js";const Xe={class:"page-shell module-page"},We={class:"main-content"},Ye={class:"left-panel"},Ze={class:"upload-zone"},es={class:"selected-files clean-placeholder split-selected-files"},ss={key:0,class:"more-line"},ts={key:1},ns={class:"run-row"},as=["disabled"],ls={class:"loading-msg"},rs={key:0,class:"queue-debug-card"},os={key:0,class:"queue-debug-line"},us={key:1,class:"queue-debug-payload"},is={class:"right-panel"},cs={class:"task-list-wrap"},ds={class:"clean-result-summary"},fs={class:"summary-card"},vs={class:"summary-card"},hs={class:"summary-card"},ps={class:"result-list-wrap"},_s={key:0,class:"empty-tasks"},gs={key:0,class:"result-subsection"},ys={class:"task-list clean-result-list"},ks={class:"left split-result-main"},ms=["title"],Is={class:"files"},bs={class:"files"},ws={key:0,class:"files"},Ss={key:1,class:"files"},Cs={key:2,class:"files"},Fs={key:3,class:"time"},Ts={key:4,class:"delete-brand-progress-block"},xs={class:"delete-brand-progress-header"},Ns={class:"delete-brand-progress-bar"},$s={class:"files delete-brand-progress"},Es={key:5,class:"files split-entry-list delete-brand-preview"},Ps={key:6,class:"files"},Ds={class:"task-right split-result-actions"},Rs=["onClick"],Ms=["onClick"],As=["onClick"],Bs={key:1,class:"result-subsection"},qs={class:"task-list clean-result-list"},Us={class:"left split-result-main"},Ks=["title"],Hs={class:"files"},Js={class:"files"},Os={key:0,class:"files"},Ls={key:1,class:"files"},js={key:2,class:"time"},Vs={key:3,class:"delete-brand-progress-block"},zs={class:"delete-brand-progress-header"},Gs={class:"delete-brand-progress-bar"},Qs={class:"files delete-brand-progress"},Xs={key:4,class:"files split-entry-list delete-brand-preview"},Ws={key:5,class:"files"},Ys={class:"task-right split-result-actions"},Zs=["onClick"],et=["onClick"],st=Me({__name:"BrandDeleteBrandTab",setup(nt){function N(){return`delete-brand:current-tasks:${typeof window<"u"&&window.localStorage.getItem("uid")||"0"}`}const C=p([]),A=p([]),$=p(!1),ee=p([]),d=p([]),B=p([]),q=p({total:0,successCount:0,failedCount:0,items:[]}),I=p(""),k=p(""),_=p({}),y=p(null),V=p(!1),F=p(!1),b=p(""),U=p(!1),z=j(()=>C.value.slice(0,10)),m=j(()=>{const e=[];return d.value.forEach(s=>{e.push(...s.items)}),e});function we(){try{const e=typeof window<"u"?window.localStorage.getItem(N()):null;if(e){if(d.value=JSON.parse(e),d.value.length>0){const s=d.value[d.value.length-1];I.value=s.queuePushResult||"",k.value=s.queuePayloadText||""}}else d.value=[]}catch{d.value=[]}}function se(e,s,t,n){const l=s.filter(v=>v.matchStatus==="MATCHED"&&v.success!==!1);if(l.length===0)return;const o={taskId:e,items:l,createdAt:Date.now(),queuePushResult:t,queuePayloadText:n},a=d.value.findIndex(v=>v.taskId===e);a>=0?d.value[a]=o:d.value.push(o),typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(d.value))}function te(e){const s=d.value.length;d.value=d.value.filter(t=>t.taskId!==e),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(d.value))}const K=j(()=>B.value.filter(e=>!m.value.some(s=>s.taskId===e.taskId||s.resultId&&s.resultId===e.resultId))),Se=j(()=>m.value.length>0||K.value.length>0);function ne(){typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(d.value))}function E(e){return e?(d.value.find(t=>t.taskId===e)?.items.length||0)>1:!1}function G(e){return e&&d.value.find(s=>s.taskId===e)||null}function Q(e,s){return!e||!s?!1:e.resultId!=null&&s.resultId!=null?e.resultId===s.resultId:e.fileKey&&s.fileKey?e.fileKey===s.fileKey:e.sourceFilename===s.sourceFilename}function T(e,s){const t=G(e);return t&&t.items.find(n=>Q(n,s))||null}function ae(e){if(!e)return!1;const s=G(e);if(!s)return!1;let t=!1;const n=_.value[e]?.line_progress?.info;if(E(e)&&n?.finished_files!=null&&n.finished_files>=0){const l=s.items.filter(a=>a._pushed),o=Math.max(0,Math.min(n.finished_files,l.length));for(let a=0;a0&&n.current_line>=n.total_lines){const l=m.value.find(a=>x(a)===b.value),o=l&&l.taskId===e?T(e,l):s.items.find(a=>a.sourceFilename===n.file_name);o&&!o._completed&&(o._completed=!0,t=!0)}return t&&ne(),t}function le(e){return e&&_.value[e]?.task?.status||""}function H(e){if(e.error)return e.error;if(e.matchStatus&&e.matchStatus!=="MATCHED")return e.matchMessage||"";const s=e.taskId;return s&&_.value[s]?.task?.errorMessage||""}function re(e){const s=e.taskId;if(!s)return!1;const t=_.value[s]?.line_progress,n=le(s),l=E(s),o=S(e);if(l){const a=T(s,e),v=x(e)===b.value,g=!!(t?.has_progress&&t?.info?.file_name===e.sourceFilename);return!!(v||g||a?._pushed||(n==="RUNNING"||n==="PENDING"||!n)&&a?._completed)}return o==="本文件解析完毕"||o==="已被全局判定为终态"?!1:t?.has_progress||t?.info?!0:o==="已入队"||o==="处理中"}function oe(e){return e.map(s=>s.matchStatus==="MATCHED"?{...s,_pushed:!1,_completed:!1}:{...s,matched:!1,openStoreUrl:void 0,error:s.error||void 0,_pushed:!1,_completed:!1})}function ue(e){return e.matchStatus==="MATCHED"?`已匹配 ${e.shopId||""}`.trim():e.matchMessage?e.matchMessage:e.matchStatus==="CONFLICT"?"存在多个同名店铺，请人工确认":e.matchStatus==="PENDING"||e.matchStatus==="INDEX_STALE"?"店铺索引暂未就绪":e.matchStatus?e.matchStatus:e.matched?`已匹配 ${e.shopId||""}`.trim():"待匹配"}function Ce(){ee.value=[...m.value,...K.value]}function w(){Ce(),Fe(ee.value)}function Fe(e){q.value={total:e.length,successCount:e.filter(s=>s.success).length,failedCount:e.filter(s=>!s.success).length,items:e}}function ie(e){const s=e.taskId;return s&&(_.value[s]?.fileProgress||[]).find(l=>l.fileKey&&e.fileKey?l.fileKey===e.fileKey:l.sourceFilename&&e.sourceFilename?l.sourceFilename===e.sourceFilename:!1)||null}function ce(e){const s=e.taskId;if(!s)return"";const t=_.value[s],n=t?.line_progress?.info,l=ie(e);if(l){const a=[],v=l.processedRows??0,g=l.totalRows??0;if(l.status&&a.push(`文件状态：${l.status}`),a.push(`文件进度：${v}/${g}`),n?.finished_files!=null){const D=n.file_total&&n.file_total>0?`/${n.file_total}`:"";a.push(`已完成文件：${n.finished_files}${D}`)}return n?.phase&&a.push(`阶段：${n.phase}`),a.join("｜")}if(!t?.line_progress?.has_progress||!n){const a=t?.task?.status;return a?`任务状态：${a}`:""}const o=[];if(n.phase&&o.push(`阶段：${n.phase}`),n.file_index&&n.file_total&&o.push(`文件：${n.file_index}/${n.file_total}`),n.file_name&&o.push(`当前文件：${n.file_name}`),n.current_line!=null&&n.total_lines!=null&&o.push(`${E(s)?"当前文件进度":"进度"}：${n.current_line}/${n.total_lines}`),n.current_country&&o.push(`国家：${n.current_country}`),n.current_asin&&o.push(`ASIN：${n.current_asin}`),n.finished_files!=null){const a=n.file_total&&n.file_total>0?`/${n.file_total}`:"";o.push(`已完成文件：${n.finished_files}${a}`)}return o.join("｜")}function J(e){const s=e.taskId;if(!s)return 0;const t=ie(e);if(t)return Math.max(0,Math.min(100,t.percent??0));const n=_.value[s]?.line_progress?.info;return n?n.current_line!=null&&n.total_lines&&n.total_lines>0?Math.max(0,Math.min(100,Math.round(n.current_line/n.total_lines*100))):n.finished_files!=null&&n.file_total&&n.file_total>0?Math.max(0,Math.min(100,Math.round(n.finished_files/n.file_total*100))):_.value[s]?.task?.status==="SUCCESS"?100:0:0}function de(e){const s=_.value[e]?.task?.status;return s==="SUCCESS"||s==="FAILED"}function P(){const e=new Set;return d.value.forEach(s=>{s.items.some(t=>t._pushed)&&e.add(s.taskId)}),Array.from(e)}function S(e){const s=e.taskId;if(!s||!G(s))return"";const n=T(s,e),l=le(s),o=_.value[s]?.line_progress,a=E(s);if(!a&&(l==="SUCCESS"||l==="FAILED"||e.taskStatus==="SUCCESS"||e.taskStatus==="FAILED"))return"已被全局判定为终态";if(n?._completed)return"本文件解析完毕";if(l==="RUNNING"&&o?.has_progress&&o?.info?.file_name===e.sourceFilename)return"处理中";if(a&&!n?._pushed&&!n?._completed)return"未入队";if(a&&l==="SUCCESS")return"本文件解析完毕";if(!a){const v=_.value[s];if(v?.items&&v.items.find(D=>Q(D,e))&&l==="SUCCESS")return"本文件解析完毕"}return n?._pushed?"已入队":"未入队"}function fe(e){if(e.downloadUrl)return!0;const s=e.taskId;return s?_.value[s]?.task?.status==="SUCCESS":!1}function Te(e){const s=e?.task?.id;if(!s||!e?.items?.length)return!1;const t=d.value.find(a=>a.taskId===s);if(!t)return!1;let n=!1;const o=t.items.map(a=>{const v=e.items?.find(D=>Q(D,a));if(!v)return a;const g={...a,...v,success:a.success??v.success,_pushed:a._pushed,_completed:a._completed};return JSON.stringify(g)!==JSON.stringify(a)&&(n=!0),g}).filter(a=>a.matchStatus==="MATCHED"&&a.success!==!1);return JSON.stringify(o)!==JSON.stringify(t.items)&&(t.items=o,n=!0),n&&ne(),n}async function X(e){const s=e||P();if(s.length)try{const t=await He(s);let n=!1;for(const l of t.items||[]){const o=l?.task?.id;typeof o=="number"&&o>0&&(_.value[o]=l,Te(l)&&(n=!0),ae(o)&&(n=!0))}n&&w()}catch{}}function xe(){return document.visibilityState==="visible"?4500:1e4}function W(e=!1){if(y.value){if(!e)return;clearTimeout(y.value),y.value=null}const s=async()=>{if(y.value=null,V.value){W();return}const t=P();if(!t.length)return;V.value=!0;let n=!1;try{await X(t),await De();for(const l of t)de(l)&&(te(l),n=!0)}finally{V.value=!1}n&&(L(),w()),P().length>0&&W()};e?s():y.value=window.setTimeout(s,xe())}function Y(e=!1){y.value&&!e||W(e)}function O(e){const s=e.taskId?_.value[e.taskId]?.task?.status:null;return s==="SUCCESS"?{className:"success",text:"已完成"}:s==="FAILED"?{className:"failed",text:"失败"}:s==="RUNNING"?{className:"running",text:"执行中"}:e.taskStatus==="SUCCESS"?{className:"success",text:"已完成"}:e.taskStatus==="FAILED"?{className:"failed",text:"失败"}:e.taskStatus==="RUNNING"?{className:"running",text:"执行中"}:e.success?{className:"success",text:"已完成"}:{className:"failed",text:"失败"}}function ve(){y.value&&(window.clearTimeout(y.value),y.value=null)}async function he(e){const s=M();if(!s?.upload_file_to_java)throw new Error("当前桌面端未提供文件上传桥接能力");const t=[];for(const n of e){const l=typeof n=="string"?n:n.absolutePath,o=typeof n=="string"?void 0:n.relativePath,a=await s.upload_file_to_java(l,o);if(!a?.success||!a.data)throw new Error(a?.error||a?.message||`上传失败：${l}`);t.push(a.data)}return t}async function Ne(){const e=M();if(!e?.select_brand_xlsx_files){h.warning("当前环境不支持文件选择，请在本机客户端中打开");return}try{const s=await e.select_brand_xlsx_files();if(!s?.length)return;C.value=s,A.value=await he(s),h.success(`已选择 ${s.length} 个删除品牌文件`)}catch(s){h.error(s instanceof Error?s.message:"选择失败")}}async function $e(){const e=M();if(!e?.select_brand_folder){h.warning("当前环境不支持文件夹选择，请在本机客户端中打开");return}try{const s=await e.select_brand_folder();if(!s)return;const t=await Je(s);if(!t.success||!t.items?.length){h.warning(t.error||"该文件夹下没有 xlsx 文件");return}C.value=t.items.map(n=>n.relativePath||n.absolutePath),A.value=await he(t.items),h.success(`已选择文件夹内 ${t.items.length} 个 xlsx 文件`)}catch(s){h.error(s instanceof Error?s.message:"选择失败")}}async function Ee(){if(!A.value.length){h.warning("请先选择待处理文件");return}try{$.value=!0;const e=await Oe({files:A.value.map(l=>({fileKey:l.fileKey,originalFilename:l.originalFilename,relativePath:l.relativePath}))}),s=oe(e.items||[]),t=s.some(l=>l.matchStatus==="MATCHED"),n=s.some(l=>l.matchStatus&&l.matchStatus!=="MATCHED");I.value="解析完成，等待手动点击打开紫鸟进行单任务处理",k.value="",s.length&&s[0].taskId&&se(s[0].taskId,s,I.value,k.value),w(),n?h.warning("部分文件尚未命中可用店铺索引，已保留状态信息，请等待后台刷新后重试。"):t?h.success("删除品牌解析完成，请手动推送"):h.warning("当前没有可推送的已匹配文件，请先等待店铺索引刷新。"),await L()}catch(e){h.error(e instanceof Error?e.message:"执行失败")}finally{$.value=!1}}async function pe(e){const s=e.taskId;if(!s){h.warning("未找到任务ID");return}const t=M(),n=Le(s),l=e.outputFilename||e.sourceFilename||`delete-brand_${s}.xlsx`;if(t?.save_file_from_url){const o=await t.save_file_from_url(n,l);o.success?h.success(`已保存：${o.path||l}`):o.error&&o.error!=="用户取消"&&h.error(o.error);return}window.open(n,"_blank")}async function L(){try{const e=await je();B.value=oe(e.items||[]),w(),await X(),Y(!0)}catch(e){console.error("loadHistory error:",e)}}function _e(e){d.value.forEach(t=>{t.items=t.items.filter(n=>n.resultId!==e)});const s=d.value.length;d.value=d.value.filter(t=>t.items.length>0),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(d.value)),B.value=B.value.filter(t=>t.resultId!==e),w(),P().length===0&&ve()}async function ge(e){try{await Ve(e),_e(e),await L(),h.success("已删除")}catch(s){const t=s instanceof Error?s.message:"删除失败";if(typeof t=="string"&&t.includes("记录不存在")){_e(e),h.success("已删除");return}h.error(t)}}function ye(e){const s=e.slice(0,5).map(n=>`${n.country}:${n.asin}${n.status?`（${n.status}）`:""}`);return e.length-s.length>0?`${s.join("、")} 等 ${e.length} 条`:s.join("、")}function at(e,s){}function ke(){for(const e of d.value)for(const s of e.items){const t=S(s);if(t==="已入队"||t==="处理中")return!0}return!1}function x(e){return e.resultId!=null?`result:${e.resultId}`:`task:${e.taskId||0}:${e.sourceFilename||""}`}function Pe(){return m.value.find(e=>!e.openStoreUrl||x(e)===b.value||T(e.taskId,e)?._completed?!1:S(e)==="未入队")}async function me(e,s){if(s?.auto&&ke())return e.taskId,e.sourceFilename,!1;const t=M(),n=e.taskId;if(!n)return!1;const l=d.value.find(g=>g.taskId===n);if(!l)return!1;if(!t?.enqueue_json)return h.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）"),!1;const o={type:"delete-brand-run",ts:Date.now(),data:{taskId:n,items:[e]}};k.value=JSON.stringify(o,null,2);const a=await t.enqueue_json(o);let v="";if(a?.success){v=`已推送文件 ${e.sourceFilename}，当前队列长度：${a.queue_size??"-"}`;const g=T(n,e);g&&(g._pushed=!0,g._completed=!1),b.value=x(e),se(n,l.items,v,k.value),Y(!0)}else v=`推送到 Python 队列失败：${a?.error||"未知错误"}`;return I.value=v,!!a?.success}async function De(){if(!F.value||U.value){F.value,U.value;return}if(ke())return;const e=b.value;if(e){const t=m.value.find(n=>x(n)===e);if(t){const n=t.taskId,l=E(n);l&&(ae(n),S(t),void 0);const o=S(t);if(o==="已入队"||o==="处理中"){t.sourceFilename;return}if(l){const a=T(n,t);if(a&&!a._completed){t.sourceFilename,a._pushed,a._completed;return}}}}const s=Pe();if(!s){b.value="",F.value=!1;return}U.value=!0;try{s.taskId,s.sourceFilename,x(s),await me(s,{auto:!0})||(s.taskId,s.sourceFilename,F.value=!1)}finally{U.value=!1}}async function Re(e){F.value=!0,await me(e)||(F.value=!1,b.value="")}return Ae(()=>{we();const e=P();e.length>0?X(e).then(()=>{let s=!1;for(const t of e)de(t)&&(te(t),s=!0);s&&w(),Y(!0)}):w(),L().catch(()=>{})}),Be(()=>{ve()}),(e,s)=>(u(),i("div",Xe,[qe(Ue,{active:"delete-brand"}),r("div",We,[r("aside",Ye,[s[2]||(s[2]=r("div",{class:"section-title"},"选择文件",-1)),r("div",Ze,[s[0]||(s[0]=r("div",{class:"hint"},"上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。",-1)),r("div",{class:"btns"},[r("button",{type:"button",class:"opt-btn",onClick:Ne},"选择 Excel 文件"),r("button",{type:"button",class:"opt-btn",onClick:$e},"选择文件夹")]),r("div",es,[C.value.length?(u(),i(R,{key:0},[(u(!0),i(R,null,Z(z.value,t=>(u(),i("span",{key:t},c(t),1))),128)),C.value.length>z.value.length?(u(),i("span",ss," 还有 "+c(C.value.length-z.value.length)+" 个文件未展开显示 ",1)):f("",!0)],64)):(u(),i("span",ts,"暂未选择删除品牌文件"))])]),s[3]||(s[3]=Ke('
执行说明
',2)),r("div",ns,[r("button",{type:"button",class:"btn-run",disabled:$.value,onClick:Ee},c($.value?"解析中...":"开始解析"),9,as),r("span",ls,c($.value?"正在读取删除品牌数据，请稍候…":"解析后会在右侧展示按国家分组的去重结果"),1)]),I.value||k.value?(u(),i("div",rs,[s[1]||(s[1]=r("div",{class:"section-title queue-debug-title"},"Python 队列推送结果",-1)),I.value?(u(),i("div",os,c(I.value),1)):f("",!0),k.value?(u(),i("pre",us,c(k.value),1)):f("",!0)])):f("",!0)]),r("section",is,[s[12]||(s[12]=r("div",{class:"panel-header"},"删除品牌结果",-1)),r("div",cs,[r("div",ds,[r("div",fs,[s[4]||(s[4]=r("span",{class:"summary-label"},"已处理文件",-1)),r("strong",null,c(q.value.total),1)]),r("div",vs,[s[5]||(s[5]=r("span",{class:"summary-label"},"成功结果",-1)),r("strong",null,c(q.value.successCount),1)]),r("div",hs,[s[6]||(s[6]=r("span",{class:"summary-label"},"失败文件",-1)),r("strong",null,c(q.value.failedCount),1)])]),r("div",ps,[s[11]||(s[11]=r("div",{class:"result-list-header"},[r("span",null,"删除品牌结果列表")],-1)),Se.value?(u(),i(R,{key:1},[m.value.length?(u(),i("div",gs,[s[8]||(s[8]=r("div",{class:"result-subsection-title"},"当前任务",-1)),r("ul",ys,[(u(!0),i(R,null,Z(m.value,t=>(u(),i("li",{key:`current-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[r("div",ks,[r("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,ms),r("div",Is,"店铺名："+c(t.shopName||"-"),1),r("div",bs,"匹配结果："+c(ue(t)),1),t.platform?(u(),i("div",ws,"平台："+c(t.platform),1)):f("",!0),S(t)?(u(),i("div",Ss,"队列状态："+c(S(t)),1)):f("",!0),t.countryCount!==void 0&&t.matched?(u(),i("div",Cs,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(u(),i("div",Fs,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),re(t)?(u(),i("div",Ts,[r("div",xs,[s[7]||(s[7]=r("span",null,"任务进度",-1)),r("span",null,c(J(t))+"%",1)]),r("div",Ns,[r("div",{class:"delete-brand-progress-bar-fill",style:Ie({width:`${J(t)}%`})},null,4)]),r("div",$s,c(ce(t)),1)])):f("",!0),t.previewRows?.length?(u(),i("div",Es,c(ye(t.previewRows)),1)):f("",!0),H(t)?(u(),i("div",Ps,"错误信息："+c(H(t)),1)):f("",!0)]),r("div",Ds,[r("span",{class:be(["status",O(t).className])},c(O(t).text),3),t.openStoreUrl?(u(),i("button",{key:0,type:"button",class:"download",onClick:n=>Re(t)}," 打开紫鸟 ",8,Rs)):f("",!0),fe(t)?(u(),i("button",{key:1,type:"button",class:"download",onClick:n=>pe(t)}," 下载 ",8,Ms)):f("",!0),t.resultId?(u(),i("button",{key:2,type:"button",class:"btn-delete",onClick:n=>ge(t.resultId)}," 删除 ",8,As)):f("",!0)])]))),128))])])):f("",!0),K.value.length?(u(),i("div",Bs,[s[10]||(s[10]=r("div",{class:"result-subsection-title"},"历史记录",-1)),r("ul",qs,[(u(!0),i(R,null,Z(K.value,t=>(u(),i("li",{key:`history-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[r("div",Us,[r("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,Ks),r("div",Hs,"店铺名："+c(t.shopName||"-"),1),r("div",Js,"匹配结果："+c(ue(t)),1),t.platform?(u(),i("div",Os,"平台："+c(t.platform),1)):f("",!0),t.countryCount!==void 0&&t.matched?(u(),i("div",Ls,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(u(),i("div",js,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),re(t)?(u(),i("div",Vs,[r("div",zs,[s[9]||(s[9]=r("span",null,"任务进度",-1)),r("span",null,c(J(t))+"%",1)]),r("div",Gs,[r("div",{class:"delete-brand-progress-bar-fill",style:Ie({width:`${J(t)}%`})},null,4)]),r("div",Qs,c(ce(t)),1)])):f("",!0),t.previewRows?.length?(u(),i("div",Xs,c(ye(t.previewRows)),1)):f("",!0),H(t)?(u(),i("div",Ws,"错误信息："+c(H(t)),1)):f("",!0)]),r("div",Ys,[r("span",{class:be(["status",O(t).className])},c(O(t).text),3),fe(t)?(u(),i("button",{key:0,type:"button",class:"download",onClick:n=>pe(t)}," 下载 ",8,Zs)):f("",!0),t.resultId?(u(),i("button",{key:1,type:"button",class:"btn-delete",onClick:n=>ge(t.resultId)}," 删除 ",8,et)):f("",!0)])]))),128))])])):f("",!0)],64)):(u(),i("div",_s," 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])]))}}),tt=ze(st,[["__scopeId","data-v-7f166b99"]]);Ge(tt).use(Qe).mount("#app"); diff --git a/app/new_web_source/delete-brand.html b/app/new_web_source/delete-brand.html index fc3da1f..79865d0 100644 --- a/app/new_web_source/delete-brand.html +++ b/app/new_web_source/delete-brand.html @@ -7,7 +7,7 @@ - +
diff --git a/backend-java/aiimage-backend.log.2026-04-02.0.gz b/backend-java/aiimage-backend.log.2026-04-02.0.gz new file mode 100644 index 0000000..5fef1dd Binary files /dev/null and b/backend-java/aiimage-backend.log.2026-04-02.0.gz differ diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskDetailVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskDetailVo.java index 9bf9829..b60ca27 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskDetailVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskDetailVo.java @@ -17,4 +17,7 @@ public class DeleteBrandTaskDetailVo { @Schema(description = "任务结果项快照") private List items = new ArrayList<>(); + + @Schema(description = "文件级进度快照") + private List fileProgress = new ArrayList<>(); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskFileProgressVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskFileProgressVo.java new file mode 100644 index 0000000..0c0a024 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/model/vo/DeleteBrandTaskFileProgressVo.java @@ -0,0 +1,27 @@ +package com.nanri.aiimage.modules.deletebrand.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "删除品牌任务中的文件级进度") +public class DeleteBrandTaskFileProgressVo { + + @Schema(description = "文件标识（优先 fileKey）") + private String fileKey; + + @Schema(description = "源文件名") + private String sourceFilename; + + @Schema(description = "已处理行数") + private Integer processedRows; + + @Schema(description = "总行数") + private Integer totalRows; + + @Schema(description = "百分比（0-100）") + private Integer percent; + + @Schema(description = "文件状态：PENDING/RUNNING/COMPLETED/FAILED") + private String status; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index 75fee5d..9152476 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -25,6 +25,7 @@ import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandResultItemVo; import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandRunVo; import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskDeletionStatusVo; import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskDetailVo; +import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskFileProgressVo; import com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskItemVo; import com.nanri.aiimage.modules.file.service.LocalFileStorageService; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; @@ -569,9 +570,11 @@ public class DeleteBrandRunService { DeleteBrandLineProgressVo progressVo = buildLineProgress(task.getId(), progress); DeleteBrandTaskDetailVo detail = new DeleteBrandTaskDetailVo(); + List taskItems = resolveTaskResultItems(task); detail.setTask(taskVo); detail.setLine_progress(progressVo); - detail.setItems(resolveTaskResultItems(task)); + detail.setItems(taskItems); + detail.setFileProgress(buildFileProgress(task, taskItems, progressVo)); return detail; } @@ -602,6 +605,73 @@ public class DeleteBrandRunService { } } + private List buildFileProgress(FileTaskEntity task, + List taskItems, + DeleteBrandLineProgressVo progressVo) { + if (taskItems == null || taskItems.isEmpty()) { + return List.of(); + } + + String taskStatus = task == null ? null : task.getStatus(); + DeleteBrandLineProgressInfoVo info = progressVo == null ? null : progressVo.getInfo(); + Integer finishedFiles = info == null ? null : info.getFinished_files(); + String runningFileName = info == null ? null : info.getFile_name(); + Integer currentLine = info == null ? null : info.getCurrent_line(); + Integer totalLines = info == null ? null : info.getTotal_lines(); + + List fileProgress = new ArrayList<>(); + int completedAssigned = 0; + int normalizedFinished = finishedFiles == null ? 0 : Math.max(0, finishedFiles); + + for (DeleteBrandResultItemVo item : taskItems) { + if (item == null) { + continue; + } + + DeleteBrandTaskFileProgressVo fp = new DeleteBrandTaskFileProgressVo(); + fp.setFileKey(item.getFileKey()); + fp.setSourceFilename(item.getSourceFilename()); + + Integer itemTotalRows = item.getTotalRows() == null ? 0 : Math.max(item.getTotalRows(), 0); + fp.setTotalRows(itemTotalRows); + + String status = "PENDING"; + int processedRows = 0; + int percent = 0; + + if ("SUCCESS".equals(taskStatus)) { + status = "COMPLETED"; + processedRows = itemTotalRows; + percent = 100; + } else if ("FAILED".equals(taskStatus)) { + status = "FAILED"; + processedRows = Math.min(itemTotalRows, Math.max(0, currentLine == null ? 0 : currentLine)); + percent = itemTotalRows > 0 ? Math.min(100, (int) Math.round(processedRows * 100.0 / itemTotalRows)) : 0; + } else { + if (completedAssigned < normalizedFinished) { + status = "COMPLETED"; + processedRows = itemTotalRows; + percent = 100; + completedAssigned++; + } else if (runningFileName != null && runningFileName.equals(item.getSourceFilename())) { + status = "RUNNING"; + processedRows = Math.min(itemTotalRows, Math.max(0, currentLine == null ? 0 : currentLine)); + if (totalLines != null && totalLines > 0) { + percent = Math.min(100, Math.max(0, (int) Math.round(processedRows * 100.0 / totalLines))); + } else if (itemTotalRows > 0) { + percent = Math.min(100, Math.max(0, (int) Math.round(processedRows * 100.0 / itemTotalRows))); + } + } + } + + fp.setProcessedRows(processedRows); + fp.setPercent(percent); + fp.setStatus(status); + fileProgress.add(fp); + } + return fileProgress; + } + private FileTaskEntity refreshIndexedMatchesIfNeeded(FileTaskEntity task) { if (task == null || task.getResultJson() == null || task.getResultJson().isBlank()) { return task; diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue index 631f37a..07f3cb5 100644 --- a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue @@ -115,13 +115,13 @@
任务进度 - {{ formatProgressPercent(item.taskId!) }}% + {{ formatProgressPercent(item) }}%
+ :style="{ width: `${formatProgressPercent(item)}%` }">
-
{{ formatProgress(item.taskId!) }}
+
{{ formatProgress(item) }}
{{ formatPreview(item.previewRows) }} @@ -167,13 +167,13 @@
任务进度 - {{ formatProgressPercent(item.taskId!) }}% + {{ formatProgressPercent(item) }}%
+ :style="{ width: `${formatProgressPercent(item)}%` }">
-
{{ formatProgress(item.taskId!) }}
+
{{ formatProgress(item) }}
{{ formatPreview(item.previewRows) }} @@ -421,25 +421,30 @@ function shouldShowProgress(item: DeleteBrandResultItem) { if (!taskId) return false const progress = taskDetails.value[taskId]?.line_progress + const status = getTaskStatus(taskId) const multiFileTask = isMultiFileTask(taskId) const qs = getQueueStatus(item) - // 已完成/终态后隐藏进度条。 - if (qs === '本文件解析完毕' || qs === '已被全局判定为终态') { + if (multiFileTask) { + const sessionItem = findSessionItem(taskId, item) + const isActiveItem = getItemKey(item) === activeItemKey.value + const isProgressTarget = Boolean(progress?.has_progress && progress?.info?.file_name === item.sourceFilename) + + // 多文件任务下，展示规则更宽松： + // 1) 当前活跃文件；2) 后端进度指向的文件；3) 已推送文件；4) 已完成文件（任务未终态时保留）。 + if (isActiveItem || isProgressTarget || sessionItem?._pushed) { + return true + } + if ((status === 'RUNNING' || status === 'PENDING' || !status) && sessionItem?._completed) { + return true + } + return false } - if (multiFileTask) { - const sessionItem = findSessionItem(taskId, item) - // 多文件任务：未入队的文件不展示同一个 task 的公共进度，避免“两个文件同时在跑”的错觉。 - if (!sessionItem?._pushed) { - return false - } - - if (progress?.has_progress && progress?.info?.file_name) { - return progress.info.file_name === item.sourceFilename - } - return true + // 单文件任务：完成/终态后隐藏。 + if (qs === '本文件解析完毕' || qs === '已被全局判定为终态') { + return false } if (progress?.has_progress || progress?.info) { @@ -507,10 +512,40 @@ function updateSummary(items: DeleteBrandResultItem[]) { } } -function formatProgress(taskId: number) { +function getFileProgress(item: DeleteBrandResultItem) { + const taskId = item.taskId + if (!taskId) return null + const detail = taskDetails.value[taskId] + const fileProgress = detail?.fileProgress || [] + return fileProgress.find((fp) => { + if (fp.fileKey && item.fileKey) return fp.fileKey === item.fileKey + if (fp.sourceFilename && item.sourceFilename) return fp.sourceFilename === item.sourceFilename + return false + }) || null +} + +function formatProgress(item: DeleteBrandResultItem) { + const taskId = item.taskId if (!taskId) return '' + const detail = taskDetails.value[taskId] const info = detail?.line_progress?.info + const fp = getFileProgress(item) + + if (fp) { + const parts: string[] = [] + const processedRows = fp.processedRows ?? 0 + const totalRows = fp.totalRows ?? 0 + if (fp.status) parts.push(`文件状态：${fp.status}`) + parts.push(`文件进度：${processedRows}/${totalRows}`) + if (info?.finished_files != null) { + const total = info.file_total && info.file_total > 0 ? `/${info.file_total}` : '' + parts.push(`已完成文件：${info.finished_files}${total}`) + } + if (info?.phase) parts.push(`阶段：${info.phase}`) + return parts.join('｜') + } + if (!detail?.line_progress?.has_progress || !info) { const status = detail?.task?.status return status ? `任务状态：${status}` : '' @@ -532,8 +567,15 @@ function formatProgress(taskId: number) { return parts.join('｜') } -function formatProgressPercent(taskId: number) { +function formatProgressPercent(item: DeleteBrandResultItem) { + const taskId = item.taskId if (!taskId) return 0 + + const fp = getFileProgress(item) + if (fp) { + return Math.max(0, Math.min(100, fp.percent ?? 0)) + } + const info = taskDetails.value[taskId]?.line_progress?.info if (!info) return 0 @@ -578,20 +620,21 @@ function getQueueStatus(item: DeleteBrandResultItem) { return '已被全局判定为终态' } - // 多文件：未推送的文件必须保持“未入队”，避免被同 task 的公共 RUNNING 状态误判成“处理中”。 - if (multiFileTask && !sessionItem?._pushed && !sessionItem?._completed) { - return '未入队' - } - // 先看前端会话态：一旦该文件已判定完成，优先展示完成，避免被 RUNNING 覆盖导致链式推进卡住。 if (sessionItem?._completed) { return '本文件解析完毕' } + // 多文件场景下，如果后端进度明确指向当前文件，即使本地 _pushed 丢失也应判定为处理中（例如刷新页面后恢复场景）。 if (status === 'RUNNING' && info?.has_progress && info?.info?.file_name === item.sourceFilename) { return '处理中' } + // 多文件：未推送且未完成，才视为未入队。 + if (multiFileTask && !sessionItem?._pushed && !sessionItem?._completed) { + return '未入队' + } + if (multiFileTask && status === 'SUCCESS') { return '本文件解析完毕' } diff --git a/frontend-vue/src/shared/api/java-modules.ts b/frontend-vue/src/shared/api/java-modules.ts index 3f93ae2..73124d4 100644 --- a/frontend-vue/src/shared/api/java-modules.ts +++ b/frontend-vue/src/shared/api/java-modules.ts @@ -200,10 +200,20 @@ export interface DeleteBrandTaskItem { downloadFilename?: string } +export interface DeleteBrandTaskFileProgress { + fileKey?: string + sourceFilename?: string + processedRows?: number + totalRows?: number + percent?: number + status?: 'PENDING' | 'RUNNING' | 'COMPLETED' | 'FAILED' +} + export interface DeleteBrandTaskDetailVo { task: DeleteBrandTaskItem line_progress: DeleteBrandLineProgress items?: DeleteBrandResultItem[] + fileProgress?: DeleteBrandTaskFileProgress[] } export interface DeleteBrandTaskBatchVo {