From f1a1f808c764babb8829a13d1a1f312fd4b529fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=88=E5=85=86=E5=A2=9E?= <你的邮箱@example.com>
Date: Thu, 7 May 2026 15:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/.env.development                     |   2 +
 frontend/.env.production                      |   2 +
 .../public/file/过鱼设施数据填报操作手册.docx | Bin 308586 -> 312026 bytes
 .../src/api/guoYuSheShiShuJuTianBao/index.ts  |  15 +-
 frontend/src/api/select/index.ts              |   9 +
 frontend/src/components/BasicSearch/index.vue |   2 +-
 frontend/src/components/BasicTable/index.vue  |  11 +
 frontend/src/store/modules/shuJuTianBao.ts    |   1 -
 frontend/src/utils/request.ts                 |   2 +-
 frontend/src/views/login-sjtb/index.vue       |   2 +-
 frontend/src/views/login/index.vue            |   2 +-
 frontend/src/views/register/index.vue         |   9 +-
 .../guoYuSheShiShuJuTianBaoTable.vue          |  43 +-
 .../guoYuSheShiShuJuTianBao/index.vue         | 454 +++++++++++++-----
 .../views/shuJuTianBao/shengPiJiLu/index.vue  |  76 ++-
 frontend/src/views/system/record/index.vue    |   2 +-
 frontend/src/views/system/review/index.vue    |  15 +-
 frontend/src/views/system/role/index.vue      |   2 +-
 18 files changed, 430 insertions(+), 219 deletions(-)

diff --git a/frontend/.env.development b/frontend/.env.development
index 757b577..beab96d 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -7,6 +7,8 @@ VITE_APP_TITLE = '水电水利建设项目全过程环境管理信息平台'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/dev-api'
 ## 开发环境API地址
+# VITE_APP_BASE_URL = 'http://localhost:8093'
 VITE_APP_BASE_URL = 'http://10.84.121.21:8093'
+VITE_APP_BASE_API_URL = 'https://211.99.26.225:12130/prod-api'
 ## 开发环境预览 图片视频地址 
 VITE_APP_PREVIEW_URL = 'https://211.99.26.225:12125'
diff --git a/frontend/.env.production b/frontend/.env.production
index 18d37eb..f6db5aa 100644
--- a/frontend/.env.production
+++ b/frontend/.env.production
@@ -6,5 +6,7 @@ VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/prod-api'
 ## 生产环境API地址
 VITE_APP_BASE_URL = 'http://localhost:8093'
+## 生产环境导入预览地址
+VITE_APP_BASE_API_URL = 'https://211.99.26.225:12130/prod-api'
 ## 生产环境预览 图片视频地址 
 VITE_APP_PREVIEW_URL = 'https://211.99.26.225:12125'
diff --git a/frontend/public/file/过鱼设施数据填报操作手册.docx b/frontend/public/file/过鱼设施数据填报操作手册.docx
index d763b0ee8e6190bd82891e5f0de4d9b2219638d7..f3d2e60dd2a5a716fdc5ed02e8f28eea8fdebfe9 100644
GIT binary patch
delta 13538
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%0DSw~hp<Emy5Xe7t&ivD7@@1fPKj3BE
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
Xg>3}!Krf{7H-Z@8zqY@9Db)W07gE!F

delta 10054
zcmZ9Sbx<5ZyY7+2-4=I;#ogWA9Ts=jKwxnQ?u)wxCs+vX?h+(e2=1By0dBr?PMv$}
z{?YSP^;EwzJ=5J)@9%jxqVP^naZ~sJIU?Z8R3TP)87kgXdsb}0xO7gK3EhzcM~cfy
z-;9{lQel8{x=mc_uBm0(OJh)2M*=F7D7%ohC2U#OLM3FqfPJMV>V4~-56LCy^0dCP
z4*r`C=Ev@3V-NX)tGsi8&E5T~^dY9i;3v=AgQfE(ik_sUDkzO|)tnqJvAtd^nXO}n
zjU2zyEuB()dI2mQ0`?$fi)Q*LEGuM5+OeK46UJALo-R)EJVDHr)@tkvhGTNS(ArRq
zfwUN+dTulg_SC}r-C^?BL;!vKE<(bLN@l4b4HL|WN@}fKoSS{RM=ab~Hf|jgLAe74
zFtKI7EYf*W1^#>GGT0Q8|C-L0`8%_*a24}t7Kao!>4%uxpWVD^LKe9Qs|gT^W`tb|
zYIx89*8tfNALlYTPMhL@NO=gq96UCe3@mO&i(rz~-wR)G`D;sw7G^%Tzw?E^(>}!)
zgq=?XLAH0ZhI)Fs4|zo5kc6u$1A&<u%ZAgApP^r5ukFYV5VPTN0${chH(C8(<EPdE
zwqlDSC=*Nx6A1|pMVitSxZN`TZLfSDV=QW;6dzoVPoIepTHH>r_~)eZ8(S{yT7qBy
zd<@dKc5g;w+>Cx-!jSeNNs~%<Q`~Qf@ClM!O?Y~u{=(713*Uo*Vi<3GrH23mlbimG
zO#(6V&J(<TwY!uE2=GVeN6h=Y$py~6Pix0ZJ8MDzQXiips1zyO_ok1W;C<*-u*#A3
zsPfV?)rGZ#CLA~_jXSHK<!x(1JI!5)*KT2yj5QHpnOH6jQpn)x{*q*9Ou7C3w%H||
zV#rLDPK!NYqiMr>R;){`%D^qM3pc@PZUsRcCnrSE_8@ps3LDnZOX4xlP)ubjktJu;
z*?g?iN4GG_1WU16nWm_EO!zCe06uom61%+%W8TnSk<4b>>xJbwndc*`N+Heu3d{JC
zuK%}=m-A*G<wM9+>`}O%Pn&h0+<LBwcWRMfh^*L*CTgK2GqofF-ytxzDV=Dn2OHw!
z^+517&}zHTL973AZRYcL(?ztmFo!&*?X-Hy!AN4<UDbGP`ApsJ*i>o8558s=D;3?7
zhPA^+%lYd7O|f)7mM^<@b6+J*P*03R8XhRT?xOCjbdl(R#F3=9n=SR9<ae#&@9voh
z*l}kwTtZDaah0hKi#nBAsRKrCof9B1h}?xZ*&AM1I1Kr<XoKBqt&MOgIqKXgk;J;v
z(Y|nnbcX>kEHxDK{CeHzh2B*c5uK8Jk=JEZPeq1IY1Fw{Oz@ftr_*BAM(Q?73pcrF
zw{Th1B)_{!tFQMz?GpquK0>OA-;JA9_0$Ibh9QU;3?NTqDi))ETyP=^1BOGEE{)7?
z;ka*AllC^l;EBJU)Xu}6y7kN7rsusO`0^f=GxFDEAN1ru-WpFkgBcG9icVCG@lcXR
zQ3#Ve7?iN(Kts$#>Yf3*f`<gZ^2LK`JB4{=JJm}}5(+(Izc4DLiq`q=yQB~VW5@Es
z@`gqS-t|O2=2DESZ&@SsG?qZ*o-8zpJ0ka-RUeUjhp6O^i8lqpCXxP{1=F6+e{F@l
zYyHGXb7DiWD(OEy=`CHe38eS@(kZ84{yBQvFfUgfv)8IRl!be~U1aBm%p|l1Ae8Cw
zefPb^)*-smqnKhRAXdg)+G&5ZU6-8sPu}N@?p?kqi7<HN`xl0T5UB`A2Y$b5&;#1^
z=NRixcnMT6oO>bLKRPI!2MaW{w{ecSenub6ql7$gRfmh)S|%K6A2o>okTLVMY}zc+
z(y-RZ9#8%_XNC^uj~~A&d!Qf9d1)XVor0ZS#5lUNlgw=?<j4=;>iLz!F3{dZF*yD4
zdvgI@=dYZow`C&^B%eGv$i!&gm`t|K>B|E4s4woOiJ&X3*zY9Ljmu><ekjS;y}%R3
z5Yf<2M}>U}Wh&D@K0zDsW)L}b?Dra7AuxDzqGM=CAH{aobiQLD`P`ZMU%bfN-0<%W
z8o3~X9*!P=G?#^qKTSQM^S8p*zjB&y?pgI~OL*~bPm^CK6@gqNAbuni<6HdJ@sf=i
z-xBlE-QddxTT_q;Or++I)j163RpY>{h0=q<e}O}WBS+b-8-C+AYg9I2Oln|p-&nhT
zU|3-;*EXNk2|4bIxtj_#VhLx5M1jo-IedI_lR(B{8%b^p^VOx$n6Jr)NGTHz;jeY=
zj$<QWC1Dvo(EBY2(%P?dRVb|4WFp{t3w$tvvD+Wh?O^-C|CagSMWj%~C%}u$qTQ3W
zFQS`e=i&Z)cCs|^i(szW09(vTcc;tmC7^(-hsV;_!*Fg_kY)#x8aPREg(7gRE@CE-
z2vit7dtrHp$$w>OjufF0AuK2v1k7k+%$C~H8uHKAHsAki_6@$F4lTt~dMVi5P`;K-
zCcHnI!QHTCcSsgV0&NxFYCL5y&>fbP6zsEmJ;3#C3}OI4ga>6ewrhA?K8b0LrFF;v
z9$8-1__%fEWx3E2M9CLQkV+`NCD;6ZhiUNvR-!^a5E!GYQoz6zTfoBLz`(%xyL;Ji
z*tlE!y4t$=um`xhT$mYoZ;ob#6xBRofwrMJNJeXft9ov!R41O9>0Tq9JbHKB2x-NU
z&Ta^r@vn43S+;Uszf3tiyXjIJ$ywvs7}c%nA0bM}DIaewvX>lS=$N!CWwmJ1)rDxX
zw&x+ivnN;iOTo{Lki3Z_X`Nil(~&{LY;n0L8Dna*>Eo!I=Ib2^<s`+u6eE2!Vm<?q
zgY{l~F7exD(EFP^q#(&A?qs4{pDCs|Hk>$zy<%(-@4$<hTiB_Rv9;T&aPrKt%mLVP
zpmSms(waSU>gek8&A~>VIIc3kHcd;_xe|i%!0cqH%s1rb`P5TEpkfSrItfhdHs;qL
zNW59-b~4QdB}$&qx7AhM=bQH;+v<cHsCt4#9r0=0BIN%fmVj`6Q2id8vOIr^<A3;>
z@7aNrPojXqhUCfwoJQ$c{*y42g;*rG$LHwOmz+I$)a|oGpS!73^ggkbAoWAD$`Zmv
zf^f;)pk{C5QTY+`H$2JCXmxwmnp)TZZnxK6jrldH-&ZWxQ<mI~Mjf+BNeoBbi7UsK
z-ry<0`z>8t6vG-qL?KsvMwJk6<v{m}0%p_eDe3&+&@8RNLJb})-F}K~35k*{-aa9E
zogCh&k&mWqwIQ8LOG{OiDu<ta1_&T@YCjZO%C2itnaL)rXzfSQ<Yd$ib~h^>*?HCO
zsE4WceoOjQ#O1^vcL0(*6_xmwd2*VYB+-<Vm1GO(D!dVuEwh$+J!Bn()0VUZn&Dy<
zKi=)pv6vKq2#3m;P9zqut(0dHqn4<EeDD%{9zyb844Lv$z|tHUV}rR)S!IyQhM&BL
z^c;+=0UG!jYs@o2Svm!Nf^)5d<2!R@(E$jFQ5<RsOq9hx%9e1dwEy@@3_hi$JCFO6
z|24muk$xR3*tq-tSYY<@i1zaA?fek*lFs-zbC$V<^!PK)*O$1hJ7M$cFWUt<jj>%B
z+#F*dMQMH(8xqp-$0sZGyJu5~&(4Rk%3McsqS?S+-SwVN&%rdtobXsA@C%9=i0vL%
zWT;AeeQ_s$E8{y$_w*En-uH}2fAxE8ry~jl%xM!#c*7prEi+ZgLh1HayLo|r)dV<P
zDJ)T_&J~!l^g%C138Q$Z2(6dhr(pz&5?!Wiy+sJ@I4VqJC-x~5ujTd-^%7jG3<4Cf
z-yKCyHZ<}Ic;!Ves&l2F8#0aN$if$uxl$(j&xT(p@6V;s(2;qJ^$Vsm7eFDrhGiny
zp0e4u8qo#Vs`Yc`4co>os{+mv4Tzzv#qNMy<Gsh5#G06EP1c>uAI|cdne}XEEnQ)U
z?PK(HG+b7?ijN=*ZMi0hwV+2wn@qUR6`c@`6S`Lx(zGY5wz?cMVK`;0^m4@tbaUmR
zvBtv1q^ko`RM2A45O!)M7GNoskKyBjB<xW2PF_jO`9;xIVBp8-{5`Xg_y}?pQFQV=
z`iyoNgqV*b*OpB}*wJaU+I-xBCv3Hi(vKl)7dK7ycko(7gx5UeN+D4}Sm`AhTULnL
z!{^HBZ<j+y5#@lAXB1G*wpt;a@Pn43a#%8x>S41m3ZXrB@AFwr<=ZCwn%Ogx;RYVj
zh=LHi63>ja4ytNc0;|h?0>z&}`1SPXKW4#MYMF^fbi{enqOj``=k6nD<9?9dIuhGs
zYVtbwq>9qw!vRgm4Wufbi!XTKLRP@FG_)F_Y8X$s%ki;#xb}6*)Yp}H{`_&cUp~_z
zKklyJQ`pGPUV3|B-ejAmTqxnOzPaKBec5BHCokORo#Eye#891!Blo&YgVpDi)9>B^
z>?4r8Pl$7^TM4j@idLrRoaH-PVZ9Hk;J3|z6rLBq&MFcJ87fU!5oVWtsF5;GPiWm*
zNrGFJgqI+u*~s78mR-1Vp)5FkSq|}g_k!sSRpQQ<MILL*LL7ipw9QGpwPmzDQ;vTi
zux9>?5u2I%ZYvlqMizV(-M4F4#!Qkkr{ggatBLkpit9yJ$Ri!wEL9%e1ZcYKYhY)O
zoR3JbtJH#+C#JWoql*oeJ32<<J>4tD*^i_q41Weq)u<YeXm{W%K{$OkG*$2dg&jjh
zrIr#&h}{Fd+OvDX-;ze7V+QVwdpAd-%(S9PxnUVTusLPz#+O88yZ>(N`)-^kj?k$f
zojz(VG2bOoTwXPm9*xM2)<ARJw+Z@sOU}OKuh0Z(9b6V7N5m(@knxPPMk6R0@SQTy
z8oJSJr;G#NYWa{ln6gws(*oIJp7G6M5@NG793^8%a}xGrwP@|u=O<54GU(8hBqCE0
zYsg&#_cAt_P*<#kk98BLZ4yN%Q7(tEJup(lo8o02od91QE%d`#y3gr{Kt-!@PuSl=
zN2MU7;9twJ!oI6MCj0bZm3$<-ri1lM=Fm5s1>T*ZHV(phUm4SWK6I-WrQ}Kg7kh*?
zs@gz9I&*C3czMjX*@DWct95_=`T~M}IYnwD`|pg-j|GIQWgJ?i{+-=v%Gx;VhTax0
zOW(ViB583;FeQdy4@ERdU@NJR)Q2um1gIeQ=-1A$TpI8yFmi>yWMu<E5;*csL^oGw
z@M3kCU$2(eNvXVAU#Id`2Or&AlHwOh+ji_Id$)`bUw3jL+C6=iGkwFCYUt)L&p%IU
zAMc%B7wlK;<1+<nAAbnjd={?I+ZJst+-hs+Yt>)vqJl|Ho<L<oxHp1`?)`LVt&WEL
zel~M**9ZVi;6X`J&K;7igKA2YBA?P+!8lkuZ~?p9BO)MLdma|K<XGHL3U<~dT5aW@
z3fjztDxNiU+8Mv#n8N)ZLFmp#>45ZI&;5dJ1)$omu_(X%2TZl%=;DGyU#Xi&bhL=;
zMe1-r@b>S+75>_!`SO#}f_ht|3m3>Lp?=*1c{XcT_Ib6eD1+k7W6j^L`6PH@4YCU#
ziS)p&<MEsEUE1PN#SQ1$$032t#EOke_G0Rfmcie2x1Lsw3l(<9yV@IO4LaO6EX<pG
zJJBaXih6z^5L~M!5bkS(jiwi53jJYCk-GdOa>Yur_D1ArR0f{u$8cqJa9JVV-DoP0
zEr4cRj1MW)ik02>7$PZa;c>g$a&k0tI*ws;35t$|<a@t-{OIJGmlfqJO1#wUcv=m}
zq~zdZ;{qwy_hscU`^AB}%Y~m1HxTI-T|@`u;Z*=h7V=1m*kr22Ga9BmfOF&lopUOb
zyKM#tpyj?>xFP4UAZqflaTT(!*2KKlVQ#$yKi#hrD9_s7JHmhxAd=2w?=d?$n)Uh+
z-sZ9L7Kr4cyAou;X&AxW`z-*YDh&NA_gRr!XJ(>(3T|J$M0R~J4^m@mj*ohTz+;5b
z*=SW};@E22oU{AocYSE;C!0%sXnNlux3sF`6(0jOwib6W!kE`0ffMAoVE%k0Z*|rs
z!X}igM#SH#QNo!&2zI`u(A`g9IG-qyIh=-kvhw8Gt4Q+=mfFJI>@1Pu*%$pJY>UZ7
zH%__LL$K=#=3$`-A1ENC=qObVm>8;f8Tc6;kwF+twb?)7g~lEoL`dlT*+qZy`ZJEO
z3>qz&LY0E9dWOOxdL~5gBq2MKhnO%6&r~$@>(}3@V(O+KT5VyV>5syAL{dUlW$EIy
zFg7P~_7K94#JZj2YqeRbr87=MT9jwpcdx)l3U4%Wo}($gmq}$?=g+<0P_ky(&yB;U
zm(r#I?XG`XVF?xXC!O1!Q4DFN%}sY0H|wYqqmtF_QA<m#DX<|}s^tBYAE()T6c3?7
zXSI#}GNwHbDi1Flb)?^GH7xpF?;Z{R&To9vTMvK}Ca%_hOok4?Z{=5h$RS&^IIHbj
zrWE(`{Q@Rni;6&5H8*ZGX#6?+mHlN8Z!OW;?6p+no}H76JqP(R{qggkuXLs&gW^<y
zSX4{a4ABka4|JrEHA(?tRy0tt<#*F*C0wL-YhITtLqX)1Cexti{)hvjBL^638&ynp
zvPdKfUb{9BYxM>)hv%+h)gt<zd7c~`y<dyC^wlg#o6??P01_-JUh%kQF?ElGi94cs
zPeyYR2cPLXpNyX;{n5&hODbe!IjkEvQL+e$KiQ08k)c!&RK<srhtuRuFeze!b-iiB
zObGgM<;~yqqt(BNh=OXEb~bMEj#Opvxu#vWuwb+q&AP$6vE!!D0*7((1wb$HCk#O*
z<iCCqKkhB6WQSu4Xfc*AK=VE~?bf~RR}Dj1=EW+-?ZD)iD|<)3V8c7-6!P=Erqh9M
zH(~)|H6l%r-=FjNFkN^@<@c33>oK||(yk3BZs-P_4UV5>SM+2PXHdx*r0Z@hb7Fbh
zMDp5J_~v1`CN9)=60t#5;0SnK=;WSnhX>ADZS2M3@#}kNU9O*jACw~tZlHemf!JOw
zfK$qD6vGnX${L#ug9b%7lYsgQFv&bh`sF}aj`1fXh0`TTJu>RR@@{a_7Mav<?MJk@
zco;veFl;;Kh70+ilx^$#DccK#l3heINac5xm;Floh|)b@V%YSl+c2wQokQo3mzuCq
z)EV^@%uxdU`Qn>?p}(mQ-zsF_Ogk+odLNiCT1)IT>G!W|@fX?^n4(jO{3Bd;x#m=o
zXrkjG*IrqPp$4j&0QKV105*n?<3hAt`)L9teFMc3$$%eWVHXOLI<rZf_h+cYF^G@2
zo4UMJ$%MNfRLI11D@|lM?TQrXPqGIQR}anSTNjZWAekl!&NcGM3+4n8O@%KXjpy*I
z2$1LO@x7A}Ch|d<=*Y@(xDZYhk->yjP@*q{Zl>gIQnP9)gb{RF=zi?fA(I?SCf)gy
zAz-IaTMgslX?XSdtp;E7XhBv;NoZ&n;lyD}x>3MtuanjRxV)$!N5|DY=Vt*3Y!MpX
zMwq$&Jk2_cHF&JVc&A;)aJ61;5P|1C=V)(GfVw`<?}j{UUt9tc`1m{8QpbbzDoh4)
zpB=Pun?lQ3vI`6g22)t2OD6!s2NsaA_=e~EZ|2`T>EDn4hFf}sT72_<hN;DVTBde8
z7r#Y8aveccF8(ehKJbm+K)HkxNuwQxKS@hg?vo{y5!U7M%^lf>8;lx}y!%ptLxx3`
zFlxk%lOXXSUx!$`l5?2`d>tEkK^Y7YuH6Z?e!s100n6oTSnL%seGzTc42!Cav<FN3
z_{@jFLkiayvDh%#ToEE6n1!D&L+mX2Fg)f1|1|Nu`@k`L%-6wH#f{OU>W_p;Z<l@?
zKi92G`(-GO%@u=eL}Q~B$$KP`K!P;EZYyR{*CVI|mY&K-cMxwv%fCk7%L#)V<-CL6
zwAVv)O#U<k9vHmbbv~c>JpY(^7ZsGXJTRn5rJHTgr{rob5M*zo^{enyHI40vG^hTV
z6}t%w>{#LOJKK4iH)?v^@*AW(5cE)^GR4^=9^`?a<7so=3ELqCF2ix3OiPfvGA=}x
z(rxWa#a=|NsXsf3>{*eijfF#EaB!(rBF|yajLvSBHja|(p|y|kMfJ`*8y4a<ZWn%8
zEx}{VrBtk<2-Ni0W#6blC}=o95`LgCFF2LzS4#En3=q(S-M?tiPcvLvieCXoEg9QN
zzv#DCet`l9%smuR!iRf_{GUM^XGo{hy5#k2qLgZyqJ`?n0TAllipJe2+)hDS?8dH^
zj-%w}qSNGFvZlxNzM46AA7EXuKx6-Bf{)=@>Mn#dMt%*s2i2cz9o}yj&TpQ)uT|Yu
z9E_4|>9huL^pH8J`^y{qBMD2rxJg8P(yAk6>B(#|uhSdPIVjg^FVuUbHwwF&tJpTl
zRxaHPWu_Qp*&!bJaF(Ql{6qcxJp*`2Njge7aU$v(a2m*>j;!{{PBF<TDSOMgf@-Gc
zO~avUYH^)3vJHblib%dO8o@8h5Ahf2t$Ca%#7U`)T|ZN7XheBLMXk*&LMxaaBkDUu
zzO#@P^`qFk`vXOIv>E4;`WY-;t?`Q@<gihtn1bb)x*_8&T46MK1hK7ACw5F$`vrp1
zmc(&c4ymAnf3ZwOb^0J}kB5kH+3#Lm-(E8#bh0qxbsUsaPUsXs%xnWS6Y@6TxU%FE
zRz<B`TO~;r8t)jn!@--)M-7g>jI&u`@X*%2yuxp3OUlf$7)t`w?i)Z2b~~|fyU=+r
zMKtgyq?GP%cmz*WE&?V!1O|^my@gw$bSkZ)*&&V?6&@7^@2tvQ13MGun<ZXrEIse~
zhrbGfh5O09yuds3?N0ZeKy5RV+byvI;?L>vF-N7%hBTj`7C3}ho;SsxheW21$JH1=
znkMm(5eV+5fgbNxEmI7)FO3u;@a<MZTJ5$Vkk$XJUAI9rl)|c?HesOVJan|0G0~;X
zQ$v=~PoBmM)LO9`NHS?}aCou5W`+%|@)@N43?p5FE!Q``1*i2#LL&tg_`7kuX>mzp
zEZv4hm)tHUO1_WZW~AWbDSbo*a1~?2D_eNR5fOeClq)U5&Jhvi{#_+>Hh>o7SoDen
z3GOIq>INxGXMomeu0tG(<Hq=Va<tay<mlyakXY!hBm2|e2Jt+qyisNNRdIzxc)cDs
zDR&bn&W=PF9h6E0jq$BSJ>zlz^GO}KDt!)1)mb%(lAsmkT~4V~_~Dw*ahgo2c29JP
z9j)mPAvQfbyD?IqdrdnCCE5h^MW!IDZ={+ThP+w76ahxzn$ZX)e_WQzVCg9g0)$BD
zO#;S&6jZ?+40clt6J>FWql{68-14bB2cPoEfkMs~;t@T_jInA&##%&$L#zlW<%}sI
z*VJN%IfZJBq8tpCbByu_!#>igjKO>bP2qH7M4z(Nk@<;%E>?{ph@KiOCR31=`YOg)
z&97haHMqIg2W159iG;=^=$gcX8pZuvcxZjSZZs!s$ljWVqorM##=tT-ALQxmTcRgO
zjCi-uM|vYS7UN#;)L$P63v8VgmiDzq?D4Ge$L=npRjlNx?J@=g%KlBrO6i0x7c}Il
zmBg@MQ#CPb?V>RNdHHoy@)Od{L@)G(FYGvaC|sY#WUkI$pe_?qKxMp_Nd)+=3eHR`
zCJ5I@q^$qrqO-mc{?)Zj0Bv<BrogB=ohwRX)HVw`9&HV$kpx@Vgx#AB=Zz}Fk8Nk~
z1=!#u3$x?cZZj|V6^>60gq}o70;g~lB|s?@cL|gV?H$(eBiU)H;}E4UHd#~|){;yg
zY1rjHAnK4V06sAY{>k0_M2jD1^%amwC9m-Bzo3<neJ)eTkfWbSsTUhw;PFNmjIzz9
zn_}f{F2`1xOaZAhOT3qa{HB{jx7qhtWf<d%v`3ypCzvC9>z8C9sY(;X6k1=9@w*3u
z7pvMBt)xG-+%Wy?fGqc0YQdigK<c;qHrJiEf7^cfD80wbu4L7QQ%KBS=*U&zV^^Y%
zrePRnOK(oI7WvgTX~2|*6K+I>3s*U7e7z*KrDJDJ;(htwJ|fR+(p9xI`~+J4ud~D3
z&>Lm08J$rpAdTt}*NT0hzg*)GH|$e98Esl7Loj}0@y86vws++`FU3?lZJ=(DxubcU
zJiQmYszgT|lKk=t+kys5OmsVbZsq@yKPCm{xMU<4RZH&VCt~(lo9>n`1?i<FMDJ{I
zb;X3Ed%@})4%U|X#e<hKG3i19#p+q{0UF)rk|V!bT|R(7v0u{B-7-*CIL8JPhD#ZZ
zwji8S_64QjXcW;KT<L82s{Oar=zAR}H&8xH7UMM!e8;*X5X~0PT;mv_nyt)sWx|x0
z5#?M}V^E0A{KFxAqiFPy(u@i!%kbx+|B%B*-$KWz)V?AG*Ja%nGCp5l&__or*(aET
zXmu|V_`caw!TYX`qt0@C+fu3H<KOj#ki5wcD_uKeMChyaV{;zk1J|Q<Ttov&3U{Qf
zLzE=`RG6aZ<{W#oVlE2OeWf8T5{o^0u;(|0!7ow4uOEDm)Gr?FSMO|JHWDWv@&2V<
z?*3W-opaS|Kx;&H-o%4C6Gs;&4eJI+Y=wZatf$GVUD3bC12FDzth&pHJ0W;Ki{a7#
za&^p?<UySuGczYwwS#@{E@pe!V`XAlJmoMcehFg_FHE0VThc|xXl`Tjw}GkQZYu(>
zCh2=@c8scB-ce~P-@xsUGo}YKLmSWed3GNt7S}A?^{*s4{M`R1Eq?2CX{^^LY?Rub
z9CdNsv(NZ_sqxsN@Gt)iS{($6My@$C?T_89u2|IB``05mr&QhsPCOra*;-HZwm5D<
z%*;%yT}1EFrQrH34Nvvl>pL~f#hMQ-*5d{03yhr4^j%+-9tP5UFAye!{LSWS_j6I|
za~FAx7lw->NYQOq?Vzlr->KK#Td=?{^bQ4WM~xREU53lXwUC|7BGD(;N9tKyF~rBP
z`!JyN_H#Xl)7jbMDc_&S4iWD^76PWDw+mmhksYwap#vie)_HzQj%e@|ZPG?OoF)&}
zG<T9?y{aB*)&CeY*Rmr_5@#lqCJ;7kOjBN9ic$y+|6eH0+A{ahu-{QV4eQl}v4vkJ
zdK<mM9_Axt5pM3&N5PC<WJjtx%rWq~UYx^vT^2i|hjD0vCJ;vEkF%t*xpa=UTjy+3
z22GCDb3V=@&#|MRuI3$#9oN)<V>D{_=zSx-pKYli)>>LkA->YerTf@nZ6iHfB7NHr
z9sT!6I#n2Lyd_oXh#Ao-HUG=dqU|8Jo#Di=OhQ`hP@1wbyFlrw+QZLQO04}|E(_ze
zwqN;16}H5ukN!Cpxbpw(fY2<UWfn(*vsMeh0=-^gC0Ux|$^g>X#viQwkL;Hy$w&+%
zW!(FGSeys16PwEILOP5*R=gdfK6?wJGqIC=`-waT<O62L{x4&L{J)S5^PZP4yg^1@
zcB+b(N_JlrQ4uRzCo$VrhP8@u-WIqRf-I95-FXtF<533EO+0a+ak61>{-rf*#ZL;?
z4$BS`;wdPX2qSVarJ@-H?E%zmIM!!lm7qD0x57rNCsym&t99_1<2o3Z!OqhE5Wesw
zhS7qk-HDmLgu|K%{6a7tV)E0h`pG?}(D^v{W)_fFtux;uHPY$tTSK5>y4?zFheg`$
z+%f-A$5Cf^CbIe$FO(Y@0ODAEe<E`>&P>!`5wY;Eazx=pKoX>b4^#T<_+~~6(aqKG
z%7JiXyM=fK<jK3sED=Z|>n~_k30Ko3x6(sIe?6>RoEm6In$)<=ZFa0)9CXgV7YY&H
zhH)^2BC?nvf<&;e*TdsUcVakC{|5WbN)?pY{XO2dRdn46G}{WM$eqaHp?*0dcebx+
z|At6d{o|}d%P6_Xm_y&`tg)^_pv~e4wlo^XrJFJW@F}M?3r&jqB}R{wCFJk2D`O($
zT%MW}2`n95o`M%Dz;dvmSM2;ZsygY(Aag74_-XQB<9saC#ks4CsAqrGM`>4;Mv3)C
zqRatJlj77r5)c*#L+FT#n#c)cA8I|AP5^_?7bRoRi<w9ZofZm=rcZJzO#t1z^!9@7
z+GD#0g`Nw#oDU97AYK{j@&(p(j0H#)O<_X=n~@1?vAxxzJAa{`-{lIhw?*7&D13|H
z&7yI&&qSW=cE;9~p<qdpz;{Q~Q1;t)n@HRGhj}t*jmG6HiRj3O6^m0WN=wXE{mZpJ
zbMM-XziqdNox#pa%$2<!TfKLKM}3or25w16&R=25Z@1sq-|kUnm+9Y8JozEODtI*P
zu0n7$sWJ8&X@J(gAr<*l+l7bT>%Lhm2_{dDdv}BII2uR=j3zDW|60-Z#jWRSoDinB
zihn-U7g5p*JYI0{_l|{MSi;QllU=5gFW?+%+?MTx@Q{LStgknQ;)SZ5THV^q7!#Vp
z7QNX^;Pzp4&=@|B(h2ca&@Tvyzs58w0a>;iqq}>YoDbHKDhy()ftzkSg~^-&Y*0x~
z$N6+0IiFmvnkGKEDCr>KQ83j{@c{Ga6t~}P3W&^>hK%IJqBd=}KvpRF%yI&AlVg;0
z$@4i47_0o1ogJ1)n(1Hxs(9j?lGI3GZHYdY>bZq;3cL0T`+2kA1p@+Z30gAl#;go{
z*<iI1w8(Fx1Z`mT4uKZ5WBK~@-vcoEPQx{ZiSjp95r)$7#HB_%L!8hr4n*j0J&jZ0
zZ+oVi9XPh(DMBOS%$Magrq)FWwVDH@i(k|PAd&P`a8>j8SC?YG_80654=`t9&);=G
z5mIt@R>W6Ejl8zuN)X}&qLht4A6iB2Nj_NH7=A$gj_1LqSQlB#k=WN5UP-}BsB)dZ
zPlgv(lB_{R7#qok2!s32N8IN#kN?$EFu$CD*bexF^cxf8&kP(;5CCS`B5oyVWEGeY
zatz!@W+8SWO?jaINhZTbkJ^6>eK~F|DI?H0h^O};r^bSQ!euFm_ZD8eOzoRw7RF#L
zo*fcqQ9LlB>A^x`P$A$UY)0tLE}V|2J?nW#ia1t{IaY=J*Wms&_>N;$K%F}rUp+Ld
z8z2EES_A#w4d8|Y*Fe#F0J{HGEC#ji0SNzhl@_%0Und+le7Yt)0TiPbz=HAw_#d+y
zI?xATfs3w%y7U4B;2UcJP|;2RIY?6l77iZ<|DPp}3=^aNQ}X{e%KzPffrX*^cYURT
zUiAXRU?ZSxeE@MdD`}|ff7BM3o&v=G@964s(2Kr*(T9Ryp_-pyfl#sjf6o;4f;#pC
zq~KyQpmqPz#BS)-e>89k%02K;{pFy(|Iq*m=+^-N9qIoTM`6JHmskIPUttgWdjKE~
fO9tg11c<^GLcIq8g0N%Ix<LRF;&a2lnZo=ZmCVyM

diff --git a/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts b/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts
index 9bf215d..ce9b666 100644
--- a/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts
+++ b/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts
@@ -103,19 +103,10 @@ export function deleteFile(params:any) {
   });
 }
 // 批量保存草稿
-export function importBatchSaveDraft(data:any) {
+export function batchSaveDraft(data:any) {
   return request({
-    url: '/data/fishDraft/importBatchSaveDraft',
+    url: '/data/fishDraft/batchSaveDraft',
     method: 'post',
     data
   });
-}
-
-// 标记导入任务为成功
-export function markImportTaskSuccess(data:any) {
-  return request({
-    url: '/data/importTask/markSuccess',
-    method: 'post',
-    data
-  });
-}
+}
\ No newline at end of file
diff --git a/frontend/src/api/select/index.ts b/frontend/src/api/select/index.ts
index a6eeb2b..58c0d50 100644
--- a/frontend/src/api/select/index.ts
+++ b/frontend/src/api/select/index.ts
@@ -32,6 +32,15 @@ export function revalidateAndUpdateRow(data:any) {
     data
   });
 }
+// 删除 行数据
+export function deleteRowById(data:any) {
+  return request({
+    url: '/data/fishDraft/deleteRowById',
+    method: 'post',
+    data
+  });
+}
+
 //过鱼设施下拉列表
 export function getFpssDropdown(params:any) {
   return request({
diff --git a/frontend/src/components/BasicSearch/index.vue b/frontend/src/components/BasicSearch/index.vue
index 67243aa..92080e4 100644
--- a/frontend/src/components/BasicSearch/index.vue
+++ b/frontend/src/components/BasicSearch/index.vue
@@ -170,7 +170,7 @@ interface Props {
   initialValues?: any;
   showSearch?: boolean;
   showReset?: boolean;
-  zhujianfujian: any;
+  zhujianfujian?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
diff --git a/frontend/src/components/BasicTable/index.vue b/frontend/src/components/BasicTable/index.vue
index 0ec8d85..fe78a79 100644
--- a/frontend/src/components/BasicTable/index.vue
+++ b/frontend/src/components/BasicTable/index.vue
@@ -33,6 +33,8 @@ interface Props {
   rowKey?: string;
   // 外部传入的搜索/过滤参数，变化时会自动触发刷新
   searchParams?: Record<string, any>;
+  // 是否只加载一次，默认 false
+  isOneLoad?: boolean;
   // 默认每页显示数量
   defaultPageSize?: number;
   getCheckboxProps?: (record: any) => any;
@@ -42,6 +44,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
   enableRowSelection: false,
   rowKey: "id",
+  isOneLoad: true,
   searchParams: () => ({}),
   defaultPageSize: 20,
   getCheckboxProps: undefined,
@@ -103,6 +106,8 @@ const paginationConfig = computed(() => ({
  */
 const getList = async (filter?: Record<string, any>) => {
   loading.value = true;
+  tableData.value = [];
+  total.value = 0;
   // 如果传入了新 filter，则更新；否则保留旧的
   if (filter !== undefined) {
     lastFilter.value = filter;
@@ -178,11 +183,17 @@ const refresh = () => {
   getList();
 };
 
+const clearSelection = () => {
+  selectedRowKeys.value = [];
+  selectedRows.value = [];
+}
 // --- Expose Methods to Parent ---
 defineExpose({
   getList,
   reset,
   refresh,
+  tableData,
+  clearSelection,
   // 也可以暴露选中的数据供父组件获取
   getSelected: () => ({
     keys: selectedRowKeys.value,
diff --git a/frontend/src/store/modules/shuJuTianBao.ts b/frontend/src/store/modules/shuJuTianBao.ts
index 7762c72..af1d948 100644
--- a/frontend/src/store/modules/shuJuTianBao.ts
+++ b/frontend/src/store/modules/shuJuTianBao.ts
@@ -80,7 +80,6 @@ export const useShuJuTianBaoStore = defineStore('shuJuTianBao', () => {
       fpssLoading.value = true;
       const param = hbrvcd === 'all' ? {} : { hbrvcd };
       const res = await getFpssDropdown({...param, rstcd: rstcd});
-      console.log(res.data);
       fpssOption.value = res.data;
     } catch (error) {
       console.log(error);
diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts
index 4c238ce..8fdbd6d 100644
--- a/frontend/src/utils/request.ts
+++ b/frontend/src/utils/request.ts
@@ -6,7 +6,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
-  timeout: 50000,
+  timeout: 100000,
   headers: { 'Content-Type': 'application/json;charset=utf-8' }
 });
 
diff --git a/frontend/src/views/login-sjtb/index.vue b/frontend/src/views/login-sjtb/index.vue
index 9363310..c6d8a74 100644
--- a/frontend/src/views/login-sjtb/index.vue
+++ b/frontend/src/views/login-sjtb/index.vue
@@ -84,7 +84,7 @@
                 <!-- 用户名/账号/手机号输入框 -->
                 <a-form-item label="" name="username">
                   <a-input ref="username" v-model:value="loginData.username" clearable type="text"
-                    placeholder="请输入用户账号/身份证号/手机号" size="large">
+                    placeholder="请输入用户账号/手机号" size="large">
                     <template #prefix>
                       <UserOutlined />
                     </template>
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index 731cc81..0891d53 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -110,7 +110,7 @@
                     v-model:value="loginData.username"
                     clearable
                     type="text"
-                    placeholder="请输入用户账号/身份证号/手机号"
+                    placeholder="请输入用户账号/手机号"
                     size="large"
                   >
                     <template #prefix>
diff --git a/frontend/src/views/register/index.vue b/frontend/src/views/register/index.vue
index f1d39d9..adeb27b 100644
--- a/frontend/src/views/register/index.vue
+++ b/frontend/src/views/register/index.vue
@@ -53,13 +53,13 @@
 
                                 <!-- 手机号 -->
                                 <a-form-item name="phone" label="手 机 号">
-                                    <a-row :gutter="8">
+                                    <a-row class="w-full" :gutter="8">
                                         <a-col :span="16">
                                             <a-input v-model:value="registerData.phone" placeholder="请输入11位手机号" />
                                         </a-col>
                                         <a-col :span="8">
-                                            <a-button type="primary" :disabled="smsCountdown > 0" @click="handleSendSms"
-                                                style="width: 100%">
+                                            <a-button type="primary"  :disabled="smsCountdown > 0" @click="handleSendSms"
+                                                >
                                                 {{ smsCountdown > 0 ? `${smsCountdown}s` : '获取验证码' }}
                                             </a-button>
                                         </a-col>
@@ -655,6 +655,7 @@ const filterOption = (inputValue: string, option: any) => {
         max-height: 90vh; // 限制最大高度为视口的90%
         border-radius: 8px; // 稍微增大圆角
         padding: clamp(15px, 2vw, 24px) clamp(15px, 2vw, 24px); // 响应式内边距
+        padding-top: 0 !important;
         background-color: rgba(255, 255, 255, 0.98); // 轻微透明效果
         overflow-y: auto;
         box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); // 添加阴影提升层次感
@@ -686,6 +687,7 @@ const filterOption = (inputValue: string, option: any) => {
                 font-size: clamp(13px, 1.2vw, 15px); // 响应式字体
                 font-weight: 600;
                 color: #333;
+                padding-left: 10px;
                 margin-bottom: clamp(8px, 1vh, 12px);
                 padding-bottom: clamp(6px, 0.8vh, 10px);
                 border-bottom: 1px solid #e8e8e8;
@@ -698,6 +700,7 @@ const filterOption = (inputValue: string, option: any) => {
 
         :deep(.ant-form-item-label) {
             text-align: right !important;
+            line-height: 32px;
 
             >label {
                 font-size: clamp(12px, 1vw, 14px); // 响应式标签字体
diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoTable.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoTable.vue
index 6abf53e..c6159ca 100644
--- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoTable.vue
+++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoTable.vue
@@ -9,6 +9,10 @@
     row-key="id"
   >
     <template #bodyCell="{ column, record, index }">
+<!--     
+      <template v-if="column.key === 'index' || column.dataIndex === 'index'">
+        {{ index + 1 }}
+      </template> -->
       <!-- 1. 操作列 -->
       <template v-if="column.key === 'action' || column.dataIndex === 'action'">
         <div class="flex">
@@ -281,20 +285,21 @@ import {
   getEngInfoDropdown,
   getFpssDropdown,
   revalidateAndUpdateRow,
+  deleteRowById,
 } from "@/api/select";
 
 const props: any = defineProps({
   taskId: { type: String, default: "" },
+  getFileList: { type: Function, default: () => {} },
   fileTableData: { type: Array, default: () => [] },
   fileLoading: { type: Boolean, default: false },
   direction: { type: Array, default: () => [] },
 });
 
-const emit = defineEmits(["update:fileTableData", "preview-click", "update:fileLoading"]);
+const emit = defineEmits(["preview-click", "update:fileLoading"]);
 
 // --- 状态管理 ---
 const editingRowIndex = ref<number | null>(null);
-const baseOptions = ref<any[]>([]);
 const hbrvcdOptions = ref<any[]>([]);
 const rowStates = reactive<Record<number, any>>({});
 
@@ -302,6 +307,7 @@ const rowStates = reactive<Record<number, any>>({});
 const editingData = ref<any>(null);
 
 const modalColumns = ref([
+  { dataIndex: "rowIndex", key: "rowIndex", title: "序号", width: 60, dataIndexKey: "rowIndex",align: "center",fixed: "left" },
   {
     dataIndex: "hbrvnm",
     key: "hbrvnm",
@@ -654,10 +660,9 @@ const saveEdit = async (index: number) => {
     });
     if (res && res?.code == 0) {
       message.success("保存成功");
-      emit("update:fileTableData", newData);
+      props.getFileList();
       editingRowIndex.value = null;
       editingData.value = null;
-      emit("update:fileLoading", false);
     }
   } catch (e) {
     message.error("保存失败");
@@ -671,19 +676,27 @@ const cancelEdit = () => {
   editingData.value = null;
   // 由于我们从未修改过 props.fileTableData，所以不需要恢复操作，直接退出即可
 };
-
-const handlePreviewDelete = (index: number) => {
+// 删除按钮点击事件
+const handlePreviewDelete = async (index: number) => {
   const newData = [...props.fileTableData];
-  newData.splice(index, 1);
-  emit("update:fileTableData", newData);
-
-  if (editingRowIndex.value === index) {
-    editingRowIndex.value = null;
-    editingData.value = null;
-  } else if (editingRowIndex.value !== null && editingRowIndex.value > index) {
-    editingRowIndex.value--;
+  emit("update:fileLoading", true);
+  try {
+    const res: any = await deleteRowById({
+      taskId: props.taskId,
+      data: newData[index],
+    });
+    if (res && res?.code == 0) {
+      message.success("删除成功");
+      
+      props.getFileList();
+      editingRowIndex.value = null;
+      editingData.value = null;
+    }
+  } catch (e) {
+    message.error("删除失败");
+  } finally {
+    emit("update:fileLoading", false);
   }
-  message.success("删除成功");
 };
 // 鱼种类编辑 修改名称
 const handleFtpChange = (val: any, opt: any) => {
diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
index d6c6fad..d87dfd9 100644
--- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
+++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
@@ -1,152 +1,306 @@
 <template>
   <div class="guoYuSheShiShuJuTianBao-page">
-    <GuoYuSheShiShuJuTianBaoSearch ref="searchRef" class="search-container" :guoyuStatus="guoyuStatus"
-      :direction="direction" :handle-add="handleAdd" :batchData="batchData" :importBtn="importBtn"
-      :batchDelBtn="batchDelBtn" :submitBtn="submitBtn" :allSubmitBtn="allSubmitBtn" :successBtn="successBtn"
-      @reset="handleReset" @search-finish="handleSearchFinish" />
+    <GuoYuSheShiShuJuTianBaoSearch
+      ref="searchRef"
+      class="search-container"
+      :guoyuStatus="guoyuStatus"
+      :direction="direction"
+      :handle-add="handleAdd"
+      :batchData="batchData"
+      :importBtn="importBtn"
+      :batchDelBtn="batchDelBtn"
+      :submitBtn="submitBtn"
+      :allSubmitBtn="allSubmitBtn"
+      :successBtn="successBtn"
+      @reset="handleReset"
+      @search-finish="handleSearchFinish"
+    />
     <!-- 主表格 -->
     <div class="table-container" ref="tableContainerRef">
-      <BasicTable ref="tableRef" :columns="columns" :scroll-y="tableScrollY" :list-url="getFishDraftPage"
-        :search-params="{}" :enable-row-selection="true" :get-checkbox-props="getCheckboxProps"
-        :transform-data="customTransform" @selection-change="handleSelectionChange">
+      <BasicTable
+        ref="tableRef"
+        :columns="columns"
+        :scroll-y="tableScrollY"
+        :list-url="getFishDraftPage"
+        :search-params="{}"
+        :enable-row-selection="true"
+        :get-checkbox-props="getCheckboxProps"
+        :transform-data="customTransform"
+        @selection-change="handleSelectionChange"
+      >
         <!-- 使用 bodyCell 插槽自定义单元格渲染 -->
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'action' || column.dataIndex === 'action'">
             <div class="flex">
-              <a-button v-hasPerm="['sjtb:import-add']" type="link" size="small" @click="handleSubmit([record.id])"
-                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'">提交</a-button>
-              <a-button v-hasPerm="['sjtb:import-add']" type="link" size="small" @click="handleEdit(record, 'edit')"
-                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'">编辑</a-button>
-              <a-button v-hasPerm="['sjtb:edit-review']" type="link" size="small" @click="handleEdit(record, 'edit')"
-                v-if="record.status === 'PENDING'">编辑</a-button>
-              <a-button v-hasPerm="['sjtb:import-add']" type="link" danger size="small"
+              <a-button
+                v-hasPerm="['sjtb:import-add']"
+                type="link"
+                size="small"
+                @click="handleSubmit([record.id])"
+                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'"
+                >提交</a-button
+              >
+              <a-button
+                v-hasPerm="['sjtb:import-add']"
+                type="link"
+                size="small"
+                @click="handleEdit(record, 'edit')"
+                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'"
+                >编辑</a-button
+              >
+              <a-button
+                v-hasPerm="['sjtb:edit-review']"
+                type="link"
+                size="small"
+                @click="handleEdit(record, 'edit')"
+                v-if="record.status === 'PENDING'"
+                >编辑</a-button
+              >
+              <a-button
+                v-hasPerm="['sjtb:import-add']"
+                type="link"
+                danger
+                size="small"
                 @click="handleDelete([record.id])"
-                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'">删除</a-button>
-              <a-button type="link" size="small" @click="handleEdit(record, 'view')" v-if="
-                (checkPerm(['sjtb:edit-review']) && record.status === 'DRAFT') ||
-                (checkPerm(['sjtb:import-add']) && record.status === 'PENDING') ||
-                (checkPerm(['sjtb:edit-review']) && record.status === 'REJECTED') ||
-                record.status === 'APPROVED'
-              ">查看</a-button>
-              <a-button v-hasPerm="['sjtb:edit-review']" type="link" size="small" @click="handleSuccess([record.id])"
-                v-if="record.status === 'PENDING'">审批</a-button>
-              <a-button v-hasPerm="['sjtb:edit-review']" type="link" danger size="small"
-                @click="handleReject(record.id)" v-if="record.status === 'PENDING'">驳回</a-button>
+                v-if="record.status === 'DRAFT' || record.status === 'REJECTED'"
+                >删除</a-button
+              >
+              <a-button
+                type="link"
+                size="small"
+                @click="handleEdit(record, 'view')"
+                v-if="
+                  (checkPerm(['sjtb:edit-review']) && record.status === 'DRAFT') ||
+                  (checkPerm(['sjtb:import-add']) && record.status === 'PENDING') ||
+                  (checkPerm(['sjtb:edit-review']) && record.status === 'REJECTED') ||
+                  record.status === 'APPROVED'
+                "
+                >查看</a-button
+              >
+              <a-button
+                v-hasPerm="['sjtb:edit-review']"
+                type="link"
+                size="small"
+                @click="handleSuccess([record.id])"
+                v-if="record.status === 'PENDING'"
+                >审批</a-button
+              >
+              <a-button
+                v-hasPerm="['sjtb:edit-review']"
+                type="link"
+                danger
+                size="small"
+                @click="handleReject(record.id)"
+                v-if="record.status === 'PENDING'"
+                >驳回</a-button
+              >
             </div>
           </template>
         </template>
       </BasicTable>
     </div>
     <div class="buttonStyle">
-
       <div class="button">
         <a-tooltip title="提交数据">
-          <a-button v-hasPerm="['sjtb:import-add']" @click="submitBtn" :disabled="batchData.length === 0" size="large">
-            <template #icon>
-              <SaveOutlined />
-            </template>
+          <a-button
+            v-hasPerm="['sjtb:import-add']"
+            @click="submitBtn"
+            :disabled="batchData.length === 0"
+            size="large"
+          >
             提交数据
           </a-button>
         </a-tooltip>
       </div>
       <div class="button">
         <a-tooltip title="全部提交">
-          <a-button v-hasPerm="['sjtb:import-add']" @click="allSubmitBtn"  size="large">
-            <template #icon>
-              <SaveOutlined />
-            </template>
+          <a-button v-hasPerm="['sjtb:import-add']" @click="allSubmitBtn" size="large">
             全部提交
           </a-button>
         </a-tooltip>
       </div>
-        <div class="button">
+      <div class="button">
         <a-tooltip title="批量删除">
-          <a-button v-hasPerm="['sjtb:import-add']" @click="batchDelBtn" :disabled="batchData.length === 0" size="large">
-          批量删除
-        </a-button>
+          <a-button
+            v-hasPerm="['sjtb:import-add']"
+            @click="batchDelBtn"
+            :disabled="batchData.length === 0"
+            size="large"
+          >
+            批量删除
+          </a-button>
         </a-tooltip>
       </div>
-
     </div>
     <!-- 隐藏的文件输入框 -->
-    <input ref="fileInputRef" type="file" accept=".zip,application/zip,application/x-zip-compressed"
-      style="display: none" @change="handleFileSelect" />
+    <input
+      ref="fileInputRef"
+      type="file"
+      accept=".zip,application/zip,application/x-zip-compressed"
+      style="display: none"
+      @change="handleFileSelect"
+    />
     <!-- 导入预览 Modal -->
-    <a-modal title="导入数据预览" ok-text="提交导入" cancel-text="取消导入" :width="1500" v-model:open="visible" :maskClosable="false"
-      :confirm-loading="fileLoading" @cancel="taskId = ''">
-      <GuoYuSheShiShuJuTianBaoTable ref="modalTableRef" :taskId="taskId" :fileTableData="fileTableData"
-        :direction="direction" @preview-click="handlePreviewClick" v-model:file-loading="fileLoading"
-        @update:file-table-data="(val) => (fileTableData = val)" />
+    <a-modal
+      title="导入数据预览"
+      ok-text="提交导入"
+      cancel-text="取消导入"
+      :width="1500"
+      v-model:open="visible"
+      :maskClosable="false"
+      :confirm-loading="fileLoading"
+      @cancel="taskId = ''"
+    >
+      <GuoYuSheShiShuJuTianBaoTable
+        ref="modalTableRef"
+        :taskId="taskId"
+        :fileTableData="fileTableData"
+        :getFileList="getFileList"
+        :direction="direction"
+        @preview-click="handlePreviewClick"
+        v-model:file-loading="fileLoading"
+        @update:file-table-data="(val) => (fileTableData = val)"
+      />
       <template #footer>
         <a-button key="back" @click="handleCustomCancel">取消导入</a-button>
-        <a-button key="submit" type="primary" :loading="fileLoading" @click="handleModalOk">
+        <a-button
+          key="submit"
+          type="primary"
+          :loading="fileLoading"
+          @click="handleModalOk"
+        >
           提交导入
         </a-button>
       </template>
     </a-modal>
 
     <!-- 新增/编辑 Modal (对应 React 的 EditModal) -->
-    <EditModal ref="editModalRef" v-model:visible="editModalVisible" :is-view="isView" :direction="direction"
-      :initial-values="currentRecord" @cancel="editModalCancel" @ok="handleEditSubmit"
-      @preview-click="handlePreviewClick" />
+    <EditModal
+      ref="editModalRef"
+      v-model:visible="editModalVisible"
+      :is-view="isView"
+      :direction="direction"
+      :initial-values="currentRecord"
+      @cancel="editModalCancel"
+      @ok="handleEditSubmit"
+      @preview-click="handlePreviewClick"
+    />
 
     <!-- 媒体预览 Modal -->
-    <a-modal v-model:open="mediaPreviewVisible" :title="videoPreviewTitle" :footer="null" width="900px"
-      @cancel="closeMediaPreview" :zIndex="2000">
+    <a-modal
+      v-model:open="mediaPreviewVisible"
+      :title="videoPreviewTitle"
+      :footer="null"
+      width="900px"
+      @cancel="closeMediaPreview"
+      :zIndex="2000"
+    >
       <div class="flex h-[60vh] gap-4">
         <!-- 左侧：混合列表 (图片+视频) -->
         <div class="w-1/4 overflow-y-auto border-r pr-2 media-list-container">
-          <div v-for="(item, index) in previewList" :key="index" class="mb-2 cursor-pointer list-item"
-            :class="{ select: index === currentMediaIndex }" @click="currentMediaIndex = index">
+          <div
+            v-for="(item, index) in previewList"
+            :key="index"
+            class="mb-2 cursor-pointer list-item"
+            :class="{ select: index === currentMediaIndex }"
+            @click="currentMediaIndex = index"
+          >
             <span class="file-name">{{ item.name }}</span>
             <!-- 删除按钮 -->
-            <div class="list-item-delete" v-if="item.type != 'formVideo' && item.type != 'formImage'"
-              @click.stop="handleDeleteMedia(item, index)">
+            <div
+              class="list-item-delete"
+              v-if="item.type != 'formVideo' && item.type != 'formImage'"
+              @click.stop="handleDeleteMedia(item, index)"
+            >
               <CloseCircleOutlined />
             </div>
           </div>
         </div>
 
         <!-- 右侧：动态预览区域 -->
-        <div class="w-3/4 flex flex-col items-center justify-center bg-gray-100 relative p-4">
+        <div
+          class="w-3/4 flex flex-col items-center justify-center bg-gray-100 relative p-4"
+        >
+          <a-spin v-if="imageLoading" tip="图片加载中..." size="large" />
           <!-- 图片预览 -->
-          <a-image v-if="
-            currentMediaItem &&
-            currentMediaItem.url != '' &&
-            (currentMediaItem.type === 'image' || currentMediaItem.type === 'formImage')
-          " :src="currentMediaItem.url" class="max-w-full max-h-full object-contain" />
-          <div v-else-if="
-            currentMediaItem &&
-            currentMediaItem.url == '' &&
-            (currentMediaItem.type === 'image' || currentMediaItem.type === 'formImage')
-          " class="text-gray-400">
+          <div
+            v-if="
+              currentMediaItem &&
+              currentMediaItem.url != '' &&
+              (currentMediaItem.type === 'image' || currentMediaItem.type === 'formImage')
+            "
+          >
+            <img
+              v-show="!imageLoading && !imageLoadError"
+              :src="currentMediaItem.url"
+              alt="preview"
+              class="max-w-full max-h-[50vh] object-contain"
+              @load="onImageLoad"
+              @error="onImageError"
+            />
+
+            <!-- 3. 加载失败提示 -->
+            <div
+              v-if="!imageLoading && imageLoadError"
+              class="text-gray-400 flex flex-col items-center"
+            >
+              <ExclamationCircleOutlined style="font-size: 24px; margin-bottom: 8px" />
+              <span>图片加载失败</span>
+            </div>
+          </div>
+          <div
+            v-else-if="
+              currentMediaItem &&
+              currentMediaItem.url == '' &&
+              (currentMediaItem.type === 'image' || currentMediaItem.type === 'formImage')
+            "
+            class="text-gray-400"
+          >
             暂无图片预览
           </div>
 
           <!-- 视频预览 -->
-          <video v-else-if="
-            currentMediaItem &&
-            currentMediaItem.url != '' &&
-            (currentMediaItem.type === 'video' || currentMediaItem.type === 'formVideo')
-          " :src="currentMediaItem.url" controls autoplay class="max-w-full max-h-[50vh]">
+          <video
+            v-else-if="
+              currentMediaItem &&
+              currentMediaItem.url != '' &&
+              (currentMediaItem.type === 'video' || currentMediaItem.type === 'formVideo')
+            "
+            :src="currentMediaItem.url"
+            controls
+            autoplay
+            class="max-w-full max-h-[50vh]"
+          >
             您的浏览器不支持视频播放
           </video>
-          <div v-else-if="
-            currentMediaItem &&
-            currentMediaItem.url == '' &&
-            (currentMediaItem.type === 'video' || currentMediaItem.type === 'formVideo')
-          " class="text-gray-400">
+          <div
+            v-else-if="
+              currentMediaItem &&
+              currentMediaItem.url == '' &&
+              (currentMediaItem.type === 'video' || currentMediaItem.type === 'formVideo')
+            "
+            class="text-gray-400"
+          >
             暂无视频预览
           </div>
 
           <!-- 底部切换控制 -->
           <div class="absolute bottom-4 flex gap-4 z-10">
-            <a-button shape="circle" :icon="h(LeftOutlined)" @click="prevMedia" :disabled="currentMediaIndex === 0" />
+            <a-button
+              shape="circle"
+              :icon="h(LeftOutlined)"
+              @click="prevMedia"
+              :disabled="currentMediaIndex === 0"
+            />
             <span class="self-center text-gray-600 bg-white px-2 rounded shadow-sm">
               {{ currentMediaIndex + 1 }} / {{ previewList.length }}
             </span>
-            <a-button shape="circle" :icon="h(RightOutlined)" @click="nextMedia"
-              :disabled="currentMediaIndex === previewList.length - 1" />
+            <a-button
+              shape="circle"
+              :icon="h(RightOutlined)"
+              @click="nextMedia"
+              :disabled="currentMediaIndex === previewList.length - 1"
+            />
           </div>
         </div>
       </div>
@@ -155,9 +309,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, h, nextTick } from "vue";
+import { ref, computed, onMounted, h, nextTick, watch } from "vue";
 import { message, Modal } from "ant-design-vue"; // 假设使用 ant-design-vue
-import { LeftOutlined, RightOutlined, CloseCircleOutlined } from "@ant-design/icons-vue"; // 引入图标组件
+import { LeftOutlined, RightOutlined, CloseCircleOutlined, ExclamationCircleOutlined } from "@ant-design/icons-vue"; // 引入图标组件
 import BasicTable from "@/components/BasicTable/index.vue";
 import GuoYuSheShiShuJuTianBaoSearch from "./guoYuSheShiShuJuTianBaoSearch.vue";
 import GuoYuSheShiShuJuTianBaoTable from "./guoYuSheShiShuJuTianBaoTable.vue";
@@ -174,18 +328,17 @@ import {
   importFishZip,
   cancelImportTask,
   checkImportStatus,
-  importBatchSaveDraft,
+  batchSaveDraft,
   getLastImportResult,
-  markImportTaskSuccess,
   deleteFile,
-  batchApproveAll
+  batchApproveAll,
 } from "@/api/guoYuSheShiShuJuTianBao";
 import { Tag } from "ant-design-vue"; // 确保导入 Tag
 import { getDictItemsByCode } from "@/api/dict";
-import dayjs from "dayjs";
 
 const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL;
 const baseUrlPreview = import.meta.env.VITE_APP_BASE_URL;
+const baseUrlApi = import.meta.env.VITE_APP_BASE_API_URL;
 // --- 类型定义 ---
 interface FormData {
   [key: string]: any;
@@ -201,7 +354,9 @@ interface ColumnConfig {
 }
 const fileInputRef = ref<any>(null);
 const tableRef = ref<any>(null);
-const searchRef = ref<any>(null);
+// 图片加载状态
+const imageLoading = ref(false);
+const imageLoadError = ref(false);
 // 字典项
 const direction = ref<any>([]);
 const guoyuStatus = ref<any>([]);
@@ -388,6 +543,10 @@ const submitBtn = async () => {
 };
 //全部提交按钮
 const allSubmitBtn = async () => {
+  if (tableRef.value.tableData.length === 0) {
+    message.warning("请先添加数据！");
+    return;
+  }
   Modal.confirm({
     title: "是否 提交 全部数据吗?",
     onOk: async () => {
@@ -585,21 +744,18 @@ const handleModalOk = () => {
       return;
     }
   }
-  fileTableData.value.forEach((item) => {
-    item.tm = dayjs().format("YYYY-MM-DD HH:mm:ss");
-  });
   Modal.confirm({
     title: "是否提交导入数据?",
     onOk: async () => {
-      let res: any = await importBatchSaveDraft({
-        taskId: taskId.value,
-        fishDraftDataList: fileTableData.value,
+      let res: any = await batchSaveDraft({
+        taskId: taskId.value
       });
       if (res && res?.code == 0) {
-        message.success("导入成功");
+        fileTableData.value = [];
+        taskId.value = "";
         tableRef.value?.refresh();
         visible.value = false;
-        await markImportTaskSuccess({ id: taskId.value });
+        message.success("导入成功");
       } else {
         message.error("导入失败,请检查数据是否正确");
       }
@@ -617,6 +773,8 @@ const handleCustomCancel = () => {
       // 可选：调用取消接口
       let res: any = await cancelImportTask({ taskId: taskId.value });
       if (res && res?.code == 0) {
+        fileTableData.value = [];
+        taskId.value = "";
         message.success("取消成功");
         tableRef.value?.refresh();
         visible.value = false;
@@ -626,9 +784,8 @@ const handleCustomCancel = () => {
     },
   });
 };
-// 导入-按钮
 const importBtn = async () => {
-  let res: any = await checkImportStatus();
+  let res: any = await checkImportStatus(); 
   taskId.value = "";
   if (res?.code == 0) {
     const { hasImportingTask, currentTask } = res?.data || {};
@@ -637,18 +794,21 @@ const importBtn = async () => {
     }
     if (hasImportingTask) {
       visible.value = true;
-      nextTick(async () => {
-        try {
-          fileLoading.value = true;
-          modalTableRef.value.editingRowIndex = null;
-          let res1: any = await getLastImportResult();
-          fileTableaAnalysis(res1, "get");
-        } catch (error) {
-          message.error("导入失败");
-        } finally {
-          fileLoading.value = false;
-        }
-      });
+      fileLoading.value = true;
+      if (currentTask.status == "UPLOADED") {
+        if (visible.value) message.warning(currentTask.statusText);
+      } else if (currentTask.status == "VALIDATED") {
+        nextTick(async () => {
+          try {
+            modalTableRef.value.editingRowIndex = null;
+            getFileList();
+          } catch (error) {
+            message.error("导入失败");
+          } finally {
+            fileLoading.value = false;
+          }
+        });
+      }
     } else {
       fileInputRef.value?.click();
     }
@@ -656,6 +816,10 @@ const importBtn = async () => {
     message.error("导入查询失败");
   }
 };
+const getFileList = async () => {
+  let res: any = await getLastImportResult();
+  fileTableaAnalysis(res, "get");
+}
 // 上传文件
 const fileChange = (file: File) => {
   try {
@@ -667,16 +831,20 @@ const fileChange = (file: File) => {
       formData.append("file", file);
       let res: any = await importFishZip(formData);
       const { code } = res.data || {};
-      if (code == 1) {
-        message.error("导入失败");
-      } else {
-        taskId.value = res.data.taskId;
-        if (res.data.summary) {
-          message.success(res.data.summary);
+      try {
+        if (code == 1) {
+          message.error("导入失败");
         } else {
-          message.success("导入成功");
+          taskId.value = res.data.taskId;
+          if (res.data.summary) {
+            message.success(res.data.summary);
+          } else {
+            message.success("导入成功");
+          }
+          fileTableaAnalysis(res, "file");
         }
-        fileTableaAnalysis(res, "file");
+      } catch (error) {
+        message.error("导入失败");
       }
     });
   } catch (error) {
@@ -737,6 +905,7 @@ const fileTableaAnalysis = (res: any, type: string) => {
   list.forEach((item) => {
     data.push({
       ...item.data,
+      rowIndex: item.rowIndex,
       vdpthList: item.vdpthList,
       vdpthsWarnings: item.vdpthsWarnings,
       picpthList: item.picpthList,
@@ -779,13 +948,13 @@ const handleSearchFinish = (values: any) => {
       field: "strdt",
       operator: "gte",
       dataType: "date",
-      value: values.strdt[0] + ' 00:00:00',
+      value: values.strdt[0] + " 00:00:00",
     },
     {
       field: "strdt",
       operator: "lte",
       dataType: "date",
-      value: values.strdt[1] + ' 23:59:59',
+      value: values.strdt[1] + " 23:59:59",
     },
     values.direction && {
       field: "direction",
@@ -836,6 +1005,8 @@ const handleSearchFinish = (values: any) => {
 const handlePreviewClick = (record: any, type: string, index: number) => {
   const mixedList: MediaItem[] = [];
   if (type === "image") {
+    imageLoading.value = true;
+    imageLoadError.value = false;
     tablePreviewRecord.value = record;
     videoPreviewTitle.value = "图片预览";
     const nameList = record.picpthList;
@@ -845,7 +1016,7 @@ const handlePreviewClick = (record: any, type: string, index: number) => {
         type: "image",
         name: item.name,
         url:
-          baseUrlPreview +
+          baseUrlApi +
           "/data/fishDraft/previewFile?filename=" +
           item.name +
           "&taskId=" +
@@ -863,7 +1034,7 @@ const handlePreviewClick = (record: any, type: string, index: number) => {
         type: "video",
         name: item.name, // 视频通常没有单独的名称字段，可根据需要调整
         url:
-          baseUrlPreview +
+          baseUrlApi +
           "/data/fishDraft/previewFile?filename=" +
           item.name +
           "&taskId=" +
@@ -872,6 +1043,8 @@ const handlePreviewClick = (record: any, type: string, index: number) => {
       });
     });
   } else if (type === "formImage") {
+    imageLoading.value = true;
+    imageLoadError.value = false;
     videoPreviewTitle.value = "图片预览";
     const nameList = JSON.parse(JSON.stringify(record)).picpthList;
     nameList.forEach((item: any) => {
@@ -930,8 +1103,8 @@ const handleDeleteMedia = (item: any, index: number) => {
             videoPreviewTitle.value == "图片预览"
               ? 1
               : videoPreviewTitle.value == "视频预览"
-                ? 2
-                : 0,
+              ? 2
+              : 0,
           filename: item.name,
         };
         try {
@@ -997,7 +1170,6 @@ const calcTableScrollY = () => {
   if (!tableContainerRef.value) return;
   // 获取容器高度
   const containerHeight = tableContainerRef.value.clientHeight;
-  console.log(containerHeight);
   // 估算表头（约 55px） + 分页器（约 64px） + 上下内边距容差（10px） = 约 130px
   // 如果你有筛选栏等，需要额外减去
   const otherHeight = 112;
@@ -1009,6 +1181,29 @@ const calcTableScrollY = () => {
 const observer = new ResizeObserver(() => {
   calcTableScrollY();
 });
+
+// 【新增】图片加载完成回调
+const onImageLoad = () => {
+  imageLoading.value = false;
+  imageLoadError.value = false;
+};
+
+// 【新增】图片加载失败回调
+const onImageError = () => {
+  imageLoading.value = false;
+  imageLoadError.value = true;
+};
+watch(currentMediaIndex, (newIndex) => {
+  const item = previewList.value[newIndex];
+  if (item && (item.type === "image" || item.type === "formImage")) {
+    imageLoading.value = true;
+    imageLoadError.value = false;
+  } else {
+    imageLoading.value = false;
+    imageLoadError.value = false;
+  }
+});
+
 // --- 生命周期 ---
 onMounted(() => {
   nextTick(() => {
@@ -1018,15 +1213,14 @@ onMounted(() => {
     }
   });
   getDictItemsByCode({ dictCode: "direction" }).then((res) => {
-     direction.value  = res.data
-
+    direction.value = res.data;
   });
   getDictItemsByCode({ dictCode: "approvalStatus" }).then((res) => {
-    guoyuStatus.value.length  = 0
+    guoyuStatus.value.length = 0;
     res.data.forEach((item: any) => {
-     if(item.itemCode != "APPROVED" ){
-      guoyuStatus.value.push(item);
-     }
+      if (item.itemCode != "APPROVED") {
+        guoyuStatus.value.push(item);
+      }
     });
     // guoyuStatus.value = res.data;
   });
diff --git a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
index 2f8d296..a38b63e 100644
--- a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
+++ b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
@@ -26,7 +26,7 @@
 
         <!-- 审批操作日志弹框 -->
         <a-modal v-model:open="approvalLogVisible" title="审批操作日志" width="1600px" :footer="null"
-            destroy-on-close="false">
+            :destroy-on-close="false">
             <div class="approval-log-modal-content">
                 <ApprovalLogSearch :action-type-dict="actionTypeDict" @search-finish="handleApprovalLogSearch"
                     @reset="handleApprovalLogReset" />
@@ -42,7 +42,7 @@
         </a-modal>
 
         <!-- 数据变更记录弹框 -->
-        <a-modal v-model:open="changeLogVisible" title="数据变更记录" width="1600px" :footer="null" destroy-on-close="false">
+        <a-modal v-model:open="changeLogVisible" title="数据变更记录" width="1600px" :footer="null" :destroy-on-close="false">
             <div class="change-log-modal-content">
                 <ChangeLogSearch :operation-type-dict="operationTypeDict" @search-finish="handleChangeLogSearch"
                     @reset="handleChangeLogReset" />
@@ -64,14 +64,14 @@
         </a-modal>
 
         <!-- 详情信息弹框 -->
-        <a-modal v-model:open="detailVisible" title="详情信息" width="1800px" :footer="null" destroy-on-close="false">
+        <a-modal v-model:open="detailVisible" title="详情信息" width="1800px" :footer="null" :destroy-on-close="false">
             <div class="detail-modal-content">
                 <!-- 搜索组件 -->
                 <ApprovalDetailSearch :guoyu-status="guoyuStatus" :direction="direction"
                     @search-finish="handleDetailSearchFinish" @reset="handleDetailReset" />
 
                 <!-- 表格组件 -->
-                <BasicTable ref="detailTableRef" :columns="detailColumns" :list-url="getFishDraftPage"
+                <BasicTable ref="detailTableRef" :columns="detailColumns" :isOneLoad="false" :list-url="getFishDraftPage"
                     :scroll-y="'500px'" :transform-data="customTransform">
                     <template #bodyCell="{ column, record }">
                         <template v-if="column.dataIndex === 'isfs'">
@@ -196,6 +196,7 @@ import ApprovalDetailSearch from "./approvalDetailSearch.vue";
 import EditModal from "@/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoForm.vue";
 import { getDictItemsByCode } from '@/api/dict';
 import { getFishDraftPage } from "@/api/guoYuSheShiShuJuTianBao";
+import { set } from 'lodash';
 
 const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL;
 const baseUrlPreview = import.meta.env.VITE_APP_BASE_URL;
@@ -208,7 +209,31 @@ let columns = ref([
         width: 120,
         fixed: "left",
     },
-    { dataIndex: "ennm", key: "ennm", title: "电站名称", width: 120, fixed: "left" },
+    { dataIndex: "ennm", key: "ennm", title: "电站名称", width: 120, fixed: "left",
+     customRender: ({ text }: any) => {
+            if (!text) return "-";
+            
+            const str = String(text);
+            // 按逗号分割（支持中文逗号和英文逗号）
+            const items = str.split(/[,，]/);
+            
+            // 如果数量超过6个，截取前6个并添加省略号
+            let displayText = "";
+            if (items.length > 6) {
+                displayText = items.slice(0, 6).join("，") + " ...";
+            } else {
+                displayText = str;
+            }
+
+            // 返回 span 标签，title 属性用于悬停显示全称
+            return h('span', { 
+                title: str, 
+                style: { 
+                    cursor: 'default' 
+                } 
+            }, displayText);
+        },
+    },
     {
         title: '审批批次号',
         dataIndex: 'approvalNo',
@@ -554,42 +579,9 @@ const handleDetailReset = (values: any) => {
 // 显示详情弹框
 const approvalId = ref('');
 const handleShowDetail = (record: any) => {
-    detailVisible.value = true;
-    // 延迟调用，确保弹框和 BasicTable 组件完全渲染 approvalNo:record.approvalNo
+    approvalId.value = record.id;
     setTimeout(() => {
-        approvalId.value = record.id;
-
-
-        // 传入 approvalNo 的筛选条件
-        const filters = [
-            {
-                field: "strdt",
-                operator: "gte",
-                dataType: "date",
-                value: dayjs().subtract(1, "month").startOf("month").format("YYYY-MM-DD HH:mm:ss"),
-            },
-            {
-                field: "strdt",
-                operator: "lte",
-                dataType: "date",
-                value: dayjs().endOf("day").format("YYYY-MM-DD  HH:mm:ss"),
-            },
-            approvalId.value && {
-                field: "approvalId",      // 字段名
-                operator: "eq",           // 等于操作符
-                dataType: "string",       // 字符串类型
-                value: approvalId.value  // 从 record 中获取审批批次号
-            }
-
-        ].filter(Boolean);
-
-        const filter = {
-            logic: "and",
-            filters: filters,
-        };
-        detailTableRef.value?.getList(filter);
-        // detailTableRef.value?.getList();
-
+        detailVisible.value = true;
     }, 300);
 };
 
@@ -940,10 +932,6 @@ const handleBatchRejectConfirm = async () => {
             message.success('批量驳回成功');
             batchRejectVisible.value = false;
             batchRejectForm.value.rejectReason = '';
-            // 清空选中状态
-            tableRef.value?.clearSelection();
-            // 刷新表格（保持当前搜索条件）
-            handleSearchFinish(searchData.value);
         }
 
     } catch (error) {
diff --git a/frontend/src/views/system/record/index.vue b/frontend/src/views/system/record/index.vue
index e10e622..ee74f25 100644
--- a/frontend/src/views/system/record/index.vue
+++ b/frontend/src/views/system/record/index.vue
@@ -170,7 +170,7 @@ function handleClose(){
       <Page :total="total" v-model:size="queryParams.size" v-model:current="queryParams.current" @pagination="init()">
       </Page>
     </div>
-    <el-dialog title="日志详情" v-model="LogDetails" width="90%" :before-close="handleClose" top="30px" draggable destroy-on-close>
+    <el-dialog title="日志详情" v-model="LogDetails" width="90%" :before-close="handleClose" top="30px" draggable :destroy-on-close="false">
       <el-table v-loading="loading" :data="Logdata"
         style="width: 100%; height: calc(50vh - 266px);margin-bottom: 20px;" border
         :header-cell-style="{ background: 'rgb(250 250 250)', height: '50px' }">
diff --git a/frontend/src/views/system/review/index.vue b/frontend/src/views/system/review/index.vue
index 9ac4672..b8ec4eb 100644
--- a/frontend/src/views/system/review/index.vue
+++ b/frontend/src/views/system/review/index.vue
@@ -25,7 +25,6 @@ import {
 import { ElMessageBox, ElMessage } from "element-plus";
 import Page from '@/components/Pagination/page.vue'
 import { Search } from '@element-plus/icons-vue'
-import { p } from "vue-router/dist/router-CWoNjPRp.mjs";
 // 表格加载
 const loading = ref(false);
 // 搜索框
@@ -981,20 +980,20 @@ function handleClearSelection() {
                 :v-loading="dialog" @selection-change="handleSelectionChange"
                 :header-cell-style="{ background: 'rgb(250 250 250)', color: ' #383838', height: '50px' }">
                 <!-- <el-table-column type="selection" width="50" align="center" /> -->
-                <el-table-column type="index" label="序号" width="70" align="center" />
+                <el-table-column type="index" label="序号" width="60" align="center" />
                 <el-table-column prop="nickname" label="用户姓名" width="140"></el-table-column>
                 <!-- <el-table-column prop="avatar" label="头像"></el-table-column> -->
-                <el-table-column prop="email" label="邮箱"></el-table-column>
-                <el-table-column prop="phone" label="手机号" min-width="90"></el-table-column>
-                <el-table-column prop="username" label="登录账号" width="120"></el-table-column>
+                <!-- <el-table-column prop="email" label="邮箱"></el-table-column> -->
+                <el-table-column prop="phone" label="手机号" width="160"></el-table-column>
+                <el-table-column prop="username" label="登录账号" ></el-table-column>
                 <!-- <el-table-column prop="custom1" label="登录账号"></el-table-column> -->
-                <el-table-column prop="rolename" label="所属角色" width="120">
+                <el-table-column prop="rolename" label="所属角色" >
                     <template #default="scope">
                         <span v-for="(item, index) in scope.row.roles" :key="index">{{ item.rolename }} <span></span>
                         </span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="regStatus" label="审核状态" width="120" align="center">
+                <el-table-column prop="regStatus" label="审核状态" width="90" align="center">
                     <template #default="scope">
                         <el-tag :type="getRegStatusColor(scope.row.regStatus)" size="small">
                             {{ getName(regStatusArr, scope.row.regStatus) }}
@@ -1002,7 +1001,7 @@ function handleClearSelection() {
                     </template>
                 </el-table-column>
                 <el-table-column prop="lastmodifier" label="最近修改者" width="120"></el-table-column>
-                <el-table-column prop="lastmodifydate" label="最近修改日期" width="205">
+                <el-table-column prop="lastmodifydate" label="最近修改日期" width="160">
                     <template #default="scope">
                         {{ dateFormat(scope.row.lastmodifydate) }}
                     </template>
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 15e4b3a..a3bd19b 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -452,7 +452,7 @@ onMounted(() => {
         <el-button type="primary" @click="organizesubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="权限分配" v-model="accessVisible" width="500px" :before-close="handleClose" destroy-on-close draggable style="max-height: 640px;" >
+    <el-dialog title="权限分配" v-model="accessVisible" width="500px" :before-close="handleClose" :destroy-on-close="false" draggable style="max-height: 640px;" >
       <el-tree ref="tree" style="max-height: 400px;overflow:auto" :data="accessdata" show-checkbox node-key="id" accordion
         :default-expanded-keys="DefaultDeployment" :props="defaultProps" @check="currentChecked" />
       <span class="dialog-footer"