From 1d9e1896ce1a44bac93c660f2f0a691fbfb69bfb Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Mon, 25 Aug 2025 14:40:05 +0800
Subject: [PATCH] 'commit'

---
 .../__pycache__/Txt2Img.cpython-310.pyc       | Bin 0 -> 4416 bytes
 dsLightRag/Routes/MjRoute.py                  |  67 ++
 .../Routes/__pycache__/Ggb.cpython-310.pyc    | Bin 3060 -> 3439 bytes
 .../__pycache__/MjRoute.cpython-310.pyc       | Bin 0 -> 4059 bytes
 .../Suno/__pycache__/sunoUtil.cpython-310.pyc | Bin 5636 -> 5629 bytes
 .../Util/__pycache__/GGBUtil.cpython-310.pyc  | Bin 8983 -> 9297 bytes
 dsLightRag/static/{ => Midjourney}/mj.html    | 749 ++++++++++--------
 7 files changed, 473 insertions(+), 343 deletions(-)
 create mode 100644 dsLightRag/Midjourney/__pycache__/Txt2Img.cpython-310.pyc
 create mode 100644 dsLightRag/Routes/__pycache__/MjRoute.cpython-310.pyc
 rename dsLightRag/static/{ => Midjourney}/mj.html (53%)

diff --git a/dsLightRag/Midjourney/__pycache__/Txt2Img.cpython-310.pyc b/dsLightRag/Midjourney/__pycache__/Txt2Img.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d2d6c1bc7ac77256c5e6c314846fd8d6056c7562
GIT binary patch
literal 4416
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

literal 0
HcmV?d00001

diff --git a/dsLightRag/Routes/MjRoute.py b/dsLightRag/Routes/MjRoute.py
index 2dfd3897..fbf4653b 100644
--- a/dsLightRag/Routes/MjRoute.py
+++ b/dsLightRag/Routes/MjRoute.py
@@ -11,6 +11,7 @@ from pydantic import BaseModel
 from Midjourney.Txt2Img import Txt2Img
 from Config import Config
 import asyncio
+import threading
 from fastapi.responses import StreamingResponse
 
 # 创建路由路由器
@@ -71,6 +72,72 @@ async def submit_imagine(request: ImagineRequest, background_tasks: BackgroundTa
 
         # 存储Midjourney任务ID
         TASK_STATUS[task_id]["midjourney_task_id"] = midjourney_task_id
+
+        # 添加后台任务轮询状态
+        def poll_task_status_background(task_id, midjourney_task_id):
+            max_retries = 1000
+            retry_count = 0
+            retry_interval = 5  # 5秒
+
+            while retry_count < max_retries:
+                try:
+                    # 查询任务状态
+                    result = Txt2Img.query_task_status(midjourney_task_id)
+
+                    # 更新任务状态
+                    if result.get("status") == "SUCCESS":
+                        TASK_STATUS[task_id] = {
+                            "status": "completed",
+                            "image_url": result.get("imageUrl"),
+                            "progress": 100,
+                            "error": None,
+                            "midjourney_task_id": midjourney_task_id
+                        }
+                        logger.info(f"任务 {task_id} 完成，图片URL: {result.get('imageUrl')}")
+                        break
+                    elif result.get("status") == "FAILED":
+                        TASK_STATUS[task_id] = {
+                            "status": "failed",
+                            "image_url": None,
+                            "progress": 0,
+                            "error": result.get("errorMsg", "未知错误"),
+                            "midjourney_task_id": midjourney_task_id
+                        }
+                        logger.error(f"任务 {task_id} 失败: {result.get('errorMsg', '未知错误')}")
+                        break
+                    else:
+                        # 更新进度
+                        progress = result.get("progress", 0)
+                        TASK_STATUS[task_id]["progress"] = progress
+                        TASK_STATUS[task_id]["status"] = "processing"
+                        logger.info(f"任务 {task_id} 处理中，进度: {progress}%")
+
+                    # 增加重试计数
+                    retry_count += 1
+
+                    # 等待重试间隔
+                    time.sleep(retry_interval)
+
+                except Exception as e:
+                    logger.error(f"轮询任务 {task_id} 状态失败: {str(e)}")
+                    TASK_STATUS[task_id]["error"] = str(e)
+                    time.sleep(retry_interval)
+
+            if retry_count >= max_retries:
+                logger.error(f"任务 {task_id} 超时")
+                TASK_STATUS[task_id] = {
+                    "status": "failed",
+                    "image_url": None,
+                    "progress": 0,
+                    "error": "任务处理超时",
+                    "midjourney_task_id": midjourney_task_id
+                }
+
+        # 使用线程运行后台任务
+        thread = threading.Thread(target=poll_task_status_background, args=(task_id, midjourney_task_id))
+        thread.daemon = True
+        thread.start()
+
         return {"task_id": task_id}
     except Exception as e:
         logger.error(f"提交文生图请求失败: {str(e)}")
diff --git a/dsLightRag/Routes/__pycache__/Ggb.cpython-310.pyc b/dsLightRag/Routes/__pycache__/Ggb.cpython-310.pyc
index a5d2575df3e4e1da019e868799809b4e28ef636c..8159237ec646aa13ea3d1b634efa434e187daa7d 100644
GIT binary patch
delta 1393
zcmZ`(-)kII6u#%q@0s1nHrcFkv+AbAm}#5DrcEkAd<xot7BR)xc`22<t||LN@5~ar
zY~0l?b_IhCBZwx!T?9dWD56Ng;*0-)k1~Sz5Tb8+@kOo0bMNY6k?ykJeD|Dt&iU@S
zbN09U4zq4GnY0OhzWed>mxo5T-5lK9K0eiilHx0jFj`W}ny;00UoRWJ0R(MI$t+vG
zCAnI%%Z~3zu9Xtyq@R>rNACJVKnfZ&m{|m7ZBai}pxq;d;U4%Sg;Y1q>>e<uV7x?G
zf+er2ZSY5>-Nh~cIEGkCI^6B}X9&Lh22QKVEb5JwAmpCPhojrtI3%Jm{VYsIm-LqF
z>HI;tp;!p{WOS%cEYIMY9~a;Wm=<shAvSQ&#bWWr3@(B(1lpq11s4+F;*<WR>Iq0t
zdxp<N=Z(2$@CojD1L`9U(j`5zg6%j<HlYDsV9<lNiDVQRtdUAqB_X{s3q*V|LK#HR
z1|38QCL=D83T%)L3C@HnQ<%!ME&3*OAb2X&LcMGB$jLS)4$ZE`^bYKhJq!bKja&ol
zAa?nxxv7M9Lur#XtP;;U7pJ2yjI<luK_Lj%tCfrEj3=Xy4R6N9bJQjg4t75~c=!7L
zw>$f{KK%8@-pcaft#^KT@1ujx_5GV)9lZbb%JNb^`rgPkp9MTQt$$E|CL}_8hwR|%
zA!IORPZL5ydReMw`mU6-MR&;ac=Ax~YRu|EzgxK0JEQ|`I#248r(_4$$R_rOKi$vJ
zKrgd*6>+3Nj;7Hd%n|R&mh%6UuTC!#Z1@Z|+`Q5Nyb>Vw2^4BE7dry&LAPXy|Jbn9
z(A{#^$ORO&39myX-G6T2wY;#_KVJd^Qg;V1vWmrJ;(K`S<=Y_Mk?4dqm98c5D)Q6+
z-oaA-5AdSrtoi9-v_Hv55c&NGp2ANFF3kL-fKi0=JQM9$xdo4MF&ff=e0;zio)i25
z0b(}zLjooQ9F2am#^>{bir1l^;9+E#U`iMsLHLyNM+KJ^<p>>%rtJLuWi$q2kZ4PV
zF&LvM$S5jgad=WdTl$}_k%n0?Tl5b7J?GFni_vTLV@=QLt2iNY%Bpfe6|oehW3^UW
zXR#*mw3Hqj8<%)xy;9^F`f=<Xv3FL03|$mV3R@6NNa7~KD*l3_2y(8eEhl@ym4x0_
zjRdGl0=1$gBLlolUz+GmY?P|Sq9}R>S5ek^Ye}>*R$r;&f6pA!eo0xk-xc9DA1_x~
UtyFjd2ZjWB1e2H${ov&O24Lte;s5{u

delta 1161
zcmaKr-)q!Z6vywm$t0OfCLMRCwp4d_>R>gtqK-chDY8%Mz6h)C7K3Goy=fdbGh^>0
z7E9}lR#4D_-8|NX78bM%iwnXcDEQ!?uy1)1vD!Bu6hvf;=cc$S6%+1<?>+b2latH$
zzU+D3Wj3-|o#0dY_qQ{J{H(bV{+{jcYf)dS$+lce*{PahD?k`wlCRb@TT8U;r)#>c
zCpzV4YKCnjT0xz)O(3q!RHk{r(lgZVaOr%`UAF-CH*Uv#p6Ls~GOjX8nZdGG<Y}-A
zN!<Jp*I5V4B@5Zvr%&M3y~nUewl-j&vD6H>CG$LLJN?u7v14vC^n*Axawe?*8iTtC
zJR232BT$N}O50pi`1i>+&kgwI=#A35X$Q{vfWS5ZOQ0VStC&;qywjc00ks!)MW@sq
zMQ-4Vr5=q7btee9<5zsA?uCx$Rz_-!o6)dlwK_0o1jqjmMJ0|kkD@sUgj}K%Hzy7U
zWF8n?BXi_;x&S}|dRAhTNld;)S&At$bdLN&FfPxhn7RNz;;|nQbLASDhBBEb?M@;?
zWQt4@erR?7WQ(jRpiUB|u{6_Xq_yS7O8dwVsSn5`&@O~Prm&TXA~u(1nLwX}Y51%`
z<I`vrK5cY}oWzD&Q*aULd4`29!Z?g$@uagXOMjlu$nmePeR<b7vCN}k5s!1}VSDNJ
z^%svGEZ?17zWV2jEB`Ft{cHJ7^n;#`hV^nwnBovGAbF3#dc+Cdg$zY-b>s6JSD!uj
zW9i}LrTg~}6uB@J--xg>{9B>F6A+%^MS)EMB}CjAaHrn%oxrUG4dIhY7*u`UD-t#*
zSxK!vlosV%L}V)h4OtdCF<XE1bEa5!aNZPi+Lj>)-82UUNrrAPQPH;Y&QuF909u=_
z(6>Dqx>AmAXZE-FcHDyA&xmq61rjUo6Dp~`S14g+t|5-$Xm%rLn^KdSU|@X{=zp?e
zfI;>3NtV^Q`m^FcW7ThXUbXJU>ZsEUoO4w!oXjNwIl5zvoe)P9%jX(+3wMcV^4*U}
l?vXZFYp~FF52Eo&Q=F$pG!SoriZ9~;Q_>|(&Ve>qfcKJm|BC<s

diff --git a/dsLightRag/Routes/__pycache__/MjRoute.cpython-310.pyc b/dsLightRag/Routes/__pycache__/MjRoute.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3ffd6196785c36ed2d086f6c59b3271c6d14134f
GIT binary patch
literal 4059
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
YDk*wNl2YQzHl;)9(7VlUlC;z0zwzF1!T<mO

literal 0
HcmV?d00001

diff --git a/dsLightRag/Suno/__pycache__/sunoUtil.cpython-310.pyc b/dsLightRag/Suno/__pycache__/sunoUtil.cpython-310.pyc
index 538feb8a610fd2f4957fb6fcaf9c2a43a8377ab0..895bb75f8c8e7237056403cd9a6f14cf8f5c8924 100644
GIT binary patch
delta 170
zcmZqC`K!&F&&$ij00e4(R%a~S$eYBN<_6@YGDI<^Fhnt>GH0>OW=LV2%M`^5WitWU
zY$?o9>?tf!94V|RY%L5?oGH9194VYFj8R-ETq)c@5$+V8U<OUTA~v95Rf77(rFr@K
zWk&kxsd=eIi6yC3yqiBV8VND-OjZ$56=4P{y2a-n5aQ<)@8lTl8Xp?uGucDLotcM`
KXY(YHB1QnKttp-W

delta 178
zcmeyX-J-*r&&$ij00irgEz6j<kvEC4-VDe~Wr$)-VTfW%VT@u<VTxi&VUA)=VToc(
zVNGFcVTfW+;Z5O4;cQ`y;z;32;RcFurtkzaXz~@Y0X0{tXOxr_6kF-*r{^aYWa_0C
zl;kDpC1&aum*(Z`ml^4&r{<*=C6=UCDPvK{3{<)KDx;AQBiCdO5!J~~B5uqqj4YeG
HMT!^!8AULS

diff --git a/dsLightRag/Util/__pycache__/GGBUtil.cpython-310.pyc b/dsLightRag/Util/__pycache__/GGBUtil.cpython-310.pyc
index 64f93af38a195885201733141e2026eb91c96bfa..96e76fee36da940b3db9e5e59d9a29d36386d945 100644
GIT binary patch
delta 1751
zcmZ8hZ)_Ar6rY*h+wSe%?OpFmp=hwZsCW<vv{DE`2x1Bi0slZmF5=~2w%04yyJL2j
zKg}M!auo~~urB@yr3gk4qoHCkt^BcHjPa9+AJljs^aH))8cZ<Zg9#Dz&7K9qB>S5;
z@6CI^x9`o&2W>yCQ!_rFf?(YF?eos2g@fwj`2E58tD{L2_fS{VOC?R{Ahd?c{bJNd
z-BjsEQI&eA7iK^8X#udR)DPBL%}oP432UddGziw9hE9jHU;&-M7*V{*`68jg%Zpu8
zoO1By&k~=RVt<d@LIDtU8GsNX5G?(}yrWN$aUzt*E{+z(+aBCw{}}icd+l?zBXg>b
z+}i_C^d&T7ZDRYHOm}xYO=sJBaAhw6!}Rcjz&EY|rG5b;)JH6Apxv0c6UaaoUg2N^
z$`Oilf`JWU5kv4Giryp*sDKOj1+?vn*GW!<&y|xbff7TsNC8{oEHs3uV7UOr2fAKI
zDFM2M-AhqU*frY{U?o|6d(E(ztLe!at^&%*mfR(E)pW^Jrf#c-Dkn(-^AaBs+982;
zDCefWoI=%{$8tBLp4Jvey9MREmbc4I{SBx~$@vVA<)eWDVS6oKmzVaUokCT76=Ae%
z8z_BL1>GS_p*|C_LxxIg3%oa;oWiZlwje~850Z7}s$VOzJnT!0oc3EFbr9ao>R%ed
zPLX{EmH_p0EmX{@<Q7P86Y8x_A~I_C{en?W#i(Z%PzH^lr55lI8iwKldFa8K6K+9U
z!9Az$S9y@Cv<L4&k-ClMa_FGa2xIcf*~#&@%O8%EPv$EVgEvm}mqxy+j0~5K9xNUE
z>ekhP$!~|YO<p@)I(DFvFWkC%!tpYF;D6)z`SM$1rNL{HS3YU%A<G+0e(;pFT4t@b
zoyE%ohpGleF&BZMGBP$fei_K7hCc?H%DKMs#RE5ve`Nn2st=zCn}5KbuoL}y{+;sZ
z`EviU>-oWH#>Mu9y7?`T&lKc&uCFq2yfkzQjFaQ}@)u{y`A<t12FmYUs*+9(9lV}D
z;KXXS|E=p-*3+;dlS%8H8DqivWOs7G`sM}gY29Gv4ukPuVJg68Rtwn1>bU|AHexgE
zKWEHc87lg9P1lo|bgVO}8yU8*=+@F^x5nazR+O2xTVuLLi=GXuUyH44-?aI~SGE>~
zl$K^*2x1>;nr*k#hkA=rJe$?hv?ydVS=PkkhXEq~VqH3Jm@J-(rQ+#?8Bb`j9o@93
zOp_*Q)c-$mjA=VEjOtN!T9IX$?yOP7$*64V8snbPnnYqd7ub`W<S7nMqh7$dAVz&1
zW-0}N^ej|FW6yB&91al<kGuu}gT>Q&3Vt+ZWMU9^KWx%p0w8%=l(8&`LfG{z4iF+q
zM26Q!!32Bnijs%}*o*6kf`fvLMI4qulrhPZ+hRb)URbF_x}(ZLJO|5pa*r(;otU`@
zV|nziSzdYOQl3pKKv6JRDni&YM`4GWF5y=Dho*U+hf=lgHa&*Fvm3(C;Z^p{`nkQ$
zu(=POC5kC25V-07`!^j~&{zXo@X%0^x{e5NrKMKqqD7>QW*vBz4<BA#dUxRY%EYPi
z(X*AW$I8QJqX9$Hjo5Tk7B{yz2W4}F6b0T@S4Ya!J0Z^{5TKnk0!A?7H{#Kns!pK$
zg@xOUbbeAuzMhC!g%U~k*c$F%$Cle~gkRpff=8LpVIc>;na$(CxtvqPR&j|t6$NId
vAEI=s<h<<iitY?GQ`$;?w)I8;8OhKHFK-6)5x9x0$W(2U+hrV(#lQapdynVn

delta 1301
zcmZ`&TTC2P7(VCBvO9YlE^@1_xNH;a79`wS6RmBi2{bjKF|C@^hi1tcAaq&c*%=eb
zZdh0@3j(qZwiQYPQ7&oaCLqYttWU;Q9}LO9__8xQ#0MUHGqv%b*|zD6lgu~&{Fm>)
zod5iO<!-ak<90g`Jcqw6bzZ7U2&eE^qN=Ht=80T8p;l@ewA^%3p4tb|O&4`gCw$$a
zow{xlc7eL70RMuB=JQ1%h88eJG+!)$$O2jjk%bgrN4}!OuXTwhe^~91huM`w-293Q
z#1Ica2;m5}K4H$STCzttb#i9wFU#Lf{EzZy!69}kyM^l&xj-Y@s5R~G5T%xmw)cCw
zyZu30stgugR2oU8CyZthC39Q^_kJLu7>bZE>B3#4i=!O1gs~!%sy+*KoIqW95vybk
zTd6Zf*t=nCmyPnbxt#Pd!ss&(=y+(7V^_l#YL^kaD%q(!W;AGxSPW~<?>zbhQT{rz
zAj$E?=NLt781<HeuOK<Ywiup8bHt3w&;2W}bEo^7pbK?lSRZ+q9sEgOU)5Kl+W1H&
z`F%E()YlVQe5yt4X%X9)Kc_yL9X>vYs|N$x>SA^@uHFCP_+V6S1{Q}09({cm*fPn*
z%-)y($C=sNf5F*j<}yiVOaiYgV}!h>oMT+-*ER=^4|3+Z8c!xUq^G9U*#|F3OpfD&
z@yy<YIzFUMJ<24LnaAJg%ikT1jA_wj?aqk0de>yDukqyiP*X!k3rSUJD>?OsX=woF
z)SNcn|E&GBsJ7j&-J8rVteN&kWwWHc?_7;1JH4XCceSsk)c8hrW>6i9Ww+-cyS6^9
zE)8S{er~GH?x(c1ou<p#)lo1U#UAU+!_c+5`=h#gPrbjAt5sj>KN^|P?rf;>Sv9$D
zjL*!(jE!V&0|bB@tPrrZnZaCm#7Yc(sdBCK4Ci7_WwW%lf>jziFMy9v7YF^4%>02{
z0e`SV_IHTNwX*V)>`lX^!T_HEFRihXC@ZP#1!brafJEUE5dJA~SqTr<!GQ^O{cEu*
z^F^=WYUNw+nZ8<Z>&FtJIEL#{Z+-)!=nCv!1cebRmT(w0-`MgA4z@S%JXqo4<+aMi
z5T}ieHK|{ZU)EC(w8=$%XIGnBWTjxZ;Uj5I4AOL7dq56#`UtBAE%N~QFe@<RXEoP=
zXx=?R5<}80iTQ(}fL{`Kz$avkjzo*G1q+x&txs9)7A~*F*tS)F!o`=>8$5LYX-;MV
zNYY>`l#eR6ah>Auo^`%Fm`mQ1_!s3<?|b|^;N~l0=al&A4?EvBVw?t?HNdRXm`R#r
ya?m^mX81p^_qk-&%wOp4p>jaH2#1M6uLAIh$1dW6*TD&dckq;dix*tBBFld}2ddrx

diff --git a/dsLightRag/static/mj.html b/dsLightRag/static/Midjourney/mj.html
similarity index 53%
rename from dsLightRag/static/mj.html
rename to dsLightRag/static/Midjourney/mj.html
index 0492ac14..e9d0df9a 100644
--- a/dsLightRag/static/mj.html
+++ b/dsLightRag/static/Midjourney/mj.html
@@ -359,367 +359,430 @@
         </div>
     </footer>
 
-    <!-- JavaScript -->
     <script>
-        // DOM 元素
-        const themeToggle = document.getElementById('themeToggle');
-        const menuToggle = document.getElementById('menuToggle');
-        const mobileMenu = document.getElementById('mobileMenu');
-        const textToImageTab = document.getElementById('textToImageTab');
-        const imageToImageTab = document.getElementById('imageToImageTab');
-        const textToImagePanel = document.getElementById('textToImagePanel');
-        const imageToImagePanel = document.getElementById('imageToImagePanel');
-        const imageUploadArea = document.getElementById('imageUploadArea');
-        const imageUpload = document.getElementById('imageUpload');
-        const browseImage = document.getElementById('browseImage');
-        const imagePreview = document.getElementById('imagePreview');
-        const previewImage = document.getElementById('previewImage');
-        const removeImage = document.getElementById('removeImage');
-        const imageStrength = document.getElementById('imageStrength');
-        const strengthValue = document.getElementById('strengthValue');
-        const generateBtn = document.getElementById('generateBtn');
-        const statusSection = document.getElementById('statusSection');
-        const progressBar = document.getElementById('progressBar');
-        const progressText = document.getElementById('progressText');
-        const resultSection = document.getElementById('resultSection');
-        const resultImage = document.getElementById('resultImage');
-        const downloadBtn = document.getElementById('downloadBtn');
-        const regenerateBtn = document.getElementById('regenerateBtn');
-        const variationBtn = document.getElementById('variationBtn');
-        const upscaleBtn = document.getElementById('upscaleBtn');
-        const clearHistoryBtn = document.getElementById('clearHistoryBtn');
-        const historyGrid = document.getElementById('historyGrid');
-
-        // 初始化主题
-        if (localStorage.getItem('theme') === 'dark' || (!localStorage.getItem('theme') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-            document.documentElement.classList.add('dark');
-        } else {
-            document.documentElement.classList.remove('dark');
-        }
-
-        // 主题切换
-        themeToggle.addEventListener('click', () => {
-            if (document.documentElement.classList.contains('dark')) {
-                document.documentElement.classList.remove('dark');
-                localStorage.setItem('theme', 'light');
-            } else {
+        document.addEventListener('DOMContentLoaded', function() {
+            // 主题切换功能
+            const themeToggle = document.getElementById('themeToggle');
+            themeToggle.addEventListener('click', function() {
+                document.documentElement.classList.toggle('dark');
+                localStorage.setItem('theme', document.documentElement.classList.contains('dark') ? 'dark' : 'light');
+            });
+    
+            // 检查本地存储的主题偏好
+            if (localStorage.getItem('theme') === 'dark' || (!localStorage.getItem('theme') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
                 document.documentElement.classList.add('dark');
-                localStorage.setItem('theme', 'dark');
             }
-        });
-
-        // 移动端菜单
-        menuToggle.addEventListener('click', () => {
-            mobileMenu.classList.toggle('hidden');
-        });
-
-        // 选项卡切换
-        textToImageTab.addEventListener('click', () => {
-            textToImageTab.classList.add('text-primary', 'border-primary');
-            textToImageTab.classList.remove('text-gray-500', 'dark:text-gray-400', 'border-transparent');
-            imageToImageTab.classList.remove('text-primary', 'border-primary');
-            imageToImageTab.classList.add('text-gray-500', 'dark:text-gray-400', 'border-transparent');
-            textToImagePanel.classList.remove('hidden');
-            imageToImagePanel.classList.add('hidden');
-        });
-
-        imageToImageTab.addEventListener('click', () => {
-            imageToImageTab.classList.add('text-primary', 'border-primary');
-            imageToImageTab.classList.remove('text-gray-500', 'dark:text-gray-400', 'border-transparent');
-            textToImageTab.classList.remove('text-primary', 'border-primary');
-            textToImageTab.classList.add('text-gray-500', 'dark:text-gray-400', 'border-transparent');
-            textToImagePanel.classList.add('hidden');
-            imageToImagePanel.classList.remove('hidden');
-        });
-
-        // 图片上传
-        browseImage.addEventListener('click', () => {
-            imageUpload.click();
-        });
-
-        imageUploadArea.addEventListener('click', (e) => {
-            if (e.target === imageUploadArea || e.target === browseImage || e.target.parentNode === browseImage) {
+    
+            // 移动端菜单切换
+            const menuToggle = document.getElementById('menuToggle');
+            const mobileMenu = document.getElementById('mobileMenu');
+            menuToggle.addEventListener('click', function() {
+                mobileMenu.classList.toggle('hidden');
+            });
+    
+            // 选项卡切换
+            const textToImageTab = document.getElementById('textToImageTab');
+            const imageToImageTab = document.getElementById('imageToImageTab');
+            const textToImagePanel = document.getElementById('textToImagePanel');
+            const imageToImagePanel = document.getElementById('imageToImagePanel');
+    
+            textToImageTab.addEventListener('click', function() {
+                textToImageTab.classList.add('text-primary', 'border-primary');
+                textToImageTab.classList.remove('text-gray-500', 'border-transparent');
+                imageToImageTab.classList.remove('text-primary', 'border-primary');
+                imageToImageTab.classList.add('text-gray-500', 'border-transparent');
+                textToImagePanel.classList.remove('hidden');
+                imageToImagePanel.classList.add('hidden');
+            });
+    
+            imageToImageTab.addEventListener('click', function() {
+                imageToImageTab.classList.add('text-primary', 'border-primary');
+                imageToImageTab.classList.remove('text-gray-500', 'border-transparent');
+                textToImageTab.classList.remove('text-primary', 'border-primary');
+                textToImageTab.classList.add('text-gray-500', 'border-transparent');
+                imageToImagePanel.classList.remove('hidden');
+                textToImagePanel.classList.add('hidden');
+            });
+    
+            // 图生图相关功能
+            const browseImage = document.getElementById('browseImage');
+            const imageUpload = document.getElementById('imageUpload');
+            const imageUploadArea = document.getElementById('imageUploadArea');
+            const imagePreview = document.getElementById('imagePreview');
+            const previewImage = document.getElementById('previewImage');
+            const removeImage = document.getElementById('removeImage');
+            const imageStrength = document.getElementById('imageStrength');
+            const strengthValue = document.getElementById('strengthValue');
+    
+            browseImage.addEventListener('click', function() {
                 imageUpload.click();
-            }
-        });
-
-        imageUpload.addEventListener('change', (e) => {
-            const file = e.target.files[0];
-            if (file) {
-                const reader = new FileReader();
-                reader.onload = (event) => {
-                    previewImage.src = event.target.result;
-                    imagePreview.classList.remove('hidden');
-                    imageUploadArea.classList.add('hidden');
-                };
-                reader.readAsDataURL(file);
-            }
-        });
-
-        removeImage.addEventListener('click', () => {
-            previewImage.src = '';
-            imagePreview.classList.add('hidden');
-            imageUploadArea.classList.remove('hidden');
-            imageUpload.value = '';
-        });
-
-        // 拖放上传
-        imageUploadArea.addEventListener('dragover', (e) => {
-            e.preventDefault();
-            imageUploadArea.classList.add('border-primary', 'bg-primary/5');
-        });
-
-        imageUploadArea.addEventListener('dragleave', () => {
-            imageUploadArea.classList.remove('border-primary', 'bg-primary/5');
-        });
-
-        imageUploadArea.addEventListener('drop', (e) => {
-            e.preventDefault();
-            imageUploadArea.classList.remove('border-primary', 'bg-primary/5');
-            const file = e.dataTransfer.files[0];
-            if (file && file.type.startsWith('image/')) {
-                const reader = new FileReader();
-                reader.onload = (event) => {
-                    previewImage.src = event.target.result;
-                    imagePreview.classList.remove('hidden');
-                    imageUploadArea.classList.add('hidden');
-                };
-                reader.readAsDataURL(file);
-            }
-        });
-
-        // 强度滑块
-        imageStrength.addEventListener('input', () => {
-            strengthValue.textContent = imageStrength.value;
-        });
-
-        // 生成图像
-        generateBtn.addEventListener('click', async () => {
-            // 验证输入
-            let prompt, style, aspectRatio, quality;
-            let base64Array = null;
-
-            if (textToImagePanel.classList.contains('hidden')) {
-                // 图生图
-                prompt = document.getElementById('imagePrompt').value.trim();
-                style = document.getElementById('imageStyle').value;
-                aspectRatio = document.getElementById('imageAspectRatio').value;
-
-                if (!prompt) {
-                    alert('请输入提示词');
-                    return;
+            });
+    
+            imageUploadArea.addEventListener('dragover', function(e) {
+                e.preventDefault();
+                imageUploadArea.classList.add('border-primary');
+            });
+    
+            imageUploadArea.addEventListener('dragleave', function() {
+                imageUploadArea.classList.remove('border-primary');
+            });
+    
+            imageUploadArea.addEventListener('drop', function(e) {
+                e.preventDefault();
+                imageUploadArea.classList.remove('border-primary');
+                if (e.dataTransfer.files.length) {
+                    imageUpload.files = e.dataTransfer.files;
+                    handleImageUpload();
                 }
-
-                if (imageUploadArea.classList.contains('hidden')) {
-                    // 有上传图片
-                    const canvas = document.createElement('canvas');
-                    const ctx = canvas.getContext('2d');
-                    const img = new Image();
-                    img.src = previewImage.src;
-
-                    await new Promise((resolve) => {
-                        img.onload = resolve;
-                    });
-
-                    canvas.width = img.width;
-                    canvas.height = img.height;
-                    ctx.drawImage(img, 0, 0);
-                    const base64 = canvas.toDataURL('image/jpeg', 0.8);
-                    base64Array = [base64.split(',')[1]]; // 只取base64部分
-                } else {
-                    alert('请上传参考图片');
-                    return;
-                }
-            } else {
-                // 文生图
-                prompt = document.getElementById('prompt').value.trim();
-                style = document.getElementById('style').value;
-                aspectRatio = document.getElementById('aspectRatio').value;
-                quality = document.getElementById('quality').value;
-
-                if (!prompt) {
-                    alert('请输入提示词');
-                    return;
+            });
+    
+            imageUpload.addEventListener('change', handleImageUpload);
+    
+            function handleImageUpload() {
+                if (imageUpload.files && imageUpload.files[0]) {
+                    const reader = new FileReader();
+                    reader.onload = function(e) {
+                        previewImage.src = e.target.result;
+                        imagePreview.classList.remove('hidden');
+                    };
+                    reader.readAsDataURL(imageUpload.files[0]);
                 }
             }
-
-            // 显示状态区域
-            statusSection.classList.remove('hidden');
-            resultSection.classList.add('hidden');
-            progressBar.style.width = '0%';
-            progressText.textContent = '0%';
-
-            try {
-                // 提交生成请求
-                const response = await fetch('/api/mj/imagine', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify({
-                        prompt: prompt,
-                        base64_array: base64Array,
-                        notify_hook: null
-                    })
-                });
-
-                if (!response.ok) {
-                    throw new Error('提交请求失败');
+    
+            removeImage.addEventListener('click', function() {
+                imagePreview.classList.add('hidden');
+                imageUpload.value = '';
+            });
+    
+            imageStrength.addEventListener('input', function() {
+                strengthValue.textContent = this.value;
+            });
+    
+            // 生成按钮点击事件
+            const generateBtn = document.getElementById('generateBtn');
+            generateBtn.addEventListener('click', generateImage);
+    
+            // 重新生成按钮点击事件
+            const regenerateBtn = document.getElementById('regenerateBtn');
+            regenerateBtn.addEventListener('click', function() {
+                // 隐藏结果区域
+                document.getElementById('resultSection').classList.add('hidden');
+                // 显示状态区域
+                document.getElementById('statusSection').classList.remove('hidden');
+                // 重新生成
+                generateImage();
+            });
+    
+            // 放大按钮点击事件
+            const upscaleBtn = document.getElementById('upscaleBtn');
+            upscaleBtn.addEventListener('click', function() {
+                alert('图像放大功能即将实现');
+            });
+    
+            // 变体按钮点击事件
+            const variationBtn = document.getElementById('variationBtn');
+            variationBtn.addEventListener('click', function() {
+                alert('生成变体功能即将实现');
+            });
+    
+            // 下载按钮点击事件
+            const downloadBtn = document.getElementById('downloadBtn');
+            downloadBtn.addEventListener('click', function() {
+                const resultImage = document.getElementById('resultImage');
+                const link = document.createElement('a');
+                link.href = resultImage.src;
+                link.download = 'midjourney-image.png';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            });
+    
+            // 清除历史记录按钮点击事件
+            const clearHistoryBtn = document.getElementById('clearHistoryBtn');
+            clearHistoryBtn.addEventListener('click', function() {
+                if (confirm('确定要清除所有历史记录吗？')) {
+                    localStorage.removeItem('mjHistory');
+                    updateHistoryGrid();
                 }
-
-                const data = await response.json();
-                const taskId = data.task_id;
-
-                // 轮询任务状态
-                let progress = 0;
-                const intervalId = setInterval(async () => {
-                    try {
-                        const statusResponse = await fetch(`/api/mj/task_status?task_id=${taskId}`);
-                        const statusData = await statusResponse.json();
-
-                        // 更新进度
-                        if (statusData.progress !== undefined) {
-                            progress = statusData.progress;
-                            progressBar.style.width = `${progress}%`;
-                            progressText.textContent = `${progress}%`;
-                        }
-
-                        // 检查是否完成
-                        if (statusData.status === 'completed') {
-                            clearInterval(intervalId);
-                            progressBar.style.width = '100%';
-                            progressText.textContent = '100%';
-
-                            // 延迟显示结果，让用户看到进度完成
-                            setTimeout(() => {
-                                statusSection.classList.add('hidden');
-                                resultSection.classList.remove('hidden');
-                                resultImage.src = statusData.image_url || 'https://picsum.photos/seed/result/800/600';
-
-                                // 保存到历史记录
-                                saveToHistory({
-                                    id: taskId,
-                                    imageUrl: statusData.image_url || 'https://picsum.photos/seed/result/800/600',
-                                    prompt: prompt,
-                                    timestamp: new Date().toISOString()
-                                });
-                                updateHistoryDisplay();
-                            }, 1000);
-                        } else if (statusData.status === 'failed') {
-                            clearInterval(intervalId);
-                            alert(`生成失败: ${statusData.error || '未知错误'}`);
-                            statusSection.classList.add('hidden');
-                        }
-                    } catch (error) {
-                        console.error('轮询任务状态失败:', error);
+            });
+    
+            // 生成图像函数
+            async function generateImage() {
+                let prompt, base64Array = null;
+    
+                // 检查是文生图还是图生图
+                if (!textToImagePanel.classList.contains('hidden')) {
+                    // 文生图
+                    prompt = document.getElementById('prompt').value.trim();
+                    if (!prompt) {
+                        alert('请输入提示词');
+                        return;
                     }
-                }, 3000); // 每3秒轮询一次
-            } catch (error) {
-                console.error('生成图像失败:', error);
-                alert(`生成图像失败: ${error.message}`);
-                statusSection.classList.add('hidden');
+                } else {
+                    // 图生图
+                    prompt = document.getElementById('imagePrompt').value.trim();
+                    if (!prompt) {
+                        alert('请输入提示词');
+                        return;
+                    }
+    
+                    if (!imageUpload.files || !imageUpload.files[0]) {
+                        alert('请上传参考图片');
+                        return;
+                    }
+    
+                    // 转换图片为base64
+                    const reader = new FileReader();
+                    reader.onload = function(e) {
+                        base64Array = [e.target.result.split(',')[1]];
+                        submitGenerateRequest(prompt, base64Array);
+                    };
+                    reader.readAsDataURL(imageUpload.files[0]);
+                    return;
+                }
+    
+                // 提交生成请求
+                submitGenerateRequest(prompt, base64Array);
             }
-        });
-
-        // 下载图片
-        downloadBtn.addEventListener('click', () => {
-            const link = document.createElement('a');
-            link.href = resultImage.src;
-            link.download = `midjourney_${new Date().getTime()}.png`;
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        });
-
-        // 重新生成
-        regenerateBtn.addEventListener('click', () => {
-            generateBtn.click();
-        });
-
-        // 生成变体
-        variationBtn.addEventListener('click', () => {
-            alert('变体功能将在下一版本推出');
-        });
-
-        // 放大图像
-        upscaleBtn.addEventListener('click', () => {
-            alert('放大功能将在下一版本推出');
-        });
-
-        // 历史记录
-        function saveToHistory(item) {
-            let history = JSON.parse(localStorage.getItem('midjourneyHistory') || '[]');
-            history.unshift(item); // 添加到开头
-            // 限制最多100条记录
-            if (history.length > 100) {
-                history = history.slice(0, 100);
+    
+            // 提交生成请求函数
+            async function submitGenerateRequest(prompt, base64Array) {
+                try {
+                    // 禁用生成按钮
+                    generateBtn.disabled = true;
+                    generateBtn.innerHTML = '<i class="fa fa-spinner fa-spin mr-2"></i>正在提交...';
+    
+                    // 准备请求数据
+                    const requestData = {
+                        prompt: prompt,
+                        base64_array: base64Array
+                    };
+    
+                    // 发送请求
+                    const response = await fetch('/api/mj/imagine', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify(requestData)
+                    });
+    
+                    if (!response.ok) {
+                        throw new Error(`提交请求失败: ${response.statusText}`);
+                    }
+    
+                    const data = await response.json();
+                    const taskId = data.task_id;
+    
+                    // 显示状态区域
+                    document.getElementById('statusSection').classList.remove('hidden');
+    
+                    // 开始轮询任务状态
+                    pollTaskStatus(taskId, prompt);
+                } catch (error) {
+                    console.error('生成图像失败:', error);
+                    alert(`生成图像失败: ${error.message}`);
+                    // 恢复生成按钮
+                    generateBtn.disabled = false;
+                    generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+                }
             }
-            localStorage.setItem('midjourneyHistory', JSON.stringify(history));
-        }
-
-        function updateHistoryDisplay() {
-            const history = JSON.parse(localStorage.getItem('midjourneyHistory') || '[]');
-            if (history.length === 0) {
-                historyGrid.innerHTML = `
-                    <div class="col-span-full text-center py-12 text-gray-500 dark:text-gray-400">
-                        <i class="fa fa-history text-4xl mb-4"></i>
-                        <p>暂无历史记录</p>
-                        <p class="text-sm mt-2">开始生成图像以保存到历史记录</p>
-                    </div>
-                `;
-                return;
+    
+            // 轮询任务状态函数
+            function pollTaskStatus(taskId, prompt) {
+                // 轮询配置
+                const queryInterval = 3000;  // 3秒查询一次
+                const maxQueries = 120;      // 最多查询120次（6分钟）
+                let queryCount = 0;          // 当前查询次数
+                const startTime = new Date().getTime();  // 开始时间
+                let timerId = null;  // 用于存储setTimeout的ID
+    
+                function checkTaskStatus() {
+                    if (queryCount >= maxQueries) {
+                        const elapsedTime = Math.round((new Date().getTime() - startTime) / 1000);
+                        document.getElementById('statusMessage').innerHTML = `<i class="fa fa-exclamation-circle"></i> 图像生成超时（已等待${elapsedTime}秒），您可以稍后在历史记录中查看，或重新生成。`;
+                        document.getElementById('progressText').textContent = '生成超时';
+                        // 恢复生成按钮
+                        generateBtn.disabled = false;
+                        generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+                        return;
+                    }
+    
+                    fetch(`/api/mj/task_status?task_id=${taskId}`)
+                        .then(response => response.json())
+                        .then(data => {
+                            queryCount++;
+                            // 更新状态信息
+                            const statusMessage = document.getElementById('statusMessage');
+                            const progressFill = document.getElementById('progressBar');
+                            const progressText = document.getElementById('progressText');
+    
+                            if (data.error) {
+                                statusMessage.innerHTML = `<i class="fa fa-exclamation-circle"></i> 生成失败: ${data.error}`;
+                                statusMessage.style.color = '#ef4444';
+                                // 恢复生成按钮
+                                generateBtn.disabled = false;
+                                generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+                                return;
+                            }
+    
+                            statusMessage.innerHTML = `<i class="fa fa-spinner fa-spin"></i> AI 正在创作中...`;
+    
+                            // 更新进度条
+                            let progress = data.progress || 0;
+                            if (progress > 100) progress = 100;
+    
+                            // 计算已等待时间
+                            const elapsedTime = Math.round((new Date().getTime() - startTime) / 1000);
+                            progressFill.style.width = `${progress}%`;
+                            progressText.textContent = `${Math.round(progress)}%`;
+                            statusMessage.innerHTML += ` (已等待${elapsedTime}秒)`;
+    
+                            // 任务完成
+                            if (data.status === 'completed') {
+                                statusMessage.innerHTML = '<i class="fa fa-check-circle"></i> 图像生成完成！';
+                                statusMessage.style.color = '#10b981';
+    
+                                // 确保进度为100%
+                                progress = 100;
+                                progressFill.style.width = `${progress}%`;
+                                progressText.textContent = `${Math.round(progress)}%`;
+    
+                                // 显示结果
+                                setTimeout(() => {
+                                    showResult(data.image_url, taskId, prompt);
+                                }, 1000);
+    
+                                // 清除定时器
+                                if (timerId) {
+                                    clearTimeout(timerId);
+                                    timerId = null;
+                                }
+                            } else if (data.status === 'failed') {
+                                statusMessage.innerHTML = `<i class="fa fa-exclamation-circle"></i> 生成失败: ${data.error || '未知错误'}`;
+                                statusMessage.style.color = '#ef4444';
+                                // 恢复生成按钮
+                                generateBtn.disabled = false;
+                                generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+                            } else {
+                                // 继续查询
+                                timerId = setTimeout(checkTaskStatus, queryInterval);
+                            }
+                        })
+                        .catch(error => {
+                            console.error('检查任务状态失败:', error);
+                            // 只有在任务未完成且未超时时才继续查询
+                            if (queryCount < maxQueries) {
+                                timerId = setTimeout(checkTaskStatus, queryInterval);
+                            } else {
+                                // 恢复生成按钮
+                                generateBtn.disabled = false;
+                                generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+                            }
+                        });
+                }
+    
+                // 立即检查一次
+                checkTaskStatus();
             }
-
-            historyGrid.innerHTML = '';
-            history.forEach(item => {
-                const date = new Date(item.timestamp);
-                const formattedDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
-
-                const historyItem = document.createElement('div');
-                historyItem.className = 'overflow-hidden rounded-xl shadow-md hover:shadow-xl transition-all-300 group';
-                historyItem.innerHTML = `
-                    <div class="relative">
-                        <img src="${item.imageUrl}" alt="生成的图像" class="w-full h-48 object-cover transition-transform duration-500 group-hover:scale-110">
-                        <div class="absolute inset-0 bg-gradient-to-t from-black/70 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-300 flex items-end p-3">
-                            <button class="view-history-item p-2 bg-white/90 hover:bg-white rounded-full shadow-md transition-all-300" data-id="${item.id}">
+    
+            // 显示结果函数
+            function showResult(imageUrl, taskId, prompt) {
+                // 隐藏状态区域
+                document.getElementById('statusSection').classList.add('hidden');
+    
+                // 显示结果区域
+                const resultSection = document.getElementById('resultSection');
+                resultSection.classList.remove('hidden');
+    
+                // 设置结果图像
+                const resultImage = document.getElementById('resultImage');
+                resultImage.src = imageUrl;
+    
+                // 恢复生成按钮
+                generateBtn.disabled = false;
+                generateBtn.innerHTML = '<i class="fa fa-magic mr-2"></i>生成图像';
+    
+                // 保存到历史记录
+                saveToHistory(taskId, prompt, imageUrl);
+    
+                // 更新历史记录网格
+                updateHistoryGrid();
+            }
+    
+            // 保存到历史记录函数
+            function saveToHistory(taskId, prompt, imageUrl) {
+                let history = JSON.parse(localStorage.getItem('mjHistory') || '[]');
+                history.unshift({
+                    id: taskId,
+                    prompt: prompt,
+                    imageUrl: imageUrl,
+                    timestamp: new Date().getTime()
+                });
+                // 只保留最近20条记录
+                if (history.length > 20) {
+                    history = history.slice(0, 20);
+                }
+                localStorage.setItem('mjHistory', JSON.stringify(history));
+            }
+    
+            // 更新历史记录网格函数
+            function updateHistoryGrid() {
+                const historyGrid = document.getElementById('historyGrid');
+                const history = JSON.parse(localStorage.getItem('mjHistory') || '[]');
+    
+                if (history.length === 0) {
+                    historyGrid.innerHTML = `
+                        <div class="col-span-full text-center py-12 text-gray-500 dark:text-gray-400">
+                            <i class="fa fa-history text-4xl mb-4"></i>
+                            <p>暂无历史记录</p>
+                            <p class="text-sm mt-2">开始生成图像以保存到历史记录</p>
+                        </div>
+                    `;
+                    return;
+                }
+    
+                historyGrid.innerHTML = '';
+                history.forEach(item => {
+                    const date = new Date(item.timestamp);
+                    const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+    
+                    const historyItem = document.createElement('div');
+                    historyItem.className = 'overflow-hidden rounded-xl shadow-md hover:shadow-xl transition-all-300 group bg-white dark:bg-gray-800';
+                    historyItem.innerHTML = `
+                        <div class="relative h-48 overflow-hidden">
+                            <img src="${item.imageUrl}" alt="生成的图像" class="w-full h-full object-cover transition-transform duration-500 group-hover:scale-110">
+                            <div class="absolute inset-0 bg-gradient-to-t from-black/60 to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-300 flex items-end p-4">
+                                <div class="text-white text-sm truncate w-full">${item.prompt}</div>
+                            </div>
+                        </div>
+                        <div class="p-4 flex justify-between items-center">
+                            <span class="text-xs text-gray-500 dark:text-gray-400">${formattedDate}</span>
+                            <button class="view-history-item text-primary hover:text-primary/80 transition-colors" data-image-url="${item.imageUrl}">
                                 <i class="fa fa-eye"></i>
                             </button>
                         </div>
-                    </div>
-                    <div class="p-3 bg-white dark:bg-gray-800">
-                        <p class="text-sm font-medium truncate mb-1">${item.prompt}</p>
-                        <p class="text-xs text-gray-500 dark:text-gray-400">${formattedDate}</p>
-                    </div>
-                `;
-                historyGrid.appendChild(historyItem);
-            });
-
-            // 添加查看历史项的事件监听
-            document.querySelectorAll('.view-history-item').forEach(btn => {
-                btn.addEventListener('click', (e) => {
-                    const id = e.currentTarget.getAttribute('data-id');
-                    const item = history.find(i => i.id === id);
-                    if (item) {
-                        resultImage.src = item.imageUrl;
-                        statusSection.classList.add('hidden');
-                        resultSection.classList.remove('hidden');
-                        // 滚动到结果区域
-                        resultSection.scrollIntoView({ behavior: 'smooth' });
-                    }
+                    `;
+                    historyGrid.appendChild(historyItem);
+                });
+    
+                // 添加历史记录项点击事件
+                document.querySelectorAll('.view-history-item').forEach(button => {
+                    button.addEventListener('click', function() {
+                        const imageUrl = this.getAttribute('data-image-url');
+                        // 显示结果区域
+                        const resultSection = document.getElementById('resultSection');
+                        resultSection.classList.remove('hidden');
+                        // 设置结果图像
+                        const resultImage = document.getElementById('resultImage');
+                        resultImage.src = imageUrl;
+                    });
                 });
-            });
-        }
-
-        // 清除历史记录
-        clearHistoryBtn.addEventListener('click', () => {
-            if (confirm('确定要清除所有历史记录吗？此操作不可恢复。')) {
-                localStorage.removeItem('midjourneyHistory');
-                updateHistoryDisplay();
             }
+    
+            // 初始化历史记录网格
+            updateHistoryGrid();
         });
-
-        // 初始化历史记录显示
-        updateHistoryDisplay();
     </script>
 </body>
 </html>
\ No newline at end of file