From b0993090e376f517e7ba829fcf6622651b811caa Mon Sep 17 00:00:00 2001
From: Yq <990442024@qq.com>
Date: Thu, 27 Mar 2025 14:42:03 +0800
Subject: [PATCH] '1'

---
 src/api/dw/index.js                          |  32 +
 src/api/zx/index.js                          |   4 +
 src/assets/images/eyes.png                   | Bin 0 -> 4729 bytes
 src/assets/images/gthz.png                   | Bin 0 -> 3687 bytes
 src/router/index.js                          |  24 +-
 src/views/pages/anquan/component/FilePre.vue |  18 +-
 src/views/pages/anquan/qzxscxkyxh.vue        |  77 +-
 src/views/pages/anquan/qzxscxkyxhsp.vue      |  29 +-
 src/views/pages/dataService/wzzysjdr.vue     |   2 +-
 src/views/pages/dw/gjxzbylb.vue              | 469 +++++++++++
 src/views/pages/dw/kvjys.vue                 |  93 +-
 src/views/pages/dw/pszlk.vue                 | 510 ++++++++++-
 src/views/pages/jh/gjxzbylb.vue              | 469 +++++++++++
 src/views/pages/jh/jhzb.vue                  | 294 +++++++
 src/views/pages/jj/prjMan.vue                | 677 +++++++++------
 src/views/pages/jj/prjManTest.vue            | 838 +++++++++++++++++++
 src/views/pages/jj/prjapro.vue               | 324 ++++---
 vite.config.js                               |   4 +-
 18 files changed, 3385 insertions(+), 479 deletions(-)
 create mode 100644 src/assets/images/eyes.png
 create mode 100644 src/assets/images/gthz.png
 create mode 100644 src/views/pages/dw/gjxzbylb.vue
 create mode 100644 src/views/pages/jh/gjxzbylb.vue
 create mode 100644 src/views/pages/jh/jhzb.vue
 create mode 100644 src/views/pages/jj/prjManTest.vue

diff --git a/src/api/dw/index.js b/src/api/dw/index.js
index c3c140e..dbf8565 100644
--- a/src/api/dw/index.js
+++ b/src/api/dw/index.js
@@ -14,3 +14,35 @@ export const addOrUpdate=(pay)=>{
 export const deleteitem=(pay)=>{
     return $post(`/zhTeam/delete`,pay)
 }
+
+// 获取项目列表
+export const recordList=(pay1,payload)=>{
+    return $post(`/zhTeam/list?pageNum=`+pay1.pageNum+`&pageSize=`+pay1.pageSize,payload)
+
+}
+// 获取项目列表
+export const exportBasic=(pay)=>{
+    return $postBlob(`/zhTeam/exportBasic`,pay)
+}
+
+// 获取项目列表
+export const importData=(pay)=>{
+    return $postBlob(`/zhTeam/importData`,pay)
+}
+// 获取项目列表
+export const uploadFile=(pay)=>{
+    return $postBlob(`/zhFile/uploadFile`,pay)
+}
+// 获取项目列表
+export const delFile=(pay)=>{
+    return $post(`/zhFile/delFile?id=`+pay)
+}
+// 获取项目列表
+export const getOneObs=(pay)=>{
+    return $postBlob(`/zhFile/getOneObs?id=`+pay)
+}
+
+// 获取项目列表
+export const listFile=(pay1,payload)=>{
+    return $post(`/zhFile/listFile?pageNum=`+pay1.pageNum+`&pageSize=`+pay1.pageSize,payload)
+}
diff --git a/src/api/zx/index.js b/src/api/zx/index.js
index c3465c1..e836dac 100644
--- a/src/api/zx/index.js
+++ b/src/api/zx/index.js
@@ -1143,3 +1143,7 @@ export const mergeApi=(payload)=>{
 export const upload=(payload)=>{
   return $post(`/zhUploadSlice/upload`,payload)
 }
+
+export const uploadFile=(payload)=>{
+  return $post(`/zhFile/uploadFile`,payload)
+}
diff --git a/src/assets/images/eyes.png b/src/assets/images/eyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..eacdbaf239c8c38fbcdc2603d0277fe0c47f4abb
GIT binary patch
literal 4729
zcmdUz`8N~})W&DVGGm{{z7NK}4H;Q81{s8*F!uFJma<Gj$k=zu7Lg<*h7yt``%Y@g
zo_(8;hRT+u*ZWtz=l$V6&pDs_+jGx7=boF4Gc#mi<YNQ?04zpWeaj0U{NIAmUuX@!
zw)nz;1WQ8<pmt1P699l+HqzI<8S1q2)c*dr_pC&DUy*EEqi?x)|7NPRV(U{?9^7ip
zs*qJLh@aL-NEkJg&0-*y=*J9>ILKLuCJA4$^k}Nr$tD`PSb&}m^&?zh_&g%eZPpd`
zUKB{vJKlqEA?CB@(}u#3Y~9&~^Akz5%$e8dXIqA{iNODBzykhzets?y8gWG3?Qrg~
z3BP~8<%r7S-1^FpAKu*)85Q+!FH|dIcp-S+*>P&V$m}Km5#>%(A*M6(?>3V8^~u?T
zQ%RM#i`0Mb`<+-MYVnJUUPR=7o4V7~L*WG1BdN;M(JL)&JEvxfLU8cI=$=dxFa|oi
zv$LZ!X3Wh%Q_8d|4oLs)2Ve^oh?Nl4qVdp00}Ng*0GVhvG{7HUw^N<vRO+F=7G8G1
z6+RV!$yD%$BS-|bqYIMihYp`FP?RDUb>0c2puiBsR1Y#jL8(rG_cMX>r`J?)M{#j+
zzg9(VhbI8&PY#~f^PZ@f<&cN;0J!!Em#csbZ3den<0ymdCz_YMF1c);oTqx?Zh}^Z
z-#+`qAUSI8w|B@mR4ZH4?Xl1ixky7R262cFx=a;AB6-y>Ut-XyVa=ggw{SlyXUt^j
z<k3}oYPKqOkD=U>jl6l6kKz~SwfmZnKV96NlSs;SMwc=oa{!<TdCdD}QI#c>uy4-S
zo3&OnD|z8sYmDVS^rG~i`8sbwK2*`tb|<aw9f^T?gi?BzcQ03XJbCcR_PkcT;5BRJ
zYv+!0wbw43HO7s0tIi;;-O()BOxNJcqvdF2XVb9vd}xQ_J-uO{rY-5pUn9Vg=BmST
zE;dIkIB)kW|C6)!WFrL`=Be7mK%RtUT^~A(ysHhF_+I~4Qz!bNRjwT=4;@vnDq@S0
zn=j;G8oZbjbsXWK$0=T2A*rfhWgs_G$N^4@n?fRCsAr+A{FevWvOV`q{zw=AMRCt#
zs12^SaW`bmlK&R%1U>&;T`5q<gSOPGg4LL-n##2;-^3X+HmiaWjmC8Av(&|oC}{_;
zClT7*mjbRd5N|Dgog_#Ug0iyw@x>Nk!mHz<$wytD#JTzTt^t$9{GQXD<73{dbd4Rx
zh^2mhYjgnY_~WlEQ^4{D{{~9tx$82D{lkz%CW#fo&AO|)f!d<)?a-bo^n29yni0az
zDm%Zmv{K6L;Qv+?Q4Q>lcE9Z^HQrO&O3OL=+tA@nPEyWe(kt$2KzICVfLesi{kWZV
zeMDyg+=(gc2NAhk>8ak3lz<o0^mNLKtVPJe1=Qx&GUYkFp?nvFGs};NoU0IDWx*)z
zC|_0_vIdQTAnvfwOGvc^L}xr=K!vCVPg@tGPwd(=1C^si86n^d3Wd^Ps&gGgfGwd#
zKio56hE5gyyOi*EVhN6|CYz{d799#4+52$5;eq$2<aUuOy9q5HiTb3s;vfi0y2(<(
z&~&yv5tuwU`@sWU8J5^ZepmYPPw`&4n=-<Pi2KbN>+Ym|n(-r`ELu|nsL;TE%d599
z$vW%TBLq4r%uxBG^yJI9@Uw!XU4=U|sz+1P813n=zH?PyS*K6^Ig&FG>tcRrDaDyz
zA*;=1pZ0|xHg0)K{S8S-xm{#Sgz8mq$XNRdpG|H(&I<_%LDoQjcfOcfPB@f9PlndP
zFrr(U*c}yYWNpWT8u6vM!|e8l_!+l&I}h|^(CshXqccuhlLlX?)~iZ14!moVhA?=}
zXGW4OldzVOwLBp>I>K4D1eankZhH>~r?s1)2#)%54;m{3(8xAGLx1|1;xO_)T@V&X
zUw8m}=>+1*5qxXy*2=2>oyShSlD{lt(s8W#(m@alWHQ~Gtp?(hqj9<%k@$MFL`EeJ
zTsQJG&dcwfw8)%6xD^MSL*tWhP08%s^%MrSe!k>svF@*g<=OJwmk$yIYk3ov>pyRr
z&9t|t?rR=Wb8y?I3R3RTmK*gG0+~<sv^i$1EgqM5iv;5;b=r@$bO-1A*<HdnPlPg(
zD>sm)BxRhImW1m=5GJ%_wpR<7K{D)6;-bdiub9lgw6R&L+zE(zQZxP}pPjjPe9$2N
zVPi_&cE0@vy1x2@JBcl;<3@^<l41}iloWK!bW}R#fTpcn4q~)bc-2xyBg?p`RX#?p
zmM@tHj;B6qC{t^CqqcKncvknM(B32CO0um*#_7BE#H=^Y+y6x2wA;<imRL4=gZJk%
z;_>-ubF_{JIeEcj2Z**oQTVjJ;fwvQguFWesdMj=fX&zR4#~GO1Xlyd=uuD%i{iVq
zCU@<P^NgMF<YM<(FBt@1y5MB0+`3ym(S`rEZAnR*c)XPfeRO`d%C<pX+L<Q$4cB;^
zp|-fC@!<4Za^d#L1?eVr-M8$K`w<5ZHjvua4sv)XXj7iRR+!rMyM#b=F>c-R{K#O{
z>T_Zy)z*2uR+Ui#|8wRxyaIyyg_Z}>a}|b6%!QD+Uy=3t+Z5hWzj~Zqbj0{<eu#2=
zSZ`~$fdb{duLFIL1iv1>3d{$=92=|2Ezs`jt!gd2SY;psqpC3^d;bdh&2sLwE|J`d
z`&8XMQ9c%tgVqY%z#_og)TlcX!0Tj1)sA?kp4X57W&E9ykCY{?#S`^=s-Liri!Zxs
zzpQwxs#-QaPU#H4N)#G!`Q<tZ!KNBxIP#zDrocR<QAw5RmxMjji46iyB9h>VIGY@#
z$!gj2uZQ0qo_*@NhPJbU`7NRn`0|k^vhaL?(Zdft2{wH5HT4qYxoRu43net2f_1C5
z%}fNqEAy|fuEDvW>5&6`*DfSOb4|o?<Tz2<==2DXUL7tS1_8iK@eK(!SoF;VUc5M&
z#|g%GLlaOo#50%M^kTVuQlHbl<n#L=kmf;vAQv>aHBXK1_~mws@RUTl9az5_tb2`3
z3@)FDw_q!6%yJi*6!g4y*7#yP&i(7}#<Pq@QF)u728qq-=8g<YcI%cIB?<5iZnt-S
z0&gM{cVXIWr6}8;xO~1EDNCc9*1MTE_%)LRPVGpygi7~Lh<U34YqWtQ#I#6ZVAq;R
zz|(%b0DG#B3M-FnRbxzI!R#&}>Oq}b!yE(g7Bk8Y#mXW6s^%zYC-Twr^=}o#W$+F1
zMRsW#%Hz2I1S*Y78K7wtW|I?tq6>!QJ=s*?l|~CwcBQW}>rHVBdTfIaZw6|=@UGh8
z&ynSTqgO_^E+YQg{Gf)H_H{M>lX|N+&AZYUO0Iolblyl-ER{?WDXJ}cKh4eLZqz8T
zjjgteOiI2!Hen@Kx8Tla><svlCH^!a3BQUXC}4Jl6cc-vvn!B%-wwUY^BTh%`~Rv<
zs*P{yGH^Ad5X>ug-NfQHCHtv>E<4L~f+$v`d-`V62*W)GRIQT)PvX%YcsdN2KBV!E
zI(FZRhC#J0V8LRZ492e_n=CyJAgUzsiSGs%D`HR}_1TyCY25-%ByFMWq1#o78R>n|
zD?dHP`L7q*zkSpxlSuU%itI}3n?vDaoBphq3DRhbSs7z3x3)lA3{9vFE2Ucydbhxd
zUnn%rNx#k|ih55ohdVl2#vAqsX00yn8)kblQD;v}t6A^lJHzfBiOtM$kxN?e=ZNi3
z=S8%E2PNpS^-ghFsqt@gohF0lSGk@^ig6b?P1C0bpuu&`hNG2^bY;Pc-SNGN4v~u;
zBp~B}@3?hUM%d|Y2quY_MP7;M@&UWQos&l&?UG($+Q!<mo6p2?<%DfDb}aXl$wzMU
zZ@cSDX}1M2KDREqULPzf+lwPrf3J+N6Qg|3@i2(h>%6R3hZXnZ@Pv(`suR>1uwXiG
zR}Elo&>i^UAiNJBN9wuD&ok+CWyj66f#e*g&SGFnrvdWJu>s4WS_@?uatsBI*nqR<
zC>a7V4JDP}8}gyjQ<A+WbqZ)TRS?1KkBEn8qG=u2B^N|Cd-NE}j8{3_6)Xe91Upu>
zFBX4|%bAXn{rJVM=GQL-Vx#P>DjziT5{B2}cK20Y==70BV)^4WNdJn7&rh*q%$M8i
zkeWfEUf9854<pTG<{mxcZn+vc*Koe6VfoNMi<CCj6s|g*ySMs4z3ZaiaVFuT{P(k6
zd9FSqBt^N2HS|;M&8%z59lN}}MVUpy*%-NhZgCp*e<KhAayEhY(RP;u9fLGqcgmfo
zhOW}7Vwr0O7id~W>Ec!l#wlVq<{8jKR_QIFWxshk?0~V}mA1k$b$~h?lfN0E3xvD4
z-gRaVq<W0=a9`pjhMse3f(v@1@^_5S<bOQwWvuzL?I8W-Q_KsBCj9O!_3%MPnYy`>
zppEguqn5IS9o?n!<PlsJR>AT3#sb^g_mMuNFRO1;$p;jdMn&5p*P-QxCPK9Y3yQns
zgUW62e~y0g%qT8aMdUrA$pc;D+D*H1B=ls;*W3ED{K+*EKG{H4l!(OCY{=N#%h>FE
z^6c!A*&G`(qJ?^1b;}&DZI*4*=?v5oih^$B>F*meXTpV}XFPuVMUclxNT-7&PVr8n
z9)b#Km12ZQdMgHhE8^Vm6hetb!<L9sFmNwiDbhR_AVz_j48Non(?LTaffej`>H=h~
z>N(~<MT=3Y*8PZT=9mKSCfFMgo%tpxxR|CmSL23I_#%mj9PU^>$!joiy-qx6O{0|>
zF+61_^gNOWGZ^&8ug&#0{f-kQX<7!C)~0D}`owFH+Y%_du(2)OZr8F1J(yimJ9U|0
z5v$M5?(VOaTZLN2_r;cB+=f~)%IC4GFEl-4#=B76RlD)lzv1W41<Y4|HfE-l8LvBy
z4qcf%5U5VXF9#?YcU}#Ps>`f)=zI9Vc35)AH$1}>7@bHEQSyh~=uwWM+-K2Qp!}v0
zZu&m6B{GSSjQ0N~?c20)Cxo8^59)}YgccX9pq7;E{X?6i;k8-7A-iFEzq~>y$Gwjx
z>@VU(RolJ^K%IZS5GYc=GKg%>-_DOl<r??Y&rOnC{@|nR*ZB#G_O$TxKA8O2`yVb%
z-_Cr3U$W(?GA<w*yaFu>!#U_6X}NKk_TSK^xB*+!@(tee=k^r-zHsQjm^t1_Z!il-
zUi%Awko&uDJ6GA;4+?L$mSy_<jp+-6zLK$-&S3i>XQ;b<KEWj37BS=`_9KE!JfbZ=
zG7Y-UMB3ua{@hJXCh&6COj=eb3PBaEuBegJvzzx0mbpp$Z~HPwda>~q%k0LZs5}IY
z1-?+YruMMMrTON=r4k%@RUqiW@xa{_^0z7w0=u&8GU716jD{S%M12wsy#KS5^JmL5
z$EmJ5=84F6IB~d$RC4{UjXX9WqP~T#$>BTgnRzWnp20$ov(5*7+KIKcs=dTs9O6`%
z_~@#c23O&&V?R4OxNq#rGs^HlKpIfM9CsbR@ga76W=n}j;uo$lOP3QayDnuBxwq6=
zAQW(LJoDuI+o5*vqQ8=wq)^BJ;z!27YN*S9Q^8TqmnU2c(sg=at=0cE2v0MqJPRm?
zW%A;z)fri;ahIp$#a~y;YL>G->Dmp#u?!*#{&k)m#FeVBI4}wA)#X|-m;zuj@`&o6
zgPsthly{%SyC!3r^0Pw-#Otnszop9)T?*fPk>Pm$rjWi@Yb5-qosM>h%q1F+e$~X6
z<QADnv$#<jvay+Na34Jc<Ca1Ui&y7Ya~2#PGdDM1^=>(6k^|Djy%H4S+eN<ox>=!O
zzWT{J1lbm_;h0})5nKoqRV!K!qfktxN=T=w(UQ!c)quQa`rY+EB7(cR?waz#e<>R@
ze)sB|?<1&>^{qV*1LWZQ6qV7v20ko4Swvu|w@QuT3Jm%G1{~?^rkQh`hb@>~{E`4h
M24?!T7?+s;0p|$08~^|S

literal 0
HcmV?d00001

diff --git a/src/assets/images/gthz.png b/src/assets/images/gthz.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b7b4df0bdc6ea16d41e76a96840ce98c37c9513
GIT binary patch
literal 3687
zcmd^CS5uRL68(}8i1Z*3krprn>0OF|ks^fNi}WHzBy{N#CG-|hdhZ=XkS-krDIy>i
zKty_%A`wxz+#hkD?!)fRp4r{=urp`o#OUd$(NJEe1OR{rtFB^jS%?1{F!IY>YgU(c
zSwKDpYDz%e1luM6&~jl_?ivMH@8;5Y&owi=9Vy)VaLh3~poraij#9+#K9_$`5-d;R
zIC*JKo2j-PGa%gh>STF8Q)ikS-xT&e>K~xqLi3~mU^Fu-h`6N(PznkFn3r+|J+WYb
zY!pHX(AR)&>XifX>bba$R22}A;#g$olnVw*bfk|piU0sB{z0@+2Lu?Dvj*|#19()X
zONMzl08~!Xyh*tUU{bUs$7&1#{LE&gHI@-TV$s)~X88cjmalR>iV`5AuF^<sU*dl4
zg{BNpKs_ZUGSlx8ms^+=hyeqr5taTixl8<iPH+6Hy}SEDiG6W#aes3$bn!xrW~O=f
zr~kC>BB}m(z1jUD^P+ot)3@S}r*D-3fHxXx{uYA?2o5fWUiewAkPQG4Q*^x&|Bjy9
zf@L(`<<USeFMQbxf6q48-lCrOkO8Ji3V|8<K%~H2&~3n=vKWNaSPVH76?waS&^B`|
zEX*7Pa9grSh(3XJe0wF^>%DPy4$V`&MFS8D(+zK?2^Nd)1h&k*VWW*Iq{rt!fC9ts
zwqWE#ZKdI+o9%m73IO^KXsm5#cX!xD>hU?x)<&aPUwvv|I7Md6(TMF>e|D*!vmEQG
z=RI##+WaMb#VRVyJ%zo!y{;Db;DmwTuZ1?7ll3QKKX!;-GB&PRkv$*eZ3@Mr*j9bz
z6s+JX(#qu&EB_sLpX+`*SSIGx4?e4DjQ+3<N0B9<MafPKPZ+%JV}>GBZC!SHoE|T*
zh%UZ(q{;rcl+5w?`o)(G;W12uW7H43vOo*ziB)@&FaGArb))N{$0pZ5-ozY-Ufi(2
zrH~VAxtN3!VNq_B&bRBWJ}CsuAs;GeQDT}2M*2N6Hb~aH*ylY_6pj!!M*lnax;vVB
z8_R|@l_0M!zlO@;H%`fCym|-W7$+T*mrj6|h_i$#awH`&WO2W)h4P4_xIka_Nh?w%
zqzaBk&RFf2pB@S8b6uere$rijL^HBv6KkowwK+6TXnHXZp;~{c3^HgqipbXEgSqXx
zDb=~;p{S8eS7ep=(b`i9ybLHVAUVzZtSc<qy6Zt*=wpdZaz-cv2@lYoTwk2mtMH4S
zpO8X2aG%<&jYVaMmercNp|!p(*l2puM3>k{ywpfy*&Onf=eU?TJAThTB7{sCfO~F;
z@MBw7WjVdBM0<J@iQ7kF@i(#aZ*T^C0KDB_x^#XM+j9^xi?e3u|G6T31oy|o4iozi
z0zz7+)+*(8`nY|LY|{V+e~QLB08TKew`S;nJ-EvAINdUn#Qd-g?AX0%h;0dw9-c<+
zkj|crv$H3uA$(A<(1l0Vk|M$b<s$F=mh--U7p$t=K0iJT5Ri5y{a{%D`pngrg?G^V
z1^c57qgRm*58{q0o@OgsAUFuw8NpZ7%82~jNVaTwcc(QF9JPkiXio+u=OhKdqQ)V8
zA##((E==t7ca2B?c4m?jw(AsjRMPp4+0Hswkqp1zA|7Nv@rifEWPIyiSbFXV4}_`^
zUuNgsX~cUzHq9b?PZjOp;CogR3~$7%kT~>5JJ$<KNP$h%>IXCPZhK-jD*8H8={SgI
zCn^wLZ5plx?vqcJV(;+wkYKKRpJ63qc{XHO@|z!Bot<lpi7jt1fu;)POfh9)ZcTX{
z@c&a}e$Hc4jjyr(-nf%eiXWq$-Dug;L5M9_4u1bS+Dc<LWswCTuvoX<mRc7q*+lpS
zwdD*qxIXOfeDn}!Ed(~8u9r_&<cZ@quyA^X6CQg7Q|IfXOwLie|JTw&KGM7l7-6&a
zLS(K#&N+Q;k|7F(@#?4stRmn#84q^t_zm%*mY&PInRMNwr*exqVsFb1>D}<ii`I#D
zNeTWN8luK~QV<xgqI=emCClX4JD)>U8M+?xcgmI^2HA^ih>7&BeH;Id1-F4l`aP(&
zW?(cAMq{0`%-(RE=FGs7;}@w>V&5r~Z`A@^;#)W#?~>)I65y3%M5i0m&Vw<jZ?W+1
zn1VLUD*o{!X*LII%m{%Ds%#@PCuP^c@FQWJB3x;X2bez57LK3<%ui}f_|4J4(u)94
zw3Ds>T!Rd2cxp-)E2gH^a=diV{3cvFvLR)ayW|8MT{&$mq@Du#QFPM*Os{K9BP7!r
z<@8hm1}q7q$&p-iSDptGKl+FWJP5tYK{(h$0euVZIZY01%vmzmF4wO#G=1WbSNG{I
zs*I5(fnoB|w{oR9lHgJR(KYd!J&4FE;<B5h7R{r_i2d`*>}j=``czxID9|elGu7hV
z)#z@xW?b_{1x$RwQF83<eKp;%7PT2BrL9b-CG@W+T;_m!zTUijEvdtdQ$hV;b*MFN
z&?-prD~P^V-m9*|qU~HzwEDB;wk*uKtCo>hi(r-$VL!OaZ2G1E^cE*TrD|)^P+9(#
zRSQsx4XS*|=xj5I6hOuo#b+YO?t@E?ry@P0BFsT{Y}DB@s^xDc7?7o(&I#3yJme)t
zKcL9<<Y?X&f#@QWY&7}6;54C39#;MeUYn8%r`LIgt3*1W2Yv{q*>v~6kKg|IlbbEO
z*tp@^X;dcJ!V3x(0rOH71tX3WMtbSfC|Qh5pn3_r6d$tsG%8gy){tO}9w-tS7*Q4+
zEVt;dd4%^oq;m@_<HN{MmAPh#u5+;k-w4ziQZ^_%r1RlomY{R3*%g1ChvGt(9@e#S
z$MeyNgALmM=-~g#<m%|Yrkd91*1~)C3B)ZmUUJ1<-k|>|m{_Z?R5N9D`)iY+;*>2d
zQOnMR8Iv)H@L5V7VN=l?_s*|z1`(d;Sd0s32NAuNCJUF+Ux)NoRm`*TLXcYfcH*7l
z+jsAY9KLa%<BS+|ni7H#FZg=e?%SVICS&Q84!s|nYRq2Bt9-5w#a>a<Ork^aIx5$J
zb3Ez+>o`~(y<O_8QjuvP(r1oIL+H9T9_%S-MVYa5sykv@+oFEa^fXZ{rG>o7i&G&d
z7`7dL|97cG<|@V2(g)}+gU@0Y!HMp({+~5Z#C6B5ELp_qq6gx9tw^3SY}Pz+$7${m
zh(Wv0D%#%{1asy}pjt5Qn`ju#rm%}NDHAX~(w>GQpZUN|5iGKJv(Egc6~DHaw(`+3
z9KeFOni~4)i92FEx4JR8k4I5DU0n8Ml5JbVNJu6rr2NO8US8FGw<MO}udZ!{sV&=g
zaq`1tR7XEYv>95xky~rxXasGNZg@L{5S*OMoL9~saGcn`I##z$YhC3vpHlZrfJZYh
z^)_aR@aFfK3OZcjuJ>q)&$u&{k~PAaBVE$-N_0ups*r2Fc}2^{4MP9!jVT-mZuENI
zxEa^*ohP5~X}`m_r9-xrDKd>icmTr{@Thx)XR9ndb!zxn0$k@>ZnC^uz>U}m@AL%j
znXm5O;6veK8r_4Y(D8V3l(=x@EXxwIV_^-s?lTrxzu!q$Wf7u*DxLQ-@|Ujek2G^$
zVqTX$S+oMMEDXK9JECTi+Wi4U*Q(MyLW;k~r<KvspkOMyRL?&c>GBK9h(3_g)w7e6
zlZ1nNFWT-6YdSqNA{fogeJmz-1%3IBjl}M??~RN~(e0sp<`S%z&qV4qROwE1n_fP|
z1<267;^AdED?3Ir6>g&ZG6;XC66vqgi?@nf7Sz?{3D|j%oM{An68N~ne*V!Bud`kP
zad8oN_c*<;w)4ZqcB;lcqTLN1aX3Dr#5fT>^VB<=+9u<Ww4saL0gGbN&+dLDR2$U>
zK9|I65si#mCw>K=z%<;!iqeYS;$37|evA{7a8Mqhb7X67naXR6IJW<|15s^UpV?AS
zHDhA2&;`lN_9)SsN*~aNNv$bQk2cyQzFj^_8=2g=-56($(+}!}uHP_>Fj{|Ba*T8?
zwWaYm42ub!mb`NZk^zSu(%Q^5FKqECeqK5qKV>_Vb)SM1Wn>F(DxiKZ+nn#5oxetZ
z;H7toCy_{JUHca<b7|+<=O2DDaCQX`SwduC4jq%~jx3xKQkmV{ew%)khTmTDgwcnT
z7MA>Tkt$EQR`ijXW93;&K6UJ@C60yn7gM&>5-=Pq_b%pd8Z;!ei&4Y8uFq=FWvKul
zaAnxHy*O|+^|0@f5A}nRaRL}Jdu^uTX7_HaM<=D?8o&04MU(s4duOBBI{Tgkawsyj
zFDa1Hm<VJ3rD3r8Da*fjAir}EBvM&ndKEw8M(SAqVosO^S&d7x_VLPvSMu?E3b8#_
z1Xd^|<f#TDA)N=E_Hr$gzXuk-U5Y5ir6S0V8t~?^6QQ|%XD9nSkM`fj`{mxneVlKB
z%s+}%+T-=F%0s%6V)JSsqNgEcxFi#R%z9{F<9X>Q{y+QQ2%(4<dQ8-J;g`-4z^dw~
J)G66M`ww&piU<Gz

literal 0
HcmV?d00001

diff --git a/src/router/index.js b/src/router/index.js
index c84cf3a..88c1c00 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1323,18 +1323,18 @@ export const dynamicRoutes = [
                 name: 'screenJj',
                 meta: {title: '技经看板', icon: 'time'}
             },
-            {
-                path: 'test',
-                name: 'test',
-                component: () => import('@/views/test/index.vue'),
-                meta: {title: '测试', icon: 'time'}
-            },
-            {
-                path: 'testCopy',
-                name: 'testCopy',
-                component: () => import('@/views/test/testCopy.vue'),
-                meta: {title: '测试副本', icon: 'time'}
-            },
+            // {
+            //     path: 'test',
+            //     name: 'test',
+            //     component: () => import('@/views/test/index.vue'),
+            //     meta: {title: '测试', icon: 'time'}
+            // },
+            // {
+            //     path: 'testCopy',
+            //     name: 'testCopy',
+            //     component: () => import('@/views/test/testCopy.vue'),
+            //     meta: {title: '测试副本', icon: 'time'}
+            // },
         ]
     },
 ]
diff --git a/src/views/pages/anquan/component/FilePre.vue b/src/views/pages/anquan/component/FilePre.vue
index f9068a3..f93fa29 100644
--- a/src/views/pages/anquan/component/FilePre.vue
+++ b/src/views/pages/anquan/component/FilePre.vue
@@ -3,6 +3,7 @@
 <!--    <div class="close-icon" title="关闭" @click="close">-->
 <!--      <span style="color:white;font-size:20px">x</span>-->
 <!--    </div>-->
+
     <vue-office-docx
         v-if="['.doc', '.docx'].includes(extenson)"
         :src="filePreviewUrl"
@@ -49,7 +50,7 @@
         class="img-contion"
         v-if="['.jpg', '.jpeg', '.png'].includes(extenson)"
     >
-      <img :src="filePreviewUrl" alt="" />
+      <img :src="filePreviewUrl" alt=""  style="object-fit: contain;width:100%;height:100%;" />
     </div>
   </div>
 </template>
@@ -182,10 +183,10 @@ const renderPage = async (pdf, pageNum) => {
     // const canvas = document.createElement('canvas');
     const canvas = document.getElementById(`canvas-${pageNum}`);
     const context = canvas.getContext('2d');
-    
-    const viewport = page.getViewport({ scale: 1.5 });  // 调整缩放比例
-    canvas.height = viewport.height;
-    canvas.width = viewport.width;
+    console.log(page.getViewport,'getViewport')
+    const viewport = page.getViewport({ scale: .8,offsetX:-40});  // 调整缩放比例
+    canvas.height = '570';
+    canvas.width = '600';
     
     // 渲染页面
     await page.render({ canvasContext: context, viewport }).promise;
@@ -286,6 +287,7 @@ defineExpose({
   }
   .pdf-page{
     text-align: center;
+    overflow: scroll;
   }
   .close-icon {
     position: fixed;
@@ -311,11 +313,7 @@ defineExpose({
     display: flex;
     justify-content: center;
     align-items: center;
-    .img {
-      width: 100%;
-      height: 100%;
-      object-fit: contain;
-    }
+    
   }
 }
 </style>
diff --git a/src/views/pages/anquan/qzxscxkyxh.vue b/src/views/pages/anquan/qzxscxkyxh.vue
index 7ef92ce..5a4cb6f 100644
--- a/src/views/pages/anquan/qzxscxkyxh.vue
+++ b/src/views/pages/anquan/qzxscxkyxh.vue
@@ -11,21 +11,14 @@
         <!--            @keyup.enter="handleQuery"-->
         <!--        />-->
         <!--  -->
-        <el-select
+        <el-input
             v-model="selectName"
             filterable
             clearable
             placeholder="请输入名称"
             style="width: 500px"
         >
-          <el-option
-              v-for="item in prjOptions"
-              :key="item.code"
-              :label="item.value"
-              :value="item.value"
-          />
-
-        </el-select>
+        </el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -46,8 +39,8 @@
         <!--            <el-button type="primary">选取文件</el-button>-->
         <!--          </template>-->
         <!--        </el-upload>-->
-        <el-button type="success" @click="openDia(0)" >上传前置审查资料</el-button>
-        <el-button type="primary" @click="openDia(1)" >上传销号佐证材料</el-button>
+<!--        <el-button type="success" @click="openDia(0)">上传前置审查资料</el-button>-->
+<!--        <el-button type="primary" @click="openDia(1)">上传销号佐证材料</el-button>-->
 <!--        <el-button type="primary" @click="openDia(2)" >上传风险作业计划</el-button>-->
         <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
                 <el-upload
@@ -93,6 +86,7 @@
                   :key="item.code"
                   :label="item.value"
                   :value="item.code"
+                  @click.native="setSelectItemUpload(item)"
               />
 <!--              @click.native="setSelectItemUpload(item)"-->
 
@@ -111,13 +105,13 @@
                 v-model="upLoadZynrName"
                 clearable
                 filterable
-                multiple
-                :disabled="diaDisabled"
+                :disabled="diaDisabled||zyzynrdis"
                 placeholder="请输入名称"
                 style="width: 400px"
                 collapse-tags
                 collapse-tags-tooltip
                 :max-collapse-tags="8"
+                
             >
               <!--                  @click.native="setSelectItemZynr(item)"-->
   
@@ -126,6 +120,7 @@
                   :key="item.code"
                   :label="item.value"
                   :value="item.code"
+
               />
             </el-select>
           </el-form-item>
@@ -156,7 +151,7 @@
                   :auto-upload="false"
                   :on-exceed="handleExceed"
                   :on-change="handleFileChange"
-                  accept=".xls,.xlsx,.zip,.doc,.docx"
+                  accept=".xls,.xlsx,.doc,.docx,.png,.pdf"
                   :limit="1"
               >
 <!--                :on-change="handleFileChange"-->
@@ -203,7 +198,8 @@
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
+        <el-table-column label="单位"  width="180"  align="center"
+                         prop="buildUnitName" :show-overflow-tooltip="false"/>
         <el-table-column label="现场名称"  align="center" prop="siteName" :show-overflow-tooltip="true" width="300">
         </el-table-column>
         
@@ -229,11 +225,23 @@
         </el-table-column>
         <el-table-column label="状态"  align="center" prop="cancelNumStatus" :show-overflow-tooltip="false" width="120"/>
         <el-table-column label="操作" align="center"
-                         width="150"
+                         width="450"
                          fixed="right"
                          :show-overflow-tooltip="false" >
           <template #default="scope">
             <div style="display:flex;justify-content: center;">
+              <el-button
+                  type="primary"
+                  link
+                  v-show="!(scope.row.preReviewMaterialsStatus!=''&&scope.row.preReviewMaterialsStatus!=null)"
+                  @click="changeFun(scope.row,0,'newUp')"
+              >上传前置审查资料</el-button>
+              <el-button
+                  type="primary"
+                  link
+                  v-show="(!(scope.row.cancelNumStatus!=''&&scope.row.cancelNumStatus!=null))&&scope.row.preReviewMaterialsStatus=='已许可'"
+                  @click="changeFun(scope.row,1,'newUp')"
+              >上传销号佐证材料</el-button>
               <el-button
                   type="primary"
                   link
@@ -283,7 +291,7 @@ const submitUpload1 = () => {
       .then(data => {
         // 清空文件输入框
         upload1.value.clearFiles();
-        ElMessage.success('上传成功')
+        ElMessage.success(data.msg)
         file2.value=null
         resetQuery()
       }).then(res=>{
@@ -405,20 +413,28 @@ const downmloadFile=(row,num)=>{
 }
 let isNewUp=ref(true)
 let currentRow= ref({})
-const changeFun=(row,pay)=>{
+let zyzynrdis=ref(true)
+const changeFun=(row,pay,op)=>{
   console.log(row,'585')
   currentRow.value=row
   console.log(pay!==false,'pay!==false')
-  if(pay!==false){
-    isNewUp.value=false
-  }else {
+  if(op=='newUp'){
     isNewUp.value=true
+    // if(pay!==false){
+    //   isNewUp.value=false
+    // }else {
+    //   isNewUp.value=true
+    // }
+  }else {
+    isNewUp.value=false
   }
+  
   console.log(row)
   console.log(upLoadZynrName,'000')
   diaDisabled.value=true
   openDia(pay)
   upLoadname.value=row.id
+  upLoadZynrName.value=row.id
   // upLoadZynrName.value=row.workContent.split(',')
   // upLoadZynrName upLoadname
   if(pay==0){
@@ -426,8 +442,8 @@ const changeFun=(row,pay)=>{
       "preReviewMaterialsId":row.preReviewMaterialsId, //前置审查资料id
       "cancelNumId":'', //销号佐证Id
     }).then(res=>{
-      console.log(res)
-      upLoadZynrName.value=res.data.preReviewWorkContentId
+      console.log(res,'前置审查资料id')
+      
       console.log(upLoadZynrName,111)
     })
   }else if(pay==1){
@@ -436,7 +452,7 @@ const changeFun=(row,pay)=>{
       "cancelNumId":row.cancelNumId, //销号佐证Id
     }).then(res=>{
       console.log(res)
-      upLoadZynrName.value=res.data.cancelNumWorkContentId
+      // upLoadZynrName.value=res.data.cancelNumWorkContentId
     })
   }
 }
@@ -476,7 +492,7 @@ const closeDialog=()=>{
   upLoadname.value=''
   qzscId.value=''
   isNewUp.value=true
-  upLoadZynrName.value=[]
+  upLoadZynrName.value=''
   upLoadOrName.value=''
   diaDisabled.value=false
   reDia.value=0
@@ -678,9 +694,8 @@ const setSelectItem=(item)=>{
   selectName.value=item.value
 }
 const setSelectItemUpload=(item)=>{
-  console.log(item)
-  selectItemUpload.value=JSON.parse(JSON.stringify(item))
-  upLoadname.value=item.value
+  console.log(upLoadZynrName,'upLoadZynrName')
+  upLoadZynrName.value=item.code
 }
 const setSelectItemZynr=(item)=>{
   console.log(item,'作业内容')
@@ -746,7 +761,7 @@ const submitUpload = () => {
   const formData = new FormData();
   formData.append('file', file.value);
   formData.append('siteNameId', upLoadname.value);
-  formData.append('workContents', upLoadZynrName.value.join(','));
+  // formData.append('workContents', upLoadZynrName.value);
   if(diaType.value==0){
     formData.append('preReviewId', qzscId.value);
     formData.append('preViewName', upLoadOrName.value);
@@ -764,7 +779,7 @@ const submitUpload = () => {
             value:''
           }
           upLoadname.value=''
-          upLoadZynrName.value=[]
+          upLoadZynrName.value=''
           upLoadOrName.value=''
           console.log('Success:', data);
           // 清空文件输入框
@@ -815,7 +830,7 @@ const submitUpload = () => {
               value:''
             }
             upLoadname.value=''
-            upLoadZynrName.value=[]
+            upLoadZynrName.value=''
             upLoadOrName.value=''
           
             console.log('Success:', data);
diff --git a/src/views/pages/anquan/qzxscxkyxhsp.vue b/src/views/pages/anquan/qzxscxkyxhsp.vue
index 2d376f8..48aa1cb 100644
--- a/src/views/pages/anquan/qzxscxkyxhsp.vue
+++ b/src/views/pages/anquan/qzxscxkyxhsp.vue
@@ -11,21 +11,21 @@
         <!--            @keyup.enter="handleQuery"-->
         <!--        />-->
         <!--  -->
-        <el-select
+        <el-input
             v-model="selectName"
             filterable
             clearable
             placeholder="请输入名称"
             style="width: 500px"
         >
-          <el-option
-              v-for="item in prjOptions"
-              :key="item.code"
-              :label="item.value"
-              :value="item.value"
-          />
-        
-        </el-select>
+<!--          <el-option-->
+<!--              v-for="item in prjOptions"-->
+<!--              :key="item.code"-->
+<!--              :label="item.value"-->
+<!--              :value="item.value"-->
+<!--          />-->
+<!--        -->
+        </el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -105,7 +105,6 @@
                   v-model="upLoadZynrName"
                   clearable
                   filterable
-                  multiple
                   :disabled="diaDisabled"
                   placeholder="请输入名称"
                   style="width: 400px"
@@ -198,7 +197,7 @@
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
+        <el-table-column label="单位" width="180"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
         <el-table-column label="现场名称"  align="center" prop="siteName" :show-overflow-tooltip="true" width="300">
         </el-table-column>
         
@@ -265,7 +264,9 @@
 // import { list as  recordList,reUploadDrawing,reUploadBudgetDrawing,prjInfoDrawingUploadList,
 // prjInfoBudgetUploadList,prjInfoList as  getPrjList,uploadDrawing as importCm ,
 // uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
-import { list as  recordList,listSiteName as  getPrjList,listWorkContent as prjInfoDrawingUploadList,uploadPreReviewFile as importCm,uploadCancelNumFile as importCm1} from '@/api/qzxscxkyxh/index.js'
+import { list as  recordList,listSiteName as  getPrjList,listWorkContent as prjInfoDrawingUploadList,
+  uploadPreReviewFile as importCm,
+  uploadCancelNumFile as importCm1} from '@/api/qzxscxkyxh/index.js'
 import { getOne } from '@/api/jj/gctzgl.js'
 
 // ,importCm,importCm1,deleteitem
@@ -329,6 +330,7 @@ const approve=()=>{
       spyj.value=''
       checkedCities.value=[]
       isOpenDialog.value=false
+      resetQuery()
     })
   }else if(diaType.value==1){
     updateApproval({
@@ -358,6 +360,7 @@ const approve=()=>{
       spyj.value=''
       checkedCities.value=[]
       isOpenDialog.value=false
+      resetQuery()
     })
   }
 
@@ -947,7 +950,7 @@ const submitUpload = () => {
   formData.append('file', file.value);
   formData.append('preReviewId', qzscId.value);
   formData.append('siteNameId', upLoadname.value);
-  formData.append('workContents', upLoadZynrName.value.join(','));
+  formData.append('workContents', upLoadZynrName.value);
   formData.append('preViewName', upLoadOrName.value);
   // 使用 fetch 发送请求
   if(diaType.value==0){
diff --git a/src/views/pages/dataService/wzzysjdr.vue b/src/views/pages/dataService/wzzysjdr.vue
index a95495b..a475d56 100644
--- a/src/views/pages/dataService/wzzysjdr.vue
+++ b/src/views/pages/dataService/wzzysjdr.vue
@@ -443,7 +443,7 @@ const submitUpload = () => {
         console.log('Success:', data);
         // 清空文件输入框
         upload.value.clearFiles();
-        ElMessage.success('上传成功')
+        // ElMessage.success('上传成功')
         file.value=null
         selectItem.value.id=''
         selectItem.value.name=''
diff --git a/src/views/pages/dw/gjxzbylb.vue b/src/views/pages/dw/gjxzbylb.vue
new file mode 100644
index 0000000..dd0b634
--- /dev/null
+++ b/src/views/pages/dw/gjxzbylb.vue
@@ -0,0 +1,469 @@
+<template>
+  <div style="padding: 20px">
+    <kanban pageTitle="2025年关键任务指标一览表">
+      <template v-slot:default>
+        <div class="search_box">
+          <div class="search_item">
+            <el-form :model="form" label-width="80px">
+              <el-form-item style="width: 500px;" label="单位">
+                <el-input v-model="form.fileName" placeholder="单位" ></el-input>
+              </el-form-item>
+              <el-form-item style="width: 500px;" label="指标">
+                <el-input v-model="form.zb" placeholder="请输入指标名称" ></el-input>
+              </el-form-item>
+              <el-form-item style="width: 370px;">
+                <el-button
+                    @click="queryList"
+                    icon="Search"
+                    class="el-button--cyan"
+                    size="mini"
+                >查询</el-button
+                >
+                <el-button
+                    style="margin-right: 12px;"
+                    @click="reset"
+                    icon="Refresh"
+                    type="default"
+                    size="mini"
+                >重置</el-button
+                >
+                <div>
+                  <!--                  <el-upload-->
+                  <!--                      ref="upload"-->
+                  <!--                      action=""-->
+                  <!--                      :auto-upload="false"-->
+                  <!--                      :on-exceed="handleExceed"-->
+                  <!--                      :on-change="handleFileChange"-->
+                  <!--                      accept=".xls,.xlsx,.doc,.docx,.png,.pdf"-->
+                  <!--                      :limit="1"-->
+                  <!--                  >-->
+                  <!--                    &lt;!&ndash;                :on-change="handleFileChange"&ndash;&gt;-->
+                  <!--      -->
+                  <!--                    <template #trigger>-->
+                  <!--                      <el-button  style="transform: translateY(4px)"  type="primary" @click="submitUpload">上传</el-button>-->
+                  <!--                    </template>-->
+                  <!--                  </el-upload>-->
+                  
+                  
+<!--                  <el-upload-->
+<!--                      ref="upload1"-->
+<!--                      action="#"-->
+<!--                      :http-request="submitUpload1"-->
+<!--                      :on-change="handleFileChange1"-->
+<!--                      accept=".xls,.xlsx"-->
+<!--                      :show-file-list="false"-->
+<!--                      :limit="1"-->
+<!--                  >-->
+<!--                    <template #trigger>-->
+<!--                      <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传</el-button>-->
+<!--                    </template>-->
+<!--                  </el-upload>-->
+                
+                </div>
+                <!--                <FileUpload ref="upload" title="上传文件" :fileType="['xls','xlsx','doc','docx','pdf'] " url="/zhFile/uploadFile?useScope=3&useScopeRemark=专项工作" :isShowTip="false"  @reset="reset"></FileUpload>-->
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </template>
+    </kanban>
+    <div style="padding: 20px;
+        box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+        overflow-x: auto;
+        border-radius: 6px;background-color: #fff;"
+         class="tableWrapCon">
+      <el-table v-loading="loading" :data="tableList"
+                :header-cell-style="{ background:'rgb(244, 249, 253)',border:'1px solid rgb(235, 238, 242,.5)' }">
+        <el-table-column label="序号" type="index" width="60" align="center">
+          <template #default="scope">
+            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位"  width=""  align="center"
+                         prop="a" :show-overflow-tooltip="false"/>
+        <el-table-column label="指标"  align="center" prop="b" :show-overflow-tooltip="true" width="300">
+          <template #default="scope">
+            <div style="position: relative"></div>
+            {{scope.row.b}}<img style="position: absolute;width: 18px;height: 18px;transform: translateY(5px)" src="@/assets/images/gthz.png">
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="完成数"  width="" align="center" prop="c" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <el-tooltip
+                popper-class="popperClass"
+                effect="light"
+                placement="top"
+                v-if="scope.$index==3||scope.$index==4"
+            >
+              <template #content>
+                <el-table :data="tableData1">
+                  <el-table-column label="名称"  align="center" prop="a1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div @click="pp(scope)" style="position: relative;">
+                {{scope.row.c}}<img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.c}} </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划数"  align="center" prop="d" :show-overflow-tooltip="false">
+          <template #default="scope">
+            <el-tooltip
+                popper-class="popperClass"
+                effect="light"
+                placement="top"
+                style="transform: translateX(120px)"
+                v-if="scope.$index==3||scope.$index==4"
+            >
+              <template #content>
+                <el-table :data="tableData1">
+                  <el-table-column label="名称"  align="center" prop="a1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div @click="pp(scope)" style="position: relative">
+                {{scope.row.d}}<img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.d}} </div>
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="完成率"  align="center" prop="e" :show-overflow-tooltip="false">
+          <template #default="scope">
+            <el-tooltip
+                effect="light"
+                :popper-style="{transform: 'translateX(180px)'}"
+                placement="top-start"
+                v-if="(scope.row.a=='国网天津公司'&&scope.row.b=='电网建设质效')||
+              (scope.row.a=='国网经研院'&&scope.row.b=='项目评审支撑指教')"
+            >
+              <template #content>
+                <el-table :data="tableData2" v-if="scope.row.b=='电网建设质效'" >
+                  <el-table-column label="名称"  align="center" prop="a1"  width="120" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+                <el-table :data="tableData3" v-if="scope.row.b=='项目评审支撑指教'">
+                  <el-table-column label="名称"  align="center" prop="a1"  width="120" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div style="position: relative">
+                {{scope.row.e}}
+                <img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.e}} </div>
+          </template>
+        </el-table-column>
+      
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getList"
+      />
+    </div>
+    <FilePreview ref="filePreviewModel"  :filePreviewUrl="url" @hideClose="close" :extenson="extenson" />
+  </div>
+</template>
+<script setup>
+import kanban from "@/components/kanban";
+import bTable from "@/components/bTable";
+import { listFile,delFile,getOne,uploadFile as importCm1 } from "@/api/zx";
+import {onMounted, ref} from "vue";
+import {ElMessage} from "element-plus";
+const { proxy } = getCurrentInstance()
+const pp=(row)=>{
+  console.log(row)
+}
+onMounted(()=>{
+  // tableData1.value=[
+  //   {a:'基建',b:'',c:'',d:''},
+  //   {a:'组塔',b:'',c:'',d:''},
+  //   {a:'土建',b:'',c:'',d:''},
+  //   {a:'安装',b:'',c:'',d:''},
+  // ]
+})
+let tableData1=ref([
+  {a1:'基建',b1:'',c1:'',d1:''},
+  {a1:'组塔',b1:'',c1:'',d1:''},
+  {a1:'土建',b1:'',c1:'',d1:''},
+  {a1:'安装',b1:'',c1:'',d1:''},
+])
+let tableData2=ref([
+  {a1:'开工规模',b1:'',c1:'',d1:''},
+  {a1:'投产规模',b1:'',c1:'',d1:''},
+  {a1:'开工数量',b1:'',c1:'',d1:''},
+  {a1:'投产数量',b1:'',c1:'',d1:''},
+  {a1:'属地化任务',b1:'',c1:'',d1:''},
+])
+let tableData3=ref([
+  {a1:'完成项目评审',b1:'',c1:'',d1:''},
+  {a1:'完成项目内审',b1:'',c1:'',d1:''},
+  {a1:'重要支撑工作',b1:'',c1:'',d1:''},
+])
+const columns = [
+  { label: "单位", prop: "a", width: "150px" },
+  { label: "指标", prop: "b", itemWidth: "200px" },
+  { label: "完成数", prop: "c", itemWidth: "200px" },
+  { label: "计划数", prop: "d", itemWidth: "200px" },
+  { label: "完成率", prop: "e", itemWidth: "200px" },
+];
+const table_buttons=['预览','下载','删除']
+const form = ref({
+  fileName: "",
+  useScope:'13',
+  zb:''
+});
+
+const file1 = ref(null);
+const handleFileChange1 = (fileObj) => {
+  console.log(fileObj)
+  file1.value = fileObj.raw;
+};
+let upload1=ref(null)
+const submitUpload1 = () => {
+  
+  const formData = new FormData();
+  formData.append('file', file1.value);
+  formData.append('useScope', 13);
+  formData.append('useScopeRemark', 13);
+  // 使用 fetch 发送请求
+  importCm1(formData).then(response => response)
+      .then(data => {
+        // 清空文件输入框
+        upload1.value.clearFiles();
+        ElMessage.success('上传成功')
+        file1.value=null
+        queryList()
+      }).then(res=>{
+    if(res.code==200){
+      ElMessage.success(res.msg)
+    }
+  })
+  return
+};
+const filePreviewModel=ref(null)
+const pageNo = ref(1);
+const pageSize = ref(10);
+const tableList = ref([]);
+const selectList = ref([]);
+const totals = ref(0);
+const extenson=ref('');
+const url=ref('')
+const queryList = () => {
+  // console.log(pageNo.value,pageSize.value,'ss')
+  // listFile({pageNum: pageNo.value,
+  //   pageSize: pageSize.value},{
+  //   fileName: form.value.fileName,
+  //   useScope: 13
+  // }).then((res) => {
+  //   tableList.value = res.rows;
+  //   totals.value = res.total;
+  // });
+  tableList.value=[
+      {
+    a:'国网天津公司',
+    b:'电网建设质效',
+    c:'--',
+    d:'--',
+    e:'100%'
+  },
+      {
+    a:'国网建设公司',
+    b:'投产任务完成率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'国网建设公司',
+    b:'开工任务完成率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'天津送变电工程有限公司',
+    b:'电网建设质效',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'三源公司',
+    b:'电网建设质效',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'送变电',
+    b:'工程机械化施工率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'国网经研院',
+    b:'项目评审支撑指教',
+    c:'--',
+    d:'--',
+    e:'100%'
+  },
+  ]
+};
+
+//删除
+const deleted=(scope)=>{
+  delFile({id:scope.row.id}).then(res=>{
+    proxy.$modal.msgSuccess('删除成功');
+    queryList();
+  })
+}
+//预览
+const preview=(scope)=>{
+  getOne({id:scope.row.id}).then(res=>{
+    extenson.value = '.' + scope.row.fileName.split('.').pop();
+    const blob = new Blob([res]);
+    url.value = window.URL.createObjectURL(blob);
+    filePreviewModel.value.open();
+  })
+}
+const close=()=>{
+  window.URL.revokeObjectURL(url.value);
+}
+
+//下载
+const download = (scope) => {
+  // 调用获取文件数据的接口
+  getOne({ id: scope.row.id }).then((res) => {
+    // 检查返回的响应数据是否有效
+    if (res) {
+      // 假设返回的 res 已经是正确的二进制数据，可以作为 Blob 对象
+      const blob = new Blob([res]);
+      // 创建一个 URL 对象指向 Blob 数据
+      const url = window.URL.createObjectURL(blob);
+      // 创建一个临时的 <a> 元素，模拟点击进行下载
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = scope.row.fileName || 'downloaded-file'; // 设置默认文件名
+      document.body.appendChild(link); // 将链接添加到 DOM
+      link.click(); // 模拟点击，开始下载
+      document.body.removeChild(link); // 下载完成后移除链接
+      // 释放 URL 对象
+      window.URL.revokeObjectURL(url);
+    } else {
+      console.error('File data is invalid or empty');
+    }
+  }).catch((error) => {
+    console.error('Error while fetching file:', error);
+  });
+};
+const reset = () => {
+  pageNo.value = 1;
+  pageSize.value = 10;
+  form.value = {
+    fileName: "",
+    useScope: "3",
+    zb:''
+  };
+  queryList();
+};
+queryList();
+</script>
+<style scoped lang="less">
+/deep/ .el-input {
+  height: 38px;
+}
+/deep/.el-button {
+  height: 30px !important;
+}
+.search_box/deep/ .el-form-item__label {
+  font-weight: 500;
+  font-family: "Regular";
+  color: #607181;
+  padding: 0 0.625rem 0 0 !important;
+  // line-height: 2.1875rem;
+  line-height: 38px;
+}
+.search_box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0px 10px;
+  height: 70px;
+  background-color: rgba(255, 255, 255, 1);
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(242, 242, 242, 1);
+  border-radius: 0px;
+  .search_item {
+    flex: 4;
+    height: 120%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+  }
+  /deep/.el-form-item {
+    margin-bottom: 0 !important;
+  }
+  /deep/.el-form {
+    width:100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .search_button {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    .se {
+      background-color: #4ba8ff;
+      border: 0;
+    }
+    .re {
+      border: 0;
+      color: gray;
+      border: #cccccc 1px solid;
+      background-color: transparent;
+    }
+  }
+}
+.mainOfd{
+  
+  height: 100%;
+  
+  background: rgb(128, 128, 128);
+  
+  padding: 0px;
+  
+  position: absolute;
+  
+  width: 100%;
+  
+}
+
+</style>
diff --git a/src/views/pages/dw/kvjys.vue b/src/views/pages/dw/kvjys.vue
index 4450e82..f2955ed 100644
--- a/src/views/pages/dw/kvjys.vue
+++ b/src/views/pages/dw/kvjys.vue
@@ -11,20 +11,13 @@
         <!--            @keyup.enter="handleQuery"-->
         <!--        />-->
         <!--  -->
-        <el-select
+        <el-input
             v-model="selectName"
             filterable
             placeholder="请输入名称"
             style="width: 500px"
         >
-          <el-option
-              v-for="item in prjOptions"
-              :key="item.code"
-              :label="item.value"
-              @click.native="setSelectItem(item)"
-              :value="item.value"
-          />
-        </el-select>
+        </el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -45,7 +38,7 @@
         <!--            <el-button type="primary">选取文件</el-button>-->
         <!--          </template>-->
         <!--        </el-upload>-->
-        <el-button type="success" @click="isOpenDialog=true">设计上传</el-button>
+        <el-button type="success" @click="getTemplate">下载模板</el-button>
         <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
         <el-upload
             ref="upload1"
@@ -134,33 +127,41 @@
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="工程名称"   align="center" prop="projectDefinitionDescription" :show-overflow-tooltip="false"/>
-        <el-table-column label="工程编码"  align="center" prop="projectDefinition" :show-overflow-tooltip="false"/>
-        <el-table-column label="更新时间"  align="center" prop="updateTime" :show-overflow-tooltip="false"/>
-        <el-table-column label="操作" align="center"
-                         width="500"
-                         fixed="right"
-                         :show-overflow-tooltip="false" >
-          <template #default="scope">
-            <div style="display:flex;justify-content: center;">
-              <el-button
-                  type="primary"
-                  link
-                  @click="editFun(scope.row,1)"
-              >采购误差及进度详情</el-button>
-              <el-button
-                  type="primary"
-                  link
-                  @click="editFun(scope.row,2)"
-              >采购明细详情</el-button>
-              <el-button
-                  type="primary"
-                  link
-                  @click="saveFun(scope.row)"
-              >删除</el-button>
-            </div>
-          </template>
-        </el-table-column>
+        <el-table-column width="200" label="上报单位"   align="center" prop="reportingUnit" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="原集体企业名称"  align="center" prop="originalCollectiveEnterpriseName" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="原集体企业属地（直接）管理单位"  align="center" prop="originalCollectiveEnterpriseLocation" :show-overflow-tooltip="false"/>
+        <el-table-column width="400" label="工程名称"  align="center" prop="projectName" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="工程类型（系统内、系统外）"  align="center" prop="projectType" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="发包单位"  align="center" prop="contractingUnit" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="中标时间"  align="center" prop="bidWinningDate" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="中标金额（万元）"  align="center" prop="bidWinningAmount" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="开工日期"  align="center" prop="startDate" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="竣工日期"  align="center" prop="completionDate" :show-overflow-tooltip="false"/>
+        <el-table-column width="200" label="备注"  align="center" prop="remarks" :show-overflow-tooltip="false"/>
+<!--        <el-table-column label="操作" align="center"-->
+<!--                         width="500"-->
+<!--                         fixed="right"-->
+<!--                         :show-overflow-tooltip="false" >-->
+<!--          <template #default="scope">-->
+<!--            <div style="display:flex;justify-content: center;">-->
+<!--              <el-button-->
+<!--                  type="primary"-->
+<!--                  link-->
+<!--                  @click="editFun(scope.row,1)"-->
+<!--              >采购误差及进度详情</el-button>-->
+<!--              <el-button-->
+<!--                  type="primary"-->
+<!--                  link-->
+<!--                  @click="editFun(scope.row,2)"-->
+<!--              >采购明细详情</el-button>-->
+<!--              <el-button-->
+<!--                  type="primary"-->
+<!--                  link-->
+<!--                  @click="saveFun(scope.row)"-->
+<!--              >删除</el-button>-->
+<!--            </div>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
       <pagination
           v-show="total > 0"
@@ -175,7 +176,8 @@
 </template>
 
 <script setup name="dataService">
-import { recordList,getPrjList,importCm,importCm1,deleteitem } from '@/api/wzybz'
+import { getPrjList,importCm,deleteitem } from '@/api/wzybz'
+import { recordList,exportBasic,importData as importCm1} from '@/api/dw'
 import {defineProps, onMounted, ref} from 'vue';
 const { proxy } = getCurrentInstance();
 
@@ -231,6 +233,19 @@ let rowOpenFun=(rowData) => {
 //导入数据
 const importData=()=>{
 
+}
+const getTemplate=()=>{
+  exportBasic().then(response=>{
+    console.log(response)
+    const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const url = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = url;
+    let na=setName(props.pageType)
+    link.setAttribute('download', '模板'+'.xlsx'); // 设置下载文件名
+    document.body.appendChild(link);
+    link.click();
+  })
 }
 const setName=(payload)=>{
   console.log(payload)
@@ -344,7 +359,7 @@ let getList = () => {
     pageSize:pageSize.value,
     pageNum:pageNo.value,
   },{
-    projectName: selectName.value,
+    reportingUnit: selectName.value,
   }).then(res=>{
     console.log(res)
     loading.value = false
diff --git a/src/views/pages/dw/pszlk.vue b/src/views/pages/dw/pszlk.vue
index ad5386e..13d776b 100644
--- a/src/views/pages/dw/pszlk.vue
+++ b/src/views/pages/dw/pszlk.vue
@@ -1,13 +1,511 @@
 <template>
-<div>1</div>
+  <div class="tableWrap">
+    <el-form class="queryRef"  ref="queryRef" :inline="true" style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+             border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+      <el-form-item label="文件名称：" prop="name" label-position="left" class="labelItem">
+        <!--        <el-input-->
+        <!--            v-model="name"-->
+        <!--            placeholder="请输入名称"-->
+        <!--            clearable-->
+        <!--            style="width: 200px"-->
+        <!--            @keyup.enter="handleQuery"-->
+        <!--        />-->
+        <!--  -->
+        <el-input
+            v-model="selectName"
+            filterable
+            placeholder="请输入名称"
+            style="width: 500px"
+        >
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <el-form-item class="ei" style="position: absolute;right: 0px">
+        <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
+        <!--        <el-upload-->
+        <!--            ref="upload"-->
+        <!--            action=""-->
+        <!--            :auto-upload="false"-->
+        <!--            :on-change="handleFileChange"-->
+        <!--            :before-upload="beforeUpload"-->
+        <!--            accept=".xls,.xlsx"-->
+        <!--            :show-file-list="false"-->
+        <!--        >-->
+        <!--          <template #trigger>-->
+        <!--            <el-button type="primary">选取文件</el-button>-->
+        <!--          </template>-->
+        <!--        </el-upload>-->
+<!--        <el-button type="success" @click="getTemplate">下载模板</el-button>-->
+        <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
+        <el-upload
+            ref="upload1"
+            action="#"
+            :http-request="submitUpload1"
+            :on-change="handleFileChange1"
+            accept=".xls,.xlsx"
+            :show-file-list="false"
+            :limit="1"
+        >
+          <template #trigger>
+            <el-button type="primary">上传</el-button>
+          </template>
+        </el-upload>
+      </el-form-item>
+    
+    </el-form>
+    <el-dialog v-model="isOpenDialog" width="30vw" @close="closeDialog">
+      <div style="height: 300px">
+        <el-form      style="position: relative;padding: 20px;
+                     box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+                     border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="upLoadname"
+                clearable
+                filterable
+                placeholder="请输入名称"
+                style="width: 500px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItemUpload(item)"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="ei" style="display: flex;justify-content: flex-start">
+            <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
+            <div>
+              <el-upload
+                  ref="upload"
+                  action=""
+                  :auto-upload="false"
+                  :on-change="handleFileChange"
+                  :before-upload="beforeUpload"
+                  accept=".xls,.xlsx"
+                  :show-file-list="true"
+                  :limit="1"
+              >
+                <template #trigger>
+                  <el-button type="primary">选取文件</el-button>
+                </template>
+                <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传</el-button>
+              </el-upload>
+            </div>
+            
+            <template #tip>
+              <div class="el-upload__tip text__red">
+                限制文件上传数量为1
+              </div>
+            </template>
+          </el-form-item>
+        
+        </el-form>
+      </div>
+    
+    </el-dialog>
+    <div style="padding: 20px;
+    box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+    overflow-x: auto;
+    border-radius: 6px;background-color: #fff;">
+      <el-table v-loading="loading" :data="tableData" >
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template #default="scope">
+            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column  label="文件名称"   align="center" prop="fileName" :show-overflow-tooltip="false"/>
+        <el-table-column  label="上传时间"  align="center" prop="createTime" :show-overflow-tooltip="false"/>
+                <el-table-column label="操作" align="center"
+                                 width="200"
+                                 fixed="right"
+                                 :show-overflow-tooltip="false" >
+                  <template #default="scope">
+                    <div style="display:flex;justify-content: center;">
+                      <el-button
+                          type="primary"
+                          link
+                          @click="editFun(scope.row,1)"
+                      >删除</el-button>
+                      <el-button
+                          type="primary"
+                          link
+                          @click="editFun(scope.row,2)"
+                      >下载</el-button>
+                    </div>
+                  </template>
+                </el-table-column>
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getList"
+      />
+    </div>
+  
+  </div>
 </template>
 
-<script>
-export default {
-  name: "kvjys"
+<script setup name="dataService">
+import { getPrjList,importCm,deleteitem } from '@/api/wzybz'
+import { listFile as recordList,exportBasic,uploadFile as importCm1,delFile} from '@/api/dw'
+import {defineProps, onMounted, ref} from 'vue';
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  pageType: String,
+  moduleName: String,
+});
+
+let loading = ref(false)
+let tableData = ref([])
+let total = ref(0)
+let pageNo = ref(1)
+let pageSize = ref(10)
+let selectName = ref('')
+let upLoadname=ref  ('')
+let isOpenDialog =ref(false)
+const closeDialog=()=>{
+  upLoadname.value=''
+  selectItemUpload.value={
+    value:'',
+    code:''
+  }
+  
 }
+import { useRoute,useRouter} from 'vue-router'
+const router=useRouter()
+const route=useRoute()
+// 编辑
+let editFun = (rowData,num) => {
+  if(num==1){
+    delFile(rowData.id).then(res=>{
+      console.log('删除');
+      resetQuery()
+    })
+  }else {
+    getOneObs(rowData.id).then(response=>{
+      console.log(response)
+      const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+      const url = URL.createObjectURL(file);
+      const link = document.createElement('a');
+      link.href = url;
+      link.setAttribute('download', rowData.fileName+'.xlsx'); // 设置下载文件名
+      document.body.appendChild(link);
+      link.click();
+    })
+  }
+  
+}
+// 开关
+let rowOpenFun=(rowData) => {
+  saveFun(rowData)
+}
+//导入数据
+const importData=()=>{
+
+}
+const getTemplate=()=>{
+  exportBasic().then(response=>{
+    console.log(response)
+    const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const url = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = url;
+    let na=setName(props.pageType)
+    link.setAttribute('download', '模板'+'.xlsx'); // 设置下载文件名
+    document.body.appendChild(link);
+    link.click();
+  })
+}
+const setName=(payload)=>{
+  console.log(payload)
+  let result;
+  switch (payload) {
+    case '0':
+      result = '综合';
+      break
+    case '1':
+      result =  '专业';
+      break
+    case '2':
+      result =  '工程';
+      break
+  }
+  return result
+}
+//导出数据
+import {encrptfun,decrptfun} from "@/utils/request.js";
+
+const exportData=()=>{
+  exportDataApi({
+    "pageType": props.pageType, //页面（0综合看板,1专业看板,2工程看板）
+    "moduleName": props.moduleName, //专业名称
+    "condition": name.value //模糊条件
+  }).then(response=>{
+    let a = decrptfun('4D68D20BDF1B0450F54380FAD06C415EDCC5956564BE821C751C4C1CDAC402CBF8339A62210BA6BD111570721DE1F03B31374B225486ECB60B09FB0F61644D79B6B02132711FD489718EFEECF7C6357E71C72A8C4F15F91957431EA7ED938603E63BD151218D7613D54D2C161470E7037B5057FCF6DF09D2B8AE79AC4F5BCDD6CEA46D8B2657BF85A9EA9B90932DCD28357D6558F0D39744649D1D18A42E130D97323463060FF9C6591CC783AF86D09D454CB27852C84D8D6633D6BC4175AC47410652A259CA1D95F4C1DE71AB3CF0CCA0BF077082DBCC45A794F3BB162E9D116C2738A9B0932D5A51667050EAAEF64636EAC9170DF9AAADAB099294653A9982C082815DF02A4793F4ACBB8AE621A79363D296A28C618109B00527F8CFFB64A45131E03521AA8545AEA02028F912E94962F30AF1693053B1238A19409415DB955B7213B5395CDCA252A4D0FCB2AE15DBA1D0982CB8A00E8B8E64D5D2548C5AE2C903862585087D51C87D92B4B97E6459018420D7A19386AE7963B0C90B8331B0259872770B2F546AF9555795BF051A5622B89092104EB816AABF1E970ABF984DC6678FCBBF138A5C00FB10FD68CCFA80FFE9867C82703F25B9BF55AB4B339C320801D694E39300ADEF643F0D70E49AB164E676778041E80108C81844C9FB23F291D08E8BB9DAB673EA20DB68954BF731B22E51F17E60BEE4A64599A700249A944EFD1F5A1EE8A17288A4F80368FEBB3C4D887725A2A4FAD8446299FBBF9F013B37E78AD0A2E20AD4ADF513B2FF294ED1AC850E524423F5D77BD197D1159A68CFF3E9E071154C96B35DF11FF7C4EAF61D21C6E40A00E5A876878FBBE0BCB0DBE5591B72DD3C69EE0EFFA0CEF9B8410E2A3CC1C97E75AF98813FAA3B35D4A5E27DF322E7E73414AA6B78C8FC50DC07C6EC72D6C414DD2A0250C58059BD3C55F40229651D9DC9561800D486DF091AFACC7199646C98D1B263DD3C407EC31F429E00E368A4A7BECA429022BB2D2487B184B2DD6416A6BFD8256E5F7266A93A84A68BB587EA130DAD039FA9A38A889004C0312F5F8AD6BEE7DB35064D0BAB05E75E72AECC8A6502469CF9726C8FDD9A60E64ED77B56C5ECD31F169D23C8B4CC30AD70C5B58F23415BE64D4A5A32FB3EAFE6FD406CD1A4268B5C84717E0A0B286C21442DAED60476A1FA29B024EA6E2835EA7E39BA07A4FAB236A7499DBA6A191978F6680B05165363C281F808CECA343D848B3B8FE67BB3D1F7D35B50118432B3E8D946AEEDF48B16C50799F2AC1BA04443AF62BB50116CF5A8B4FF27F852C2E315E6D39891B26C3D549F4EEA471C488E0CB940ECF55497B181E9FD5899D384B1BC7E29A44B685441024CC58F72D6E852815BFB07448EEC2BBF15ECD22B6CEC0E7CDD4159267F5B19821D913E68539C88352D726AFBEAAF98F3BF26A1BD5A11113A78A26BC292932A8E99013F417FD42897379EA529A6B8CDD1BB04192C0F93670D2F59D012D7DF5D858138F6E74424BF7E76756144BFB85D79ED391CB9C22A2BCAF1D9E0A80A12039684A33A450B730F8B374CFB4C4EDE19179FF7B7C49139B571A82686FBCE595686CF9F5C1F1F7EA2785F64CDDC0124FBF96C95E0B05510E178959F6BE3F4BB8591E1F50BA30892E58CC2C731046C6EA55A31DBBE66D115BFEE4CB2A3D46BCF856FBE717B40BAEA3D4B4F3B527540B4DD672622CDEDE4A06F860FBA392769209507A7120247760DFCDA4C8DDE8238B749D8A3B2C52F9F1EC7B35186C4D9C5724677CB3C4F4BF507D0CF05407443B5A7EEC6508CE07108A703448EB3AC92043F0FF32448AE87DAFDDA8E6CBA4B26ED4E9F870CACCF11A2D18A416F36D3D969A258D9D33628D7CDFCF157151E9C7964987747F0CC1EB03B0CD99DCC4FD8D4065860CE8CC49387F8B5990061B36366212737294B2F624F364A0068D15828B9FE578E0760A0410ECF6BC70147B9AE6C9AE77174D006A5D8CC9D46D0FECC3F75BE6161A08B649A54E6EDB6993AEFE3B7BC6D299F5B54FF29F0DD8A2E1C2359D7A6CF1846B4D20FF4CE4491D8A34AC3F61F556FD722EF0605BF5ECCF8757C23E7DFF3B7DF2C72640D30F53E36F467FF9F284834EB417CB797F80749D79234283D79E1FA61014A2E35B43FFBC97C41A276A1E196CCDA7DD609EE8E7A9709BE819F60CAAC985427CB88361D66AD52B9E3DEBAAE46BC2F422F05E10257BBE36E6894B0B0261D7FE7DC0D17AF4B59AEAB09A244BC1DFD1DC89FD6BA0A938B8CFAD78875DA9AE11BF27A0D005E30C3F88573A6E549932A4B947FFB9C940EAE3D62D9994BF2072172668C51BB985077FFE649A6136A6E6AA66A79DFC5880C5885A87FF772106EB566F0B2A87AB214749C38EDD9E650A70AA92A06A3550FBD2B30F2DE2B8B925DDBB6057959BECF6A503C8721B8AC44AA87E2FD875050DD0CC6497628D83C84B49BE4EA32719F39CAF1071C2D9099A206771FFCD72740C1477EC12D5DB55387F9D5A0DA75E68767DA426621364E336CBDA97EE95343A520EA1FF6CAE2057627D4A66468BC4B71EDBF297C19114B1D50A025C9C555E31462C5B58D893B5438B5A25A52F7A5AAC8ED3636CF93A7A85212587F5E28F69B901D3149E16C9C90441613442358FA3E9581458894E86FB608E339076FAFD17FD40714762FF9F0AADA5E476CEEBAFC5C111A7B14D52938D0AE5DE2896C4267FBD36ADE5F25846E75BE958A5F41846AFA4B06002F4C49D0974BBAFAAB4478E7A25F63F09CA7BA4CF5223764EFD0FFC342E97D800A170271F5DA672B4A69A4A08FC6A7BA3F43A4E89D0F85311E00347EC5B87D76CB953E8487E362F15906290A3EC6E2D2F3FD67E0533E2E4ED5FCC93F27D54DC9A1296640308E37C64FED12C498357F01CE06EC5FE21AF6537DC6E890661B3B86B62D1948CD0A6A9D7F9C0028959B4C02774C0AE529D024BA24B3848504C096B6F4AD8C604433C0C8B4268E74AF3391AE1E1930F2BAE220B08CE16C418C88FC453EDDC7C59BFF6B64F74D57AFD60146BBBC293CD529035A80D11E5C53317A7925EE4AEE90FBDB01F7E0DF204AEA97FC0C0D29E0559A705F9B0FEFA900734DB542D2CF576C48ED2536D56F70B7D0C8FD4EA9BB8EE7097BDEC8866829406F52DA6863AE5995EE44C30AD4F7F62D401285088E27298E91FB2E723BC2A7A76B3AE33E6FDB0A6F88D9B1F84F4A1107EF87E735C3AC0137D3A5355D587D3D3F152E89F92756FF24828AF12AD1E219557D0442C1C5FEF94FB4472CF9B8A5BCBB1D2C095E7EFB4A40033C31C46E509376BCABAB30E6F4D5F3B9F6409975A043304224786EF710840F799FC986FB5A88BD267CD4FD3A3134681C3344502BEF495AE096F63AE30173CCE596448D79FD9599690124A2EF7C8E73C9962516EAA608665BC7F88EEC67D6C905BD010196F94398684F9A0CE16B0E2FB282ABB8D9D8B0E1558D8EE5D2D600CD1E9F7AF78FA0B14E04EDC5446EDBBF36EF55A6C5E79E84537D7B5AEC6BBA858797B75C46AFA8B7FD474199B51FB720DA807AF501FDBB9B614CADF698D3560F8656C734AFC1E27EC69CBE97AB8D2457FFABB26807B323A721FA473D3F67FD111D98F8BE8396658C64FDC68043A1577ED0B7A7FABBAB5315EC24BA5E2B370588B94E22BB6405B70BA93ADF9A09CE331D08237575ECED71BBAB3E962A8082E7BFAEE84CB274BDD05E3B39540DD35DAD7540DA2AA6E4AC06E81B38903E2870B76019D2E57F048F976E0E31B07887802E247A266C2C424B8DE93316B9628B80143F3F13706679ABF23A70164C0E8C96FC842518D6D3B0B66265F9F0353195BFE75162D978D6C52CD19EFDD92AE552A280B7BF6BC4D49902F9FD6FE7A86A56D4E70E8AE6076D177DA15CE4DF8780478C5C9D2F81221B6D3B757895CF76A5766038AFF2D8DE7845F614CF4328CA10B315A32AC8F36B78F2A946CAFA32DF75FA1341F36CD1C428DF95EA475529B132413B108CF8D423822B524F0DDE8A91DB165D8AC92E11451742742032F79E0C1451BFBE0E6EF99CDCC9907D343FAA532A28B4C32F2553BBEF41E7FFEFEA648A75399D01167EB42D17CC654D50125CCCB38F2844003DE7A6F9899A99807CB71ACEF5C9B19CDBDDF0E8A08C26B4EF137B677487CE68E4FB67ECE619585453E79B9B6D82D5F8EC9C69DC564C6C8B944459B7D06A3B2E9530B91994F86B7C4BC4AAE0F2A2E576E66C42D6C361068E90B62A59297C7D43B8368005E5EC15D3E83D101DA70EA1AA71E38639D5AB9CDE54EB6DB214B089F9461F4F856CA23A96B6E67EEAD663FD09EC8F4C0838706F2891941C8FFA60098EA951C9FC2421A311074C44EC86AC9F69D8D9C6B2AEDAAE4ADD0A6A761A8E27984A606DE57EEA6D052967B3422D54E9A990780B1CB141F61F2D30F34F1C4B9491EC06990A2CB9158F345AADB79B08914C9A93AA75D956355F1E25490A9E2B0B257815E51391F75F5C71276DFFF3FCC6A3FFA5A52F0391387EB198B188E60980097FC21F82ED1CB1EF82D486745408637E11D0031357FEC81F067543B9079044C1EDC6BEE51B805C1B4DD8B96A7140EFD9B462142988758BBC1D3BFCFC60053B0CC7BC0B560219B7A7CEE988DE28AEAA023CE33E5080E6FA5B2278C16DCCD5C29FF6C3D5371F96896604BAE127C2C928D8DC339722C6DC18F6ED6ED467256AFBE72FA7C6491CDE98E9D159F947BB03B00FB193C71010A400AAE0A48F2519E942DFD649CB67785F397DF38CCCFB0A59C040F92D3AF7AEB3B5CE2D905219591EB1B983B3A2CCAD7031E4A5B160E2460E5729E9AB1E78034F8FBD9894AF8ADB3C70913C6E100478AF393FA21A9CCEA78EED4886E072B6EC13EDA1023049A9148DF33156DB2C7A7BC9408CEEC5628A3268D7636F48AFC4EBF293F7A9CD7E68F2DDD30CC2834A658BF964C82238805B22C4357D9603A2BE6C9301298C6B61511B6FB9A3A6ED7E71AEDCDCEAA2DD7D3DFE8ABD4F4DAAA5F290608FA24C2BEC3224DB6C7492FE7AE76ACD86DE89E3C38D3D72F4E9719EDFD63551F1DB8A40683951E47074C10C369E7E58D81245348989C1D28EA113E2D5D85C4CADA076724F61E7F4F6ADDD64EF7BC3655E261705AB5A28E9479CF5F75B5CE68AEB6DC026A9A042AFF2936F516CF574B87D874CB6E0A1AE6117D9AA55C91173BA7C43B2731FBF2624162C6D90DF38CA1521198134B836A80C3CB6C161AA1752C69C6569E2DAE1B1FBC98CE6053E264E54C3B3CF1240EDA0A8EEAA05DE599423C9AE9AF4E1D166B00C2004EF0A8BBCD88CB9BBF46DB5059FD2FCB231A54B3F639666712E422E9AF5FF2B06C0FA2FC7CDFD1591B188CF2BE42EF8C3532C2CCFF783E3F3F6BC921BC576FD3A055AEA15ECE84FF3A3F494FDAFC9FDB81979E20D5DB07CB309CD6CE95D818F8F0F310D3EBB552095F7CFE125595BD1376C68B3BC8A25917F56F84F488C2D1F2091BD0E29C4ADF38E4EF1F78921C378C89AB4B026DC8E7287F494CC7F7958F819FEB0B2CECF374594A426980D903947A2E9EC44D6FFF78E201F12675415D5770BC0F94F8CFB8D07B00917BF5A7B23A91BA93E8CFD22476F02D35B01E050E9E59A8602D1079D52B32BDAABB8D67FF343AB04C66172ABE017B38675E5EEC1C1DD71B119A23E8EC127F0490D144808D15D385B30CA90A41290897472BD95403ACE0F4BB69FC5BE25F56B0EA307DAA9007F3E55EF1C19DCE9D63B7E0FC68920418B21D3E1461EC7E00EB0DC63ED4FC132EDC27ABB6F9084A599D995200A1D653C3DE1B9E6D687196C03DB69F9A38748299CDEFF41931612588FACA11D667ED7BB28BBC2EF906477EC36EABC1B05C7DA9F0777B725A57DEA774DCBEC27E598EA86B810E4655FE3302DC04A13DF6ED4BB02A6485A5EE014BE66B7097F2B21F224CDF02FE2BAA5FF032C4F2B990E5A7021D37FAF68DEC2D62AA51A91E6E796730E88EF12A0E61FADF26600509F4E6A382A7873C8F451D7AB7E3C949A964DF27C0D8DE9C13ED15FEBE9110C82A17A414A810CDD1EC5F89462AD7472A65A3F98D569F70D31413C73ACA5CF517408EE6BC70567F5BACA40C5747EB1700BD1DCFE5DD8360EC93AE4E54D91710C8D72843856B12879C135A2FD1F12C541238BE2E8EFD24F46074AD3BF7ECD6CA9C1C9BA00BE72483E6C8A983897BFD9B903E83F4FCC51D2F478DFBCA311A71747B495199B042144E5634BFC57A84ED72C5BF74330EE9DD397A213E33BAE388F4BF98D645384A9DAD5B6D2974895C92790110347F22EB7B991E6DC9D708F9EC0A9921D2CB62D174425FBDBDD55D21F491A3A6F2E2E33B9C2224D5E92ECB950E5BD4A7C036F2B59B35FF5D2FAA0EE1A7FDFA09C86E06085462DB4E5257E53A990FEEB65319B1653FCC031284DCEB55EFD50D245D8349EC0F1101195C47333AFF6D39CF475765A041D1DF9AD72086C1618AC1728DDE3BFBA3F005DD870999F8E70B398B7276CF7640F1BA3CDAC86D4204A0AF3C8D01240B690A29F7A28C331C1D039237D0E46F66BC35225CB3021A49101A39A3FDF830BFBFC4111707201E9998ED7F9DD7390C14E05A8786663A15D3B1D22FAEAA2DF851C10D73722AA0F435490B29ACB17AFDF649909310133413DAFCFD1D5ACC6D6782A73AA3CE466BAF6DBD84B07F09597F264874DCCEA84894A74CD0014E26826F03CB8F45FD95E0243FE803248B7E333840847D00D5C687A277707EE85D5581AA434014B9B45114CD31B4D223ECA0C95488F8909976F8A648816A0C2149CD57C674DEA94486D855F1034EE700FC8CF0D1EDDB7FFDD130FD910C396FB4BF56AED0D26F2204CF54DEBA84B11329B2DB2E0EBF98E446EFB2E5FD0E79CD19053DAE88108836E957B1DC6E12B29CA757DA866EFB66D7C2463002356A22BB591A123ACDC1F61346B3DC01EEA2B5A7E073CABF057505483011B929479CA5396C11C441107F8E436A29AB6648BB526D62D55EF97227B04A2A936204780C1B79B7273B0D40C037D261FB5621369BC8297304CF75E1DC9EC995BA7155BE2D6CE1C4AAC16172AE3236E5F0B3DA3F68A880874AAA5DEF0BB670EC820F65169691092430D75BDB7F955E02AB4438010E71004EB7F5642F6AAA6B90256FF54FF85CA39F409868E3CFA043AF5F957D31E01B0559A5F79BE66C08C838015D0FC25F7D8B20A963ED5F0A3807DD709EF4F65E6B8152FC961FB82F47927E5B6FA32E07DC341062FAB2608D516253BCE9FEE630C69E62E0636B8A2344DDF5A44D99BD1057900F4E7942EAB1B883175DF31A0A28FEB2BCCFD97646EB26F683A8E86BB5646A8EB7A33D36C942D5CA1A1E27835C232992D50FB5D90B8232A5A450BC23E302E0A49FA45A44CC6E3A50B6C47EE41201827E0DAF1B1D2060ACAF3506DE2ED9EE2884D85E7F18B0566B59E1A64E0AFAD7448A7CB735030CDF21CB829B4ECCB0B94EFC27D087E6D559C6B6865EED466FA795327C096A26932A83A8C409EDB6EE7D43F6F34C19EE596016B1998807617BEFAF0FA80FD5530104166A29D267583EC80C57D8905EF0F7F3D400ABDA47B054385F4D6C9D1030C68DE50707990C29EDE940F5B045E634278FC1FB20BCF4790FFA0109F90468719D9EECDDD340A6C85C8B47549B8EE3C30BFE5185F2B52EEFB30EB172BF6ADED53AF7A7A1104B15D2594DF3CD81EF9D4A06139DC45F7244AC0C3AE6B7D21897804DD7C4ADB716B2A8F0C888580B08D564D5C44E43D0E4509AD590E2C9825132B5424B8CB90798EF940DB34D842F0F88C663554EAA1E94DBF103EC275A732122A86D126360531870A7406F281635321810E07A661A89B00121C7F82DB532772E71A460A07C91E7492E45174CDAEA39BA3B34F90F5138DE37C0A1B49DE68439DF0C41DB02ECF2C252DAF1D08932DF91F497CA644FFD4385784D600E159CEC416996EC72DD90A8A7D71544C98583FB29837C0D2C1D58663B7F2E0F6C4F5912B8C4DF4B5A15E731DCF011A8AA625BBF7E5A49AAC09D16CF507925D507F824C4318C27556659D057C66587B91E92DA1AC6F7E5B15CDE4D8926F4E236DD5769BC545C6EEEB0C6F897E7C79CA4979F70C77C34F0D7093E0534A39E729BCB9A1B517820AF8A10CABD4B3040F946C7CDDF82F18AA2CACF6E07E881695671A50ADFF6C2CB3779A69909AEB1A6411E62B1E4977C61859ABBFE8739CF1D2B403D527B03240FE112AA62B878D36D8CD396FCA0E965752FB909F5B4A5C1EC71050173576078661E7F8AF843716494D970C43B9B2139F672C85B13390B988C317444B848DFCD660E1D4C0FCD5FB405593184F80B5D7395C67A41FD42CB6C48C19326BAF731D73AC18F10073F1DD75CDE4BAEF5AE9CE6FEE25ACE96A6E5B4D460659EBB5A6E6E80C40383CC8206BADB55B0B1176465B9A61A8BDBC47C4503253349566A08C3F086DCABBBE61FB6C1142631C4B15A49BC00F1A0E6551D33215BBCD0EE726E856F69C4CDFFEE1EF81C8A1F27166B853E149E35CB88EF40A8EBD6999C18DA1864B26FBE8D9699D48378FA04DADC1C052EE36AB11DED49569BF021EDD9DF9B836B63227528C5F39B99B5F28ACA8437A7E5A7394C36F2E75CB30EEEEF2DDA280F1084F428E92923BD8331685D418DAF9C542A8A9CCE374CA249381AAA385452FC1B8A705A80CDEBAD7767463E7A3A4799EE00165E68111F8B3FB038B4212F59A2E71E9B1D251DC9CDFEB25814D794699BCA343D13FC01824057DD21F09EF8DE4A09BBC1A97A9FBD5C52BFB193F59D08FF439E5E987CAC7A6BB185FA3116522A44994ADA5A79CA9E669AA4D12A59BAD1687C1A33B52F98DF24176BF56E76346086E214286EBFF057257AF292C0052DE6F3E16D18B031B9450D0D2C7E488BD080ADF089831EF728FCA77C3E751A1396B9CDAADC525A9B07E20C50F33CAFB98ED07CAE5446E374E8A1C0DF4FEBA0CD04E3F7AE4330F5E291B05B896211FA81D4A0D5795535B2F62C18C3EBCA8AE2907D8AFF6A84551640F606E4FDA3AFF396FA8351AB65263686D69FB7B6F9E4A3742B6C3FD5E7B885F302223D49586CD251A7B85C886CDF094CD9C7BA50E27ACD5654FAC9ECE52C0A50D75AC671AA5C08844417F2E5201678EA92A696D776EA23480D6F7E4A3D68F90C5A05D9C2B84038AD98B4063AC1748E2B475A710DF4D8C295610E2ACF617BF11E2247F984C88E5A4BC0B902FBDF9795461EBEBBB639BC637A2E228E70D45175D6EC0BEFFA4E9537BE9D4AC406F817109DA33F3159EB4B381C90B3D0F4EF0B92476059E702BBC3C693070079F5B079A8384E294F42D7B1F5B8920F534BD4D220BADC922555B7E0B172A454CED3EED487998BB81CA47FE9E4FB01B6B2B4A17D789395CCAC5A53DE1FAF96EB5C1B6E11014E22CC84A6C2D8E3E40299B98616A743FC227AA7990A709A9E97BCF4E5B966B7E439BFEF10EE19364D5D3451380BD7F0D974795824E45ABD1818F6C5A634B840851E8A7B5618C7B97790C1DF20952CE56994D6B2BC7CB9C308681159E5D1B999FE868D174BC79C1EEDD7223B90345D4C8B8430E7606E839FC32192D1B433510F9E861C892EF76639A5154B929B0E44089A03AE7F1C8F05C9992F2600B7778AFB6D2877B21AEA6C6CF9DDE784154D23F9E1102C567C9FB94CC7B0B750C3E9FD2E3F25E214FD8E876F9978A196A027DFEF1C419FC884934AB7567AA22A5B3D4EA4340A8179F3331EB68D2298AC63AB2E9A103B613DFF3A9E6464A8AC706D1D38389426F2EBC2CD3FF1C8593CC8D6671C0A61198C2A80FD08B8C64B45028EC395BF712E29E56B8ACD940C43A4FD8DD817C2C1A46781291B17713BEAA6AE298E2F5DE75E6B9731C16E1B8F9C7B3AE337D4125B31B4C132DE54FF92813C0147646A4B9F7DE2B3A7FBDDD095A641288A62C2C99F4E61230A920E2C1730015B8420EE853348DE8A743EE9E754F7764BCFAFAA4BA1B5D2BE099718E67E17F4621F7A18E5692E32F703F897B40FE5C2989054800454757137C95B26747348F709D5E980C56C03E442A55E97468D27FFF15A6E966BAD82B16FF243CE993D31297DD8C7EB019B42660F17D87D9D26C8F37DAD12BD255878E566363BDA3ADB8F867CE02D79436C73DFE333536F1A8C0BF66726FCC9A3724A016F0B7F4EF60BB6941AFCEC1B25CDE19733D3D39F8FC62C100E396841F0221DFF553167524FAE95C3E429B76C5B6667200283F3B91ECC76DE3228D99D80FCD9A57885823E01D452042D6B293279342DD0A4D432DA0C14DF6CE12B37F8B45B0A25C0CFDC09304739E49862134363F6D56BB212F3CF27DF65223AB8F09C62A298C9ACCF0E68F777EBFCA9292A445068FF0B263158FBB6CCE064F2C9124565BDC5F315F1F46DB76F7C822F95D20B0AA9C4F8243FBEE4E734A07E3CC46966D888D582928DB285C6C76A45E2AC39734F4118261603AAE4C67F83106DB23BCEAF48D09138596C2ED2867625A6ABF3F417B89E91EA6B26BB6A82804DD821630D2438065E28803B6AE1ED73791953F78985C1DD8501824E57565D720441A620414B88EF251EE2AB97A6D0616337CF2E7A14297E476CD30764CB6EF45FAE08A53077882AC7B503CB25E6E6E40EBA07AC136A6A0CEC8A3044A41A83F031DA3DF65D24E2374C81DA186D80431CA5B93D0404A90E2B41689542362B84BDEF132A1EA2371E32BA7F43F5FB8B1749606A5838E9A6729DD17612FC58634618BBCFD460F2984DB41794D42B9CFC3F7F4CBDB232CD78B2C2EFE7EAB682B48C99C6B9AE6827426BE47D64F9AEBF53B85E096B5661062A03A27726659B03CDB0470238A683CE348804B5E2AF11B527852CF78577417B188C9F94259305190AD0D4C21578213C9E53DBB6853B9718DE0C2B9B3959BA36CE1720568648FDBE6215091B6A929DA02B30CF10C41649ACFAC4930286C4D18BA0B1CC9C815D75B89F8F645FEBAA06AC2F8509E06587EDAB06CF8C6A4CED6991778AF27DDB9A20413D6CD56BC9B5A90B1D42B39320879F7A97BB9E5DACF5AE78A60DD675E611C04D19615138820343742C1F17F8E892B85883BD6AC170C2796DA2D5339E89F51C62E4FDB612070A1C8BEAD63A7C64FC34AC63462A0B366F5903DC0644E72130C1A41D118E18B9FFF42BE25752A1A42DA5E6F27F2CA51C21B6611108FDCA8D3F0A24738E3FE5B1DFE54719AED3AA18A3A05C7C644EFAEA0EE8965727540CDA8056EFDA17AE85BCA61347E2CA6971A124EFCF054846B93C6AE054537D487EE8A8F068F665692062BAF2E2399AC349E0227D2BEE044D28703445B9E14CAC47C7A01BC17F3AF8FA2F4FD824335630C3DFDF4C54EECAC0392B8A9FCE3E347C549C91D8B8448FF2BEA290962AF817FDED82890FD5AC86E5821E661190EDCD786A76CC47495FA57B9E83B7A99E20CFC1099D78D30EACA913BF2E2CFF05D689E6572C9492AB15FA4DDB977B6359A097E770AA7017223B86E4E755D3B0B2339403BDCAA3667F0CF4C6EDF5FBBB0C22B27E207CE6328198038811D50B99F48AC283C3FB34ECAFB82CC0668084947522788DC5590F1BA6805FB366174ABB10A6087F9B931175454EFE2C0F809BBB296D40364D75E2508A3258AF6F76321277020E19606E6D8AB486DE857BB781F34D9F6ECD19CFD6B4248EF8CCB1885970A9E6439CFD7C3C5B5EF559A1AF3D7993551EF311A31E41919C6D8BF4B2048656AA4DD7250368DB4763909A3A055E1C2862D767D37BE18E2E276A851064F7EF15F0BDE1F966DC8A2115C823D3C2251AA42EDDCCEB6686104FB5DF27E5BEABEA73F68A01A47C220F9C3B75ECCD67E6C7234E93351C43D774E74329CBDA7E7E461EB286B1EE2CD2A1AFC8FC1C14455308428BBCCA9A92826D9309BFD8C38B48801E19E4B9D0B0291507F3CAE332400D5B740C7CC39B7225F882CF3453A6A868FF65827C8686C601009E70D821C4EFB308B885047BD849A21B223B1D8FF63EEE4C4671D412867F8CB168ED02DBC6467B94005479F0C3895D73647F221B9B5A749246F64D571D6E2652A23D615DBACCC9CE11020C7BACB997F3F65B16AF6ADC93837644F40605E676EDD1FF1FF8425EADC03E8414CFA213C5048440C7730BD3BF1F315710D4A78C231BD4A09CC5E0A0871F822B9789AFF120EEDEA20F106B0C2907036AF8AF747BF02875BD226B03C54D2E558F6FFBDDCDB43CAE0CBC1435ED98CCAE3F8AE7BBE80CF1A18723535378293364EAB271B8F44F0285278507765E1A8F094A9E092B9C2076B54937E01E488E8192D41E14F7CBF9310F2269FE87DE8D51065A47F237D61B2893A1408CB5F3D749ADFA7AE88A82BE9B65CCC860C6FEAD928A2AF4EBAD7278AC2430DB74C0EB3D277AD36B926D08B43BD299F3B9018EDD20E7AAD040676AFDCA22B4DAFDF9989F20E3D34AB2C33AE9C34CA016292E6E7D084F120DC63D266AC33842E467B39193CCE6E58E28EE308730B64A38B72C407002E69D6B6D51226633F22D6352E75E52EB2A7695F7AB101A239B0E7F399577C63969789CFA3ABE725159BCAC650889131F575514F74B74A27D474AF400757BA8B6F07DA3E6E5B2588CDF65DD798ABD494D433085D1A27B077C5A3FAFEBB7B9E430D5EED99AAC3B27E82B65E1B6509A7ACF24F90E47A02F0C0A19D58FDE67FFFB873C3E687EE394F16225365D41D6DE71B3E23067D6F6E4E2520A4B874134A7B8B6C77567DC56C5EB6FA636BE2739784288FC9F8FA664B45D39A2648A0E27BADEB050E7424F04A5A892CBBDCD73F77BB325629582298E21D7DBCAC59A487C5500914C6F641B3460F211E01E59A6A598F27E87A759B7DE42FE911DD2CE6C84E0AE605803667F2748DF3AA245A50E8DDFCA477A99057779709EFB6E9BD9EE90492EE4AB935CC29BA1B62CB5ED6026E244CE0A349F85D62F657DE4D1508CA4602FCA8BD062B5A8526DA2D998ED9637BBD447ED89BC911CCC9322337B9A8E99FECCECE5268B954E08C273DE0AAB32D90F3817075A4E3417CBEAAB15369B6362824A61FB562BBF62CD03D07701B81A422B98772ADC2CB73196898B4DF0AE15DD1505C91B140A9629F95560F8C7611062DCACDE6DFE88DCB93E396B7FE0913D5EA52AE84A6CD2E8448FC1F0C6C915A4595B0AFF5186516C673DD7531A33E15F516A375AFCDA4F70270808FE3E816BA206E00A4298E85380E1B544BBD8C18CFB23A440B9CE09F21B6637F9B39AAF661EF4AD55DC070F696A010B3C71B7885AC3ACDB206475B75EBF35E03F0EB9AC5E8BA897BE5E233DAA6905C641D6A33390B1E39D23B476E9B48EEC28D6C3D1A2C20EF56F0B20115951C8EC2501DA002D401E472D990ECFD15B5FF67A61FE728E1ECE529B946EC5710E4CAE831A838341D24007ED85B3D6C16B6CE027E51900A7430BC7F2B1A210D36C67C36EE4EFE73AE410322C55626D361A266FEFE7C26B8A8E8CD3D44FB9630161C91F07C5CA6326B1E8EEFD1FCFACF08EF9506BC1B049CEE6D7B464A30838A5A7C96D2D781A0804F7634467CAFB1A35CC26026BEB5BCCF761930A2721CE3365D3F26875ADA776A89D9E4F6B4CC5A34E2351D6BF90B8E4DAB2480262A33368885A68830E769974971ED57ED4CC4E6D7E2098C19091327F96390295F7ADF2BDFA9A19026BEC8B4B570DDC260D3CE917CBD7BD5BC04E0014D39FCC2BB3C0051CD86CE9CA879AA1B9E2779D66642A3D469A94C1B576C80E4CB1166F56893600EB5F22879033F0E19518D697764E50A8A3464E7F33CAA0D29867D5F5EFD9A2C246E467BDA0829CC06640FB3474B56A49E2266920BB19B37A436C9420DB452DC9AD49C729643827069FD367837AD64160E3580349F174E1FA100E8382992E43804202237986AB29AEE20D852A0EC9917590CCBEE32CD6E1A21F7FF6FE54CC3AEDD921669A01007F936297A80B9F034CBAA6CE1AD1893FE99D82CE0FE81B1059D186866A222CC32A4AA4FD14ABB2F3E19509DD253E9E105C9EEFB1C83952D01941D1755FF2B84CE18BA616535265BBCA3A3A3D8D531C144C29BCB6FC2C3C2F34C1D3F1C3801538AF4C654F8FCD7AC362D3195DFA40E170F7AFC2762F894C2D5CBF6FD1CE81703615CB4E20A965149495674A07753C494C89576FCA08C85BDE9C9EE32F0DF8CFFA5EE72945262E3358C68B7A3E2920E9645069AA6307F06E7358AB615DD516914E34D75038680C30BE8D27E5663F835747E7A342EF6AA2E6EB2822A2CD7A465ED370EF95602C5A6429F74C5CF4969C1075518B04D65C33EB7BCB9F58FBA89165F5DF85E66FC72C2D694B9EF2D965D452DAC19F694BC7A2BF7BD09D2FDBD43BBAC58FCC4AFA0CA1785A3BF6C4716A90C4153F8639B637371198CD93D7F265E4B5A4E3D43D0C630C6B7C8434621D3359AF81D4644B4C8C5A73A1AE8CDD938CB392A92D00FD6BA688B6D97FC8F7F4241288DA8AB6B6FC2C7CA6BF7ABEA1FEE6B9E4C87223C170A802569B57E95ED2ECC857759AE15ECE93D81AA43A08CF9A3D8FB81C022C84A2BEAA85E1E98094FB9635DD725A036EC6784AA65CF0B62428308F610BB56B6C4DFE7F8C9E67CDCF26977850A24DDBCDA4316EA1ABF3072606E42366ACB3F60B0BBAF56134AF3F4FA53DD27936F11FDF56A4ED80ECB2DB9C6A8F3417A7F1E4109A5FA40D0FBB0320D767793DAAD7793C12D9606A8B4D658E8A00C2668D45AE9939D12521557BDDEB9FE8E077221B612CC9757FB1E9BB17792A50BFB281E660BDFB388D888B009CB49ACB3F1F4A3CACB84106EBE3F124E8AA40EA901CDAC4EB6D6F3B8B6B91EC142519084B4F18A0EC5339FACE3917805BE06F7EE32536AE658E38B87982ED44E51CBF1365E87B1AC2505CB98D76A7ACCA5B9A3899D52CB73567D0092D94DB781FB8E0541F68BEA364AB912A36632B72FC64F92B892C59BEB8EC518566513E5654F12DBC8C2DEF74A25E73404B38EAAAC0894BA5A4264F6675589399446D99BC4B103F2C59A2EEF22242FC4155735B4E98094C5322784EDB65B9EE686A6C6FA4AC65EE821A4B1C2A80C60A78365E0B8DF055B09669A45E27B6D484ADDF597A95D5DE4FFC5A552FF52CB081C2CA3F3C72304B39E507E6ED0EA15CCC66DE3695D480348B57969FDCE78CD712BD22E20A8F751DEB38138633A021E490C415DA0B8CB8D0E3CC127CF85DC5834B95764730BF9044889AD174E155ECE3562938E95E4D085851AA92F8876839232012C6035B8D5D2570838E3BD33CCA48C42FC914835CE5689E7B2534820F30FA999DB317BC579144B04FD8164C6FE3BB35CD733438FAC717321A3865DE6C55C0ECC37201657B2667AAF2D9A2E7A3442E3361BEB22F0ADC8A8E56C44CEB1557D599B97AF5B1743508B58C68580A4ADC32956168F99BFEB16570937633EEF8AEB0F0DC20BB5F1F5DE6567A4D7C40A13DC60E8800EE3473D4F59644538B9F6D238002AF6B409ECBEC14919F29AF6DCBAAA2CF29E08D3419D2EBD3EE859AB5533E31B9FD30CC8982E711220887AA49C1C061E0718B5F601407BF42919605EFDEB71633C040FF3A94BBD87294D462DB8D2042F4575D12B5354A03318ACD50884C1F50333619E9521F7E1DD772492BCB42DA8292A8997E58EFA53121306E62DD6E32A51629BB88070CB14EEAB0CCEC4D77FF5C702AD7E7BE0A71E611EF8ABAC93E66E25E7DC1A5B37D30A4628F21BE2B025982B15100AAF6FBBAD8D56F43B6517B7D114BD877A25BFE369C5990D71B8CB15F89ED007243BD9A8B53847AE9443606B2F1F86D63E5FB03CC3ECDEA4E9EF66E59185A0E15471FC35BE7680399F061AB2DC29415E69D0724AC2BA26271C8E1612CE750429767E3261CB56C99877B53603036A458854A2D58C48D016BD71F12AAD9E9AD54AC454A8AF76AF1A769834A298648E8EC2EE31CA9DB40C04B5AD7191AC299EDD6266AAAE12CF93997A0C3C288E1893EE7472EB5E11350A6920E64E00CCC3AC124C72C38A9C76C13F812DBF45B2DFAF44211BBAB5283D015AB612EC7AEFEB2FA9881F14DAD6414838E214F5B630E424C481D20733E2A5E44C2B1AA86D9757B94FE7EF92BB4C297C9775CA3707FA390D67995611C6F45D02AD0C6B740824A66BB1F0B3F71E789CD62B2C6510D11883D002A44349BB42C6DA876836CC1E81698746581E4F1EF79A8B8205B2BD031E78C95A3191DF3850A08021D44DF735A2E5CA80DD06724280F63C236B9DE21F0CA2A4AEAD3D94B7CDE34592A78E04B63BC4A34517322C1A88B3EA135E18AEC0BA73491E3C6270299F4B86BCFB98DC679FFB7707B59A53BF8090C3FBB9B4E98919851805BE4B60C8882B9EC6DB8395ED21C9B33502FED9ED85FF8D67FC055CA2F00D086E7549BC4FD4A8DF9DFBDD1402C387AF547525559CAE496D00D09A98E60262B3484BC5F79465603E194061D39981C3DFA15D7D41BE75A8C859CA11C0CF1ABAF0FA5FF664DD7367D5D335D7725A7B3E7B6295687A7B4D5607B665332AC1D482991117A5751A3CD3ACEAF997D35CDED2E8385239B47477977C2FD189211F58442016F2628E519DFE1AD9105B2A0A7A61393CCD631EA2C1568A0BEE910A455D2E2C93F8BACFE79039037A4EF831578C1CA17624056E5A5872CA1EEB41E774807AE6BE349195FE786FC572D17DB543F78FEAA27F9AA6417F30D0403E75A38582D0381851ACF14CEE87A2AAA0831D6DA94F334934D5A7B562AC4475DB15C7FC72A20D8EBD8C372DBB5CC8A3E52A50C3AF6CDFB074A0D32F1CBB594AD31476AA768E0AF4D2EB10B04468FCB2B759DA9A82CE06FC642C423F2CFBF2B041FCBC2186C0EF271303A5984241EA904F6A52F27E7A0A4114317A43963C4A4572595D69A26B76C8786AE5D0C0ADAEA3A6EC762FEDCF48D54DE21FE417980F42AD859384465A3257E29A99F07F6612EFF17428F429DB9AC5CC8000A2E6629652FF57B24271333A8C55783F58A4923EC6375600FF66426CAF5CEE4566261EC769D3B86D9024C3697F1629354B5E2D25CFAEC03DAEBC86A2F079B7D81DEF1372C722A7BB99DAFB87E2DF10D4B282335FA3E0FF4B2966CE5F1A86631F6146B609CBD9CBE2BADB48AB1B3BE6B10AED85C0EA8D9CD81001C828547C0404F6C69C9B92045CC31F41A75E791C93D78803C79A9D1E66EE8B22AD78489592F5F9495F7354BEB9F21963EB52D73C7CD63B777FC358197CD1BECFF1B83A90584F2A092199B05109FE6D3B7507031F94293F276A0EBE6AB3656F00EBAFDE1E61ACA8ED6A22C21FCE72415D002460133B75C851AA4506906EA86A40E943A573D2381F26C7DE11C38B93B93E34A94E06A7928B81CD832B7501E1CF248C56D9FB22955AA401204B608B07101D1439C4C7EC8FABB528E74BA66FDD5518FB6D07383F7ACECF66EE7F798E4AE8DC341D011CB7F619465ED8909AD327BC4BE2CFD8B0168F146EF4A1F7002CBA22C3C72874EEA04FEF191B8DB802196D0E0BB08A1879955C5BD2EF9084CAE7F98CB7CAFF27FA3F8C94F64601FDAB37260B9743930919E50EDCB377B7CA32B6320DA194535FB9F269B72BBDE2CB028968DD5FE601EB238E5CB9C9ABAAF1DED912E69D16EE2E863761E1006B59561794CEDF57B1AD611AF4D12410E10473011ED9E1D683FA01A165ACBA9A56705C02A221ADA06F30A2783DCA265AD4350D901DED18195556A566B81760CFD8C430AE6F9CF367EC0A9CD93966F9A7688A5321540460B27895858D43242729244E67AE8C5C7A2345EB75818EBCA1E6B1B15F599D153EDA2E0BFBA3807F2012EDF8D6057BD532AD8AB012C29E93BF24B4D2192B7378245B26EA20118E700ACA1335E567B3A920E108E10D5423DD581A412D0CCC6C97C66FB44271573CEC815217BAE15FE7250664EEB1B93CF2ECEADB9D62ED162DEAD8B1DEBFEC66345D6F38AEF40EDEFAB376C3AEEB57B76D88B1790C204990503B6EB32C0DF6EDDA5AF6918FCE310FDB177E9C3642849D4A325A2F83754A8F24BD250D24C9D78FF29582654DD29B618BAF17A7035E22AED4A363EDEB24C246A576E1DD4E5EA547565AD71106A349E461457DA2DFD497AFFF213DE51157C48CE1BE3CCBF0395BD0F86F8FA7FB21C1FD8085DA63DB9C14A18AF094F48559C35283CB241E4A8CF41A280B5D888330605A03284EA74DEF6B907F235926F085FC0EFF8CE3D34C1C9E67F001883F63EA215F0514AA893AD8667BEC4B3BB6A46D3EC85EE0832CC29EB1E4F429BF20E79F2A982DC83B34251CD685F995FE1FEE57C1497C6C570E35C859C1A7AB2CEE71AB3A96B86ED25FF34202FBD731E41E1B644601FEB84E992124AFC70A8EA1CD3A76E800D19E4F8E1E1D5F02384905EB0FFA0B1C062B754EDB5F1E84CADB538FB115A84F9294A76313FBC3F96579783735F4966A1C207B9938E30B4304757D7ADB4B339FDC387DB88B18C6700CF31ABF62A942AACCEB6585BB4ED5A439339F4FBEC74A0B72C40202BA0083EFE2A1F338D310B6450375A0D650E9943580082742A353D7B0A8D4989A4549EDB76355D28373403668759FB0D692780997D2A6CDC9596B8E7BAD6765951427F72D217F5171FD378F74E06F70A5BA31DF2964F47E4CE4622590052E4399F2F455B00E8E4FD91C9EF270AA3ED2D9A68BD70017D5E9C7B771CEC259900DC531A76BA18CB7B6BF976F369C9BDE51AEC7DE1D114B89CBA10AD57CB868036C600DBC1B3CD3CD22B8D86BC32E5362F7A0200B9338836FEEE893685D5E03A4EC412F3ACBBBE0A0D8746C1FAB02B04056C74F11A807EBFD92894FE80497A630FD3CD48C8FD51FFFF274E55C43E72BE69B29B39FCA7B9BB708F7242EEF2C8F637FF2270583806E355274FF2E49D12AF950DDA9588D2E58F689313935F1690E252617E37113E918A0F696E7DDD2A985383375A13A6767B5160E5DAA7637D02DB1C4EB990F59B6344FFFDD7D281E04D3E1B5E0F93B2B3CF128920B9D277934184D09B8361309691ABA7611D08321F59BC2DC47848680EA901EC9C36F1DB63AF2EF14126D45A380B6AFDC456DB491171E8A1EE5D0B4847E67374237878EACE0570CDCD777C8D8A6D74B966AB66AD4ECDF78F9128BCFD6FF35A480170215942DBE76280B0BA7AB97C2E438CC622717CA1D13DEDC974B211E1B05356E35B222EEA8C1F2B3A9444B88A1F66CDD4F2AC2F2BDBF9BC33F531997637B9BBB52B15E20A3EB9976A194583D70175A4CD4B0AA275BB37CF914795914606B0C700F17441427935B989E5E9B03742A213C46A9BD62E0346CAAA8209EBC5FDCD2B533B408C36447028518AA2EE6885AF3D2A08D777030C377B494A34CBD40B69C93313EBF54E3AE1FFD3D1A3212B4EBBF16A4A79A5558C9A15A3A545929B77DC6801FD96A6B720488CCBC37B65DDF8433D47D18E543C2FEC2DB6945475DBB348857195F981BFA4E81F6A6DAEA9D073564A5153A67D3525A5F5384C8C2DE53203E262BDA9E69B258FE80355339629FB7A39DFC87EF8A5074EEE6BD9DF9E89E861AE3ADD9577F3CD4B9D25C5B7D68833560A176F8A5AB80F54B3CB3F526BEB616D907F28968164DEE0F19887AF7439F2C677462FEEDB601A172B8FF4F5E0C9D6B2AA71DD03DD396123DF660AB8285449B4562D8A36BBE9CFACEEE19FE33905CDB96F57554649A53F2691384DC785F00CD4FE22E49DEAED729BA96965BB93709F4BAED184A72597DBC78C2D1476CA6D0E36FEC2F32D1DE7D2C9C6E78D0CDCEB70F8AD1D88B0CC040B613BDD3686C55C37D8892F28CC1016543E2600F3D69C9027E168EFBE7A4D61BD87BA89738A3844435226056F9BA05F59A320975EE877CAEF3F35A0188BA627AC3C6AA33C40886AFFE256D33CA2E5A30EAAAADA2D2A20770202A21E85B5F85BF126C776ABE2D9987BFE547868F6078A7916768A385B63BDED43627941563DC5F47E0B1C8FFCC35421C81BC4D977CDD861B7390ABAF337D0FD1B3FBF433277DE67F412941D4E68C2B71E6134C52B33F1566F7FE4B11544CB5B0CDC55C7D0FF62BEC9FF0EA2A1944B18B29205481905734545A9ECAF0B988C8F98A1F1F2D2A2938E81E7105E2559D46717C9A13ED56ED7FFE1D89853B3EC320A75980ABE56A3F553E10E40594CA351B386993A40612BA97A6AE392682070AC0D3A814613C24054B3F3CB6CBCAC8EB4C108E12344458F384B3FFD48C24F3A9536CC50A45B8389542A43725AEEE2CDEEDECC82BF70581887C63A42AFD101C231FE0556C2C3081DB4E5F3B97C457E5161EE909D9ACFD8A209FB1118B890892B5535867425F5D3C6945D0D739A09B08D74B4ACE6E56105B4B73D268CAA8C21C1F4F6A54F033F106D0FF4C9C90CD8C7C3ACFE78193047B2B080F2D7B665A2F6A09EC85518572649CA13EB82010587144D075C2E0C1BA8CCF318BB1A5F7BAE0A89A6F482AA8FBF8F88BA577A684F51379BBB0415B08F5773CBBE0029748B8E724590CC5DC11EF3E16593E2A8CA42362EC381A0FE2FA4C07677443F6C825F0E6793DE8F26922A2E4B32D129F2C376C4BE5EA12844F059E2FCB3F08D138AB46F1BF0151D6840A662FB7AEA0F6587ADBDF0AAAFF730C947F2C101353B7D74FDE2334697E4F42E6F89B84A7E7BECA2FB41B28F36EB4BB81DD7C8A4BC5BFEAC8C7A01F511C3DFBEEE8513FBCEC1EE296CF671B96E0C61DF1AB180328998E3187830E3105F60A50192369665CA7A685AB787EB62C37AE89B59E30299AF12D874A1B242B21C3E988C8B32CD9836F651B521C7B5E95CF87B5E03B914D1D801FFD770321C61493CE5FA19A948CBC0610192FDBE9F8F8')
+    const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const url = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = url;
+    let na=setName(props.pageType)
+    link.setAttribute('download', props.moduleName+na+'.xlsx'); // 设置下载文件名
+    document.body.appendChild(link);
+    link.click();
+  })
+}
+// 查询
+const handleQuery=()=>{
+  pageNo.value=1
+  pageSize.value=10
+  getList()
+  
+}
+/** 重置按钮操作 */
+const resetQuery=()=> {
+  selectItem.value={
+    name:'',
+    id:''
+  }
+  selectName.value=''
+  handleQuery();
+}
+
+// 保存
+let saveFun = (rowData) => {
+  console.log(rowData,'...')
+  deleteitem({id:rowData.id}).then(res=>{
+    handleQuery()
+  },error=>{
+    handleQuery()
+  })
+  
+  
+  
+  // // 前期资料移交-线路工程/变电工程/输变电工程时候需要重组数据（保存时候要重新弄成对象）
+  // if(rowData.paramName.includes('前期资料移交')){
+  //   let arr = (rowData.paramSetValueCopy).split(',')
+  //   // 根据数组长度判断是否是数组对象
+  //   if(arr.length>3){
+  //     // 是数组
+  //     var result = [];
+  //     for(var i=0;i<arr.length;i+=3){
+  //       result.push(arr.slice(i,i+3));
+  //     }
+  //     let newArr = result.map(ele=>{
+  //       return {
+  //         sj: ele[0],
+  //         jh: ele[1],
+  //         zjmc: ele[2]
+  //       }
+  //     })
+  //     rowData.paramSetValue = JSON.stringify(newArr)
+  //   }else{
+  //     // 否则就一个对象
+  //     let obj = {
+  //       zjmc: arr[0]?arr[0]:'',
+  //       jh: arr[1]?arr[1]:'',
+  //       sj: arr[2]?arr[2]:'',
+  //     }
+  //     rowData.paramSetValue = JSON.stringify(obj)
+  //   }
+  //
+  // }else{
+  //   // 正常数据
+  //   rowData.paramSetValue = rowData.paramSetValueCopy
+  // }
+  // rowData.isOpen = rowData.isOpenCopy == true?1:0
+  // rowData.isEdit = true
+  
+}
+//reset
+const reset=()=>{
+  console.log('重置')
+  getList()
+}
+// 获取列表数据
+let getList = () => {
+  loading.value = true
+  recordList({
+    pageSize:pageSize.value,
+    pageNum:pageNo.value,
+  },{
+    "fileName": selectName.value, //文件名称
+    "useScope": 10 //使用范围
+  }).then(res=>{
+    console.log(res)
+    loading.value = false
+    tableData.value = res.rows
+    total.value = res.total
+    // pageNo.value = res.data.current
+  })
+}
+import {ElMessage} from "element-plus";
+import {getOneObs} from "../../../api/dw";
+let prjOptions=ref([])
+const getPrjListFun=()=>{
+  getPrjList().then(res=>{
+    prjOptions.value = res.data
+  })
+}
+const getCmListFun=()=>{
+  console.log(selectItem.value,'条件')
+  // if(selectItem.value.name==''||!selectItem.value.name){
+  //   return
+  // }
+  getCmList({pageSize:pageSize.value,pageNum:pageNo.value,prjName:selectItem.value.name,prjId:selectItem.value.id}).then(res=>{
+    tableData.value =res.rows.map(item=>({...item,isEdit:true}))
+    total.value=res.total
+  })
+}
+let selectOptions=ref([])
+const cmNameListFun=()=>{
+  cmNameList({prjId:selectItem.value.id??""}).then(res=>{
+    console.log(res,'下拉')
+    selectOptions.value=res.data
+  })
+}
+let selectItem=ref({
+  id:'',
+  name:''
+})
+let selectItemUpload=ref({})
+const setSelectItem=(item)=>{
+  console.log(item)
+  selectItem.value=JSON.parse(JSON.stringify(item))
+  selectName.value=item.value
+}
+const setSelectItemUpload=(item)=>{
+  console.log(item)
+  selectItemUpload.value=JSON.parse(JSON.stringify(item))
+  upLoadname.value=item.value
+}
+const upload = ref(null);
+const file = ref(null);
+const file1 = ref(null);
+const handleFileChange = (fileObj) => {
+  console.log(fileObj)
+  file.value = fileObj.raw;
+};
+const handleFileChange1 = (fileObj) => {
+  console.log(fileObj)
+  file1.value = fileObj.raw;
+};
+const beforeUpload = (fileObj) => {
+  if (!fileObj.type.includes('application/vnd.ms-excel') && !fileObj.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+    alert('只能上传 .xls 或 .xlsx 文件!');
+    return false;
+  }
+  return true;
+};
+const submitUpload = () => {
+  if (!file.value) {
+    alert('请选择一个文件');
+    return;
+  }
+  if(!selectItemUpload.value.code){
+    ElMessage.error('请选择一个工程')
+    return;
+  }
+  const formData = new FormData();
+  formData.append('file', file.value);
+  formData.append('projectDefinition', selectItemUpload.value.code);
+  // 使用 fetch 发送请求
+  importCm(formData).then(response => response,err=>{
+    console.log('err:', err)
+    const link = document.createElement('a');
+    // let name =  err.response.headers['content-disposition'].split('filename=').split('.')[0]
+    let name =decodeURI(err.response.headers['content-disposition'].split('filename=')[1].split('.')[0])
+    const blob = new Blob([err.response.data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" });
+    link.href = window.URL.createObjectURL(blob);
+    link.download = name
+    link.click();
+    window.URL.revokeObjectURL(link.href)
+  })
+      .then(data => {
+        selectItemUpload.value={
+          code:'',
+          value:''
+        }
+        upLoadname.value=''
+        console.log('Success:', data);
+        // 清空文件输入框
+        upload.value.clearFiles();
+        ElMessage.success('上传成功')
+        file.value=null
+        selectItem.value.id=''
+        selectItem.value.name=''
+        selectName.value=''
+        handleQuery()
+      })
+};
+let upload1=ref(null)
+const submitUpload1 = () => {
+  
+  const formData = new FormData();
+  formData.append('file', file1.value);
+  formData.append('useScope', 10);
+  formData.append('useScopeRemark', 10);
+  // 使用 fetch 发送请求
+  importCm1(formData).then(response => response)
+      .then(data => {
+        // 清空文件输入框
+        upload1.value.clearFiles();
+        ElMessage.success('上传成功')
+        file1.value=null
+        handleQuery()
+      }).then(res=>{
+    if(res.code==200){
+      ElMessage.success(res.msg)
+    }
+  })
+  return
+};
+onMounted(()=>{
+  getPrjListFun()
+  // handleQuery()
+  // getList()
+  // tableData.value=[]
+  getList()
+})
+
+
+
 </script>
+<style scoped lang="less">
+.tableWrap{
+  padding: 20px;
+}
+.queryRef{
+  display: flex;
+  align-items: center;
+}
+.labelItem {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%; /* 设置高度为父容器的高度 */
+}
+.el-upload {
+  display: inline-block;
+}
 
-<style scoped>
-
+.el-button {
+  margin-right: 10px;
+}
 </style>
diff --git a/src/views/pages/jh/gjxzbylb.vue b/src/views/pages/jh/gjxzbylb.vue
new file mode 100644
index 0000000..dd0b634
--- /dev/null
+++ b/src/views/pages/jh/gjxzbylb.vue
@@ -0,0 +1,469 @@
+<template>
+  <div style="padding: 20px">
+    <kanban pageTitle="2025年关键任务指标一览表">
+      <template v-slot:default>
+        <div class="search_box">
+          <div class="search_item">
+            <el-form :model="form" label-width="80px">
+              <el-form-item style="width: 500px;" label="单位">
+                <el-input v-model="form.fileName" placeholder="单位" ></el-input>
+              </el-form-item>
+              <el-form-item style="width: 500px;" label="指标">
+                <el-input v-model="form.zb" placeholder="请输入指标名称" ></el-input>
+              </el-form-item>
+              <el-form-item style="width: 370px;">
+                <el-button
+                    @click="queryList"
+                    icon="Search"
+                    class="el-button--cyan"
+                    size="mini"
+                >查询</el-button
+                >
+                <el-button
+                    style="margin-right: 12px;"
+                    @click="reset"
+                    icon="Refresh"
+                    type="default"
+                    size="mini"
+                >重置</el-button
+                >
+                <div>
+                  <!--                  <el-upload-->
+                  <!--                      ref="upload"-->
+                  <!--                      action=""-->
+                  <!--                      :auto-upload="false"-->
+                  <!--                      :on-exceed="handleExceed"-->
+                  <!--                      :on-change="handleFileChange"-->
+                  <!--                      accept=".xls,.xlsx,.doc,.docx,.png,.pdf"-->
+                  <!--                      :limit="1"-->
+                  <!--                  >-->
+                  <!--                    &lt;!&ndash;                :on-change="handleFileChange"&ndash;&gt;-->
+                  <!--      -->
+                  <!--                    <template #trigger>-->
+                  <!--                      <el-button  style="transform: translateY(4px)"  type="primary" @click="submitUpload">上传</el-button>-->
+                  <!--                    </template>-->
+                  <!--                  </el-upload>-->
+                  
+                  
+<!--                  <el-upload-->
+<!--                      ref="upload1"-->
+<!--                      action="#"-->
+<!--                      :http-request="submitUpload1"-->
+<!--                      :on-change="handleFileChange1"-->
+<!--                      accept=".xls,.xlsx"-->
+<!--                      :show-file-list="false"-->
+<!--                      :limit="1"-->
+<!--                  >-->
+<!--                    <template #trigger>-->
+<!--                      <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传</el-button>-->
+<!--                    </template>-->
+<!--                  </el-upload>-->
+                
+                </div>
+                <!--                <FileUpload ref="upload" title="上传文件" :fileType="['xls','xlsx','doc','docx','pdf'] " url="/zhFile/uploadFile?useScope=3&useScopeRemark=专项工作" :isShowTip="false"  @reset="reset"></FileUpload>-->
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </template>
+    </kanban>
+    <div style="padding: 20px;
+        box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+        overflow-x: auto;
+        border-radius: 6px;background-color: #fff;"
+         class="tableWrapCon">
+      <el-table v-loading="loading" :data="tableList"
+                :header-cell-style="{ background:'rgb(244, 249, 253)',border:'1px solid rgb(235, 238, 242,.5)' }">
+        <el-table-column label="序号" type="index" width="60" align="center">
+          <template #default="scope">
+            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位"  width=""  align="center"
+                         prop="a" :show-overflow-tooltip="false"/>
+        <el-table-column label="指标"  align="center" prop="b" :show-overflow-tooltip="true" width="300">
+          <template #default="scope">
+            <div style="position: relative"></div>
+            {{scope.row.b}}<img style="position: absolute;width: 18px;height: 18px;transform: translateY(5px)" src="@/assets/images/gthz.png">
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="完成数"  width="" align="center" prop="c" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <el-tooltip
+                popper-class="popperClass"
+                effect="light"
+                placement="top"
+                v-if="scope.$index==3||scope.$index==4"
+            >
+              <template #content>
+                <el-table :data="tableData1">
+                  <el-table-column label="名称"  align="center" prop="a1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div @click="pp(scope)" style="position: relative;">
+                {{scope.row.c}}<img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.c}} </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划数"  align="center" prop="d" :show-overflow-tooltip="false">
+          <template #default="scope">
+            <el-tooltip
+                popper-class="popperClass"
+                effect="light"
+                placement="top"
+                style="transform: translateX(120px)"
+                v-if="scope.$index==3||scope.$index==4"
+            >
+              <template #content>
+                <el-table :data="tableData1">
+                  <el-table-column label="名称"  align="center" prop="a1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div @click="pp(scope)" style="position: relative">
+                {{scope.row.d}}<img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.d}} </div>
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="完成率"  align="center" prop="e" :show-overflow-tooltip="false">
+          <template #default="scope">
+            <el-tooltip
+                effect="light"
+                :popper-style="{transform: 'translateX(180px)'}"
+                placement="top-start"
+                v-if="(scope.row.a=='国网天津公司'&&scope.row.b=='电网建设质效')||
+              (scope.row.a=='国网经研院'&&scope.row.b=='项目评审支撑指教')"
+            >
+              <template #content>
+                <el-table :data="tableData2" v-if="scope.row.b=='电网建设质效'" >
+                  <el-table-column label="名称"  align="center" prop="a1"  width="120" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+                <el-table :data="tableData3" v-if="scope.row.b=='项目评审支撑指教'">
+                  <el-table-column label="名称"  align="center" prop="a1"  width="120" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成值"  align="center" prop="b1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="计划值"  align="center" prop="c1" :show-overflow-tooltip="false"/>
+                  <el-table-column label="完成比"  align="center" prop="d1" :show-overflow-tooltip="false"/>
+                </el-table>
+              </template>
+              <div style="position: relative">
+                {{scope.row.e}}
+                <img style="position: absolute;width: 13px;height: 13px;margin-left: 6px;transform: translateY(3px)" src="@/assets/images/eyes.png">
+              </div>
+            
+            </el-tooltip>
+            <div v-else style="display: flex;justify-content: center">
+              {{scope.row.e}} </div>
+          </template>
+        </el-table-column>
+      
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getList"
+      />
+    </div>
+    <FilePreview ref="filePreviewModel"  :filePreviewUrl="url" @hideClose="close" :extenson="extenson" />
+  </div>
+</template>
+<script setup>
+import kanban from "@/components/kanban";
+import bTable from "@/components/bTable";
+import { listFile,delFile,getOne,uploadFile as importCm1 } from "@/api/zx";
+import {onMounted, ref} from "vue";
+import {ElMessage} from "element-plus";
+const { proxy } = getCurrentInstance()
+const pp=(row)=>{
+  console.log(row)
+}
+onMounted(()=>{
+  // tableData1.value=[
+  //   {a:'基建',b:'',c:'',d:''},
+  //   {a:'组塔',b:'',c:'',d:''},
+  //   {a:'土建',b:'',c:'',d:''},
+  //   {a:'安装',b:'',c:'',d:''},
+  // ]
+})
+let tableData1=ref([
+  {a1:'基建',b1:'',c1:'',d1:''},
+  {a1:'组塔',b1:'',c1:'',d1:''},
+  {a1:'土建',b1:'',c1:'',d1:''},
+  {a1:'安装',b1:'',c1:'',d1:''},
+])
+let tableData2=ref([
+  {a1:'开工规模',b1:'',c1:'',d1:''},
+  {a1:'投产规模',b1:'',c1:'',d1:''},
+  {a1:'开工数量',b1:'',c1:'',d1:''},
+  {a1:'投产数量',b1:'',c1:'',d1:''},
+  {a1:'属地化任务',b1:'',c1:'',d1:''},
+])
+let tableData3=ref([
+  {a1:'完成项目评审',b1:'',c1:'',d1:''},
+  {a1:'完成项目内审',b1:'',c1:'',d1:''},
+  {a1:'重要支撑工作',b1:'',c1:'',d1:''},
+])
+const columns = [
+  { label: "单位", prop: "a", width: "150px" },
+  { label: "指标", prop: "b", itemWidth: "200px" },
+  { label: "完成数", prop: "c", itemWidth: "200px" },
+  { label: "计划数", prop: "d", itemWidth: "200px" },
+  { label: "完成率", prop: "e", itemWidth: "200px" },
+];
+const table_buttons=['预览','下载','删除']
+const form = ref({
+  fileName: "",
+  useScope:'13',
+  zb:''
+});
+
+const file1 = ref(null);
+const handleFileChange1 = (fileObj) => {
+  console.log(fileObj)
+  file1.value = fileObj.raw;
+};
+let upload1=ref(null)
+const submitUpload1 = () => {
+  
+  const formData = new FormData();
+  formData.append('file', file1.value);
+  formData.append('useScope', 13);
+  formData.append('useScopeRemark', 13);
+  // 使用 fetch 发送请求
+  importCm1(formData).then(response => response)
+      .then(data => {
+        // 清空文件输入框
+        upload1.value.clearFiles();
+        ElMessage.success('上传成功')
+        file1.value=null
+        queryList()
+      }).then(res=>{
+    if(res.code==200){
+      ElMessage.success(res.msg)
+    }
+  })
+  return
+};
+const filePreviewModel=ref(null)
+const pageNo = ref(1);
+const pageSize = ref(10);
+const tableList = ref([]);
+const selectList = ref([]);
+const totals = ref(0);
+const extenson=ref('');
+const url=ref('')
+const queryList = () => {
+  // console.log(pageNo.value,pageSize.value,'ss')
+  // listFile({pageNum: pageNo.value,
+  //   pageSize: pageSize.value},{
+  //   fileName: form.value.fileName,
+  //   useScope: 13
+  // }).then((res) => {
+  //   tableList.value = res.rows;
+  //   totals.value = res.total;
+  // });
+  tableList.value=[
+      {
+    a:'国网天津公司',
+    b:'电网建设质效',
+    c:'--',
+    d:'--',
+    e:'100%'
+  },
+      {
+    a:'国网建设公司',
+    b:'投产任务完成率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'国网建设公司',
+    b:'开工任务完成率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'天津送变电工程有限公司',
+    b:'电网建设质效',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'三源公司',
+    b:'电网建设质效',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'送变电',
+    b:'工程机械化施工率',
+    c:'3',
+    d:'2',
+    e:'100%'
+  },
+      {
+    a:'国网经研院',
+    b:'项目评审支撑指教',
+    c:'--',
+    d:'--',
+    e:'100%'
+  },
+  ]
+};
+
+//删除
+const deleted=(scope)=>{
+  delFile({id:scope.row.id}).then(res=>{
+    proxy.$modal.msgSuccess('删除成功');
+    queryList();
+  })
+}
+//预览
+const preview=(scope)=>{
+  getOne({id:scope.row.id}).then(res=>{
+    extenson.value = '.' + scope.row.fileName.split('.').pop();
+    const blob = new Blob([res]);
+    url.value = window.URL.createObjectURL(blob);
+    filePreviewModel.value.open();
+  })
+}
+const close=()=>{
+  window.URL.revokeObjectURL(url.value);
+}
+
+//下载
+const download = (scope) => {
+  // 调用获取文件数据的接口
+  getOne({ id: scope.row.id }).then((res) => {
+    // 检查返回的响应数据是否有效
+    if (res) {
+      // 假设返回的 res 已经是正确的二进制数据，可以作为 Blob 对象
+      const blob = new Blob([res]);
+      // 创建一个 URL 对象指向 Blob 数据
+      const url = window.URL.createObjectURL(blob);
+      // 创建一个临时的 <a> 元素，模拟点击进行下载
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = scope.row.fileName || 'downloaded-file'; // 设置默认文件名
+      document.body.appendChild(link); // 将链接添加到 DOM
+      link.click(); // 模拟点击，开始下载
+      document.body.removeChild(link); // 下载完成后移除链接
+      // 释放 URL 对象
+      window.URL.revokeObjectURL(url);
+    } else {
+      console.error('File data is invalid or empty');
+    }
+  }).catch((error) => {
+    console.error('Error while fetching file:', error);
+  });
+};
+const reset = () => {
+  pageNo.value = 1;
+  pageSize.value = 10;
+  form.value = {
+    fileName: "",
+    useScope: "3",
+    zb:''
+  };
+  queryList();
+};
+queryList();
+</script>
+<style scoped lang="less">
+/deep/ .el-input {
+  height: 38px;
+}
+/deep/.el-button {
+  height: 30px !important;
+}
+.search_box/deep/ .el-form-item__label {
+  font-weight: 500;
+  font-family: "Regular";
+  color: #607181;
+  padding: 0 0.625rem 0 0 !important;
+  // line-height: 2.1875rem;
+  line-height: 38px;
+}
+.search_box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0px 10px;
+  height: 70px;
+  background-color: rgba(255, 255, 255, 1);
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(242, 242, 242, 1);
+  border-radius: 0px;
+  .search_item {
+    flex: 4;
+    height: 120%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+  }
+  /deep/.el-form-item {
+    margin-bottom: 0 !important;
+  }
+  /deep/.el-form {
+    width:100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .search_button {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    .se {
+      background-color: #4ba8ff;
+      border: 0;
+    }
+    .re {
+      border: 0;
+      color: gray;
+      border: #cccccc 1px solid;
+      background-color: transparent;
+    }
+  }
+}
+.mainOfd{
+  
+  height: 100%;
+  
+  background: rgb(128, 128, 128);
+  
+  padding: 0px;
+  
+  position: absolute;
+  
+  width: 100%;
+  
+}
+
+</style>
diff --git a/src/views/pages/jh/jhzb.vue b/src/views/pages/jh/jhzb.vue
new file mode 100644
index 0000000..12cf7eb
--- /dev/null
+++ b/src/views/pages/jh/jhzb.vue
@@ -0,0 +1,294 @@
+<template>
+  <div style="padding: 20px">
+    <kanban pageTitle="计划周报">
+      <template v-slot:default>
+        <div class="search_box">
+          <div class="search_item">
+            <el-form :model="form" label-width="80px">
+              <el-form-item style="width: 500px;" label="文件名称">
+                <el-input v-model="form.fileName" placeholder="请输入文件名称" ></el-input>
+              </el-form-item>
+              <el-form-item style="width: 370px;">
+                <el-button
+                    @click="queryList"
+                    icon="Search"
+                    class="el-button--cyan"
+                    size="mini"
+                >查询</el-button
+                >
+                <el-button
+                    style="margin-right: 12px;"
+                    @click="reset"
+                    icon="Refresh"
+                    type="default"
+                    size="mini"
+                >重置</el-button
+                >
+                <div>
+<!--                  <el-upload-->
+<!--                      ref="upload"-->
+<!--                      action=""-->
+<!--                      :auto-upload="false"-->
+<!--                      :on-exceed="handleExceed"-->
+<!--                      :on-change="handleFileChange"-->
+<!--                      accept=".xls,.xlsx,.doc,.docx,.png,.pdf"-->
+<!--                      :limit="1"-->
+<!--                  >-->
+<!--                    &lt;!&ndash;                :on-change="handleFileChange"&ndash;&gt;-->
+<!--      -->
+<!--                    <template #trigger>-->
+<!--                      <el-button  style="transform: translateY(4px)"  type="primary" @click="submitUpload">上传</el-button>-->
+<!--                    </template>-->
+<!--                  </el-upload>-->
+  
+  
+                  <el-upload
+                      ref="upload1"
+                      action="#"
+                      :http-request="submitUpload1"
+                      :on-change="handleFileChange1"
+                      accept=".xls,.xlsx"
+                      :show-file-list="false"
+                      :limit="1"
+                  >
+                    <template #trigger>
+                      <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传</el-button>
+                    </template>
+                  </el-upload>
+                  
+                </div>
+<!--                <FileUpload ref="upload" title="上传文件" :fileType="['xls','xlsx','doc','docx','pdf'] " url="/zhFile/uploadFile?useScope=3&useScopeRemark=专项工作" :isShowTip="false"  @reset="reset"></FileUpload>-->
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </template>
+    </kanban>
+    <div
+        style="
+        padding: 20px;
+        box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+        border-radius: 6px;
+        background-color: #fff;
+      "
+    >
+      <b-table
+          :tableData="tableList"
+          :buttons="table_buttons"
+          :column="columns"
+          @delete="deleted"
+          @lPreview="preview"
+          @lDownload="download"
+          :page-no="pageNo"
+          :page-size="pageSize"
+      ></b-table>
+      <pagination
+          v-show="totals > 0"
+          :total="totals"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="queryList"
+      />
+    </div>
+    <FilePreview ref="filePreviewModel"  :filePreviewUrl="url" @hideClose="close" :extenson="extenson" />
+  </div>
+</template>
+<script setup>
+import kanban from "@/components/kanban";
+import bTable from "@/components/bTable";
+import { listFile,delFile,getOne,uploadFile as importCm1 } from "@/api/zx";
+import {ref} from "vue";
+import {ElMessage} from "element-plus";
+const { proxy } = getCurrentInstance()
+
+const columns = [
+  { label: "文件名称", prop: "fileName", width: "150px" },
+  { label: "上传时间", prop: "createTime", itemWidth: "200px" },
+];
+const table_buttons=['预览','下载','删除']
+const form = ref({
+  fileName: "",
+  useScope:'13',
+});
+
+const file1 = ref(null);
+const handleFileChange1 = (fileObj) => {
+  console.log(fileObj)
+  file1.value = fileObj.raw;
+};
+let upload1=ref(null)
+const submitUpload1 = () => {
+  
+  const formData = new FormData();
+  formData.append('file', file1.value);
+  formData.append('useScope', 13);
+  formData.append('useScopeRemark', 13);
+  // 使用 fetch 发送请求
+  importCm1(formData).then(response => response)
+      .then(data => {
+        // 清空文件输入框
+        upload1.value.clearFiles();
+        ElMessage.success('上传成功')
+        file1.value=null
+        queryList()
+      }).then(res=>{
+    if(res.code==200){
+      ElMessage.success(res.msg)
+    }
+  })
+  return
+};
+const filePreviewModel=ref(null)
+const pageNo = ref(1);
+const pageSize = ref(10);
+const tableList = ref([]);
+const selectList = ref([]);
+const totals = ref(0);
+const extenson=ref('');
+const url=ref('')
+const queryList = () => {
+  console.log(pageNo.value,pageSize.value,'ss')
+  listFile({pageNum: pageNo.value,
+    pageSize: pageSize.value},{
+    fileName: form.value.fileName,
+    useScope: 13
+  }).then((res) => {
+    tableList.value = res.rows;
+    totals.value = res.total;
+  });
+};
+
+//删除
+const deleted=(scope)=>{
+  delFile({id:scope.row.id}).then(res=>{
+    proxy.$modal.msgSuccess('删除成功');
+    queryList();
+  })
+}
+//预览
+const preview=(scope)=>{
+  getOne({id:scope.row.id}).then(res=>{
+    extenson.value = '.' + scope.row.fileName.split('.').pop();
+    const blob = new Blob([res]);
+    url.value = window.URL.createObjectURL(blob);
+    filePreviewModel.value.open();
+  })
+}
+const close=()=>{
+  window.URL.revokeObjectURL(url.value);
+}
+
+//下载
+const download = (scope) => {
+  // 调用获取文件数据的接口
+  getOne({ id: scope.row.id }).then((res) => {
+    // 检查返回的响应数据是否有效
+    if (res) {
+      // 假设返回的 res 已经是正确的二进制数据，可以作为 Blob 对象
+      const blob = new Blob([res]);
+      // 创建一个 URL 对象指向 Blob 数据
+      const url = window.URL.createObjectURL(blob);
+      // 创建一个临时的 <a> 元素，模拟点击进行下载
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = scope.row.fileName || 'downloaded-file'; // 设置默认文件名
+      document.body.appendChild(link); // 将链接添加到 DOM
+      link.click(); // 模拟点击，开始下载
+      document.body.removeChild(link); // 下载完成后移除链接
+      // 释放 URL 对象
+      window.URL.revokeObjectURL(url);
+    } else {
+      console.error('File data is invalid or empty');
+    }
+  }).catch((error) => {
+    console.error('Error while fetching file:', error);
+  });
+};
+const reset = () => {
+  pageNo.value = 1;
+  pageSize.value = 10;
+  form.value = {
+    fileName: "",
+    useScope: "3",
+  };
+  queryList();
+};
+queryList();
+</script>
+<style scoped lang="less">
+/deep/ .el-input {
+  height: 38px;
+}
+/deep/.el-button {
+  height: 30px !important;
+}
+.search_box/deep/ .el-form-item__label {
+  font-weight: 500;
+  font-family: "Regular";
+  color: #607181;
+  padding: 0 0.625rem 0 0 !important;
+  // line-height: 2.1875rem;
+  line-height: 38px;
+}
+.search_box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0px 10px;
+  height: 70px;
+  background-color: rgba(255, 255, 255, 1);
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(242, 242, 242, 1);
+  border-radius: 0px;
+  .search_item {
+    flex: 4;
+    height: 120%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+  }
+  /deep/.el-form-item {
+    margin-bottom: 0 !important;
+  }
+  /deep/.el-form {
+    width:100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .search_button {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    .se {
+      background-color: #4ba8ff;
+      border: 0;
+    }
+    .re {
+      border: 0;
+      color: gray;
+      border: #cccccc 1px solid;
+      background-color: transparent;
+    }
+  }
+}
+.mainOfd{
+  
+  height: 100%;
+  
+  background: rgb(128, 128, 128);
+  
+  padding: 0px;
+  
+  position: absolute;
+  
+  width: 100%;
+  
+}
+
+</style>
diff --git a/src/views/pages/jj/prjMan.vue b/src/views/pages/jj/prjMan.vue
index 2d9c33e..d5af9df 100644
--- a/src/views/pages/jj/prjMan.vue
+++ b/src/views/pages/jj/prjMan.vue
@@ -1,72 +1,142 @@
 <template>
   <div class="tableWrap">
-    <el-form class="queryRef"  ref="queryRef" :inline="true" style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+    <el-form class="queryRef" ref="queryRef"
+             label-width="140"
+             lable-position="left"
+             style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
              border-radius: 6px;background-color: #fff;margin-bottom: 20px">
-      <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
-        <!--        <el-input-->
-        <!--            v-model="name"-->
-        <!--            placeholder="请输入名称"-->
-        <!--            clearable-->
-        <!--            style="width: 200px"-->
-        <!--            @keyup.enter="handleQuery"-->
-        <!--        />-->
-        <!--  -->
-        <el-select
-            v-model="selectName"
-            filterable
-            placeholder="请输入名称"
-            style="width: 500px"
-        >
-          <el-option
-              v-for="item in prjOptions"
-              :key="item.code"
-              :label="item.value"
-              @click.native="setSelectItem(item)"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-      <el-form-item class="ei" style="position: absolute;right: 0px">
-        <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
-        <!--        <el-upload-->
-        <!--            ref="upload"-->
-        <!--            action=""-->
-        <!--            :auto-upload="false"-->
-        <!--            :on-change="handleFileChange"-->
-        <!--            :before-upload="beforeUpload"-->
-        <!--            accept=".xls,.xlsx"-->
-        <!--            :show-file-list="false"-->
-        <!--        >-->
-        <!--          <template #trigger>-->
-        <!--            <el-button type="primary">选取文件</el-button>-->
-        <!--          </template>-->
-        <!--        </el-upload>-->
-        <el-button type="success" @click="openDia(0)"    v-hasPermi="['tzsc']">图纸上传</el-button>
-        <el-button type="primary" @click="openDia(1)"    v-hasPermi="['sgtsc']">施工图预算上传</el-button>
-        <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
-<!--        <el-upload-->
-<!--            ref="upload1"-->
-<!--            action="#"-->
-<!--            :http-request="submitUpload1"-->
-<!--            :on-change="handleFileChange1"-->
-<!--            accept=".xls,.xlsx"-->
-<!--            :show-file-list="false"-->
-<!--            :limit="1"-->
-<!--        >-->
-<!--          <template #trigger>-->
-<!--            <el-button type="primary"  @click="isOpenDialog=true">施工图预算上传</el-button>-->
-<!--          </template>-->
-<!--        </el-upload>-->
-      </el-form-item>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="selectName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItem(item)"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        
+        </el-col>
+        <el-col :span="5" :offset="1">
+          <el-form-item label="单位：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="unitName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+            
+            </el-input>
+          </el-form-item>
+        
+        </el-col>
+        <el-col :span="8">
+          
+          <el-form-item label="审批状态：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="preStatus"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+            
+            </el-input>
+          </el-form-item>
+        
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="预算计划上传时间：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planPreTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5" :offset="1">
+          <el-form-item label="图纸计划上传时间：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item class="labelItem">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <el-button type="success" @click="openDia(0)"    v-hasPermi="['tzsc']">图纸上传</el-button>
+            <el-button type="primary" @click="openDia(1)"    v-hasPermi="['sgtsc']">施工图预算上传</el-button>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+   
+    
     
     </el-form>
     <el-dialog v-model="isOpenDialog" width="30vw" @close="closeDialog">
       <div style="height: 300px">
-        <el-form      style="position: relative;padding: 20px;
+        <el-form style="position: relative;padding: 20px;
                      box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
                      border-radius: 6px;background-color: #fff;margin-bottom: 20px">
           <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
@@ -95,6 +165,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="更新原因：" label-position="left" class="labelItem" v-show="reDia==1">
+            <el-input
+                v-model="updateReason"
+                clearable
+                filterable
+                placeholder="请输入名称"
+                style="width: 500px"
+            ></el-input>
+          </el-form-item>
           <el-form-item class="ei" style="display: flex;justify-content: flex-start">
             <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
             <div>
@@ -111,7 +190,7 @@
                 <template #trigger>
                   <el-button type="primary">选取文件</el-button>
                 </template>
-                <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传</el-button>
+                <el-button style="transform: translateY(-1px)" type="primary" @click="submitUpload">上传</el-button>
               </el-upload>
             </div>
             
@@ -127,17 +206,26 @@
     
     </el-dialog>
     <el-dialog v-model="isOpenTimeLine" width="30vw" @close="closeTimeLine">
-      <div style="height: 500px;overflow: scroll">
-        <el-timeline>
+      <div style="height: 500px;overflow-y: auto;">
+        <el-timeline style="height:380px;">
           <el-timeline-item
               v-for="(activity, index) in tzLine"
               :key="index"
           >
-            更新时间：{{ activity.time }} &nbsp;&nbsp;&nbsp;文件名： <el-link @click="downloadFile(activity)" type="primary" style="border-bottom: 1px solid #0E9CFF">{{ activity.name }}</el-link> <br><br> 审批人：{{ activity.person }} &nbsp;&nbsp;&nbsp;审批状态：{{ activity.status }}
+            更新时间：{{ activity.time }}
+            &nbsp;&nbsp;&nbsp;文件名：
+            <el-link @click="downloadFile(activity)" type="primary"
+                     style="border-bottom: 1px solid #0E9CFF">{{ activity.name }}
+            </el-link>
+            <span v-show="activity.upreason!=''&&activity.upreason!=null"><br><br>更新说明：{{ activity.upreason }}</span>
+            <br><br> 审批人：{{ activity.person }} &nbsp;&nbsp;&nbsp;审批状态：{{ activity.status }}
+            <span v-show="activity.approvereason!=''&&activity.approvereason!=null">  <br><br>审批说明：{{
+                activity.approvereason
+              }}</span>
           </el-timeline-item>
         </el-timeline>
       </div>
-  
+    
     </el-dialog>
     <div style="padding: 20px;
     box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
@@ -146,51 +234,75 @@
       <el-table v-loading="loading" :data="tableData">
         <el-table-column label="序号" type="index" width="50" align="center">
           <template #default="scope">
-            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+            <span>{{ (pageNo - 1) * pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
-        <el-table-column label="工程名称"   align="center" prop="prjName" :show-overflow-tooltip="false"/>
-        <el-table-column label="图纸名称"  align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
+        <el-table-column label="单位" width="220" align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
+        <el-table-column label="工程名称" width="280" align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="图纸类型" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="出图内容" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column label="图纸计划上传时间"    width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="上传时间"  width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="图纸名称" align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
           <template #default="scope">
-            <el-link  @click="downmloadFile(scope.row,0)" style="border-bottom: 1px solid #0E9CFF" type="primary">{{scope.row.drawingName}}</el-link>
+            <el-link @click="downmloadFile(scope.row,0)" style="border-bottom: 1px solid #0E9CFF" type="primary">
+              {{ scope.row.drawingName }}
+            </el-link>
           </template>
         </el-table-column>
-      
-        <el-table-column label="更新时间"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
-        <el-table-column label="图纸审批状态"  align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
-  
-        <el-table-column label="施工图预算"  align="center" prop="budgetDrawingName" :show-overflow-tooltip="false">
+        
+        <el-table-column label="图纸审批状态"  width="220"  align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="预算计划上传时间"  width="220" align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="上传时间"  width="220"  align="center" prop="budgetDrawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="施工图预算"  width="220"  align="center" prop="budgetDrawingName" :show-overflow-tooltip="false">
           <template #default="scope">
-            <el-link @click="downmloadFile(scope.row,1)" style="border-bottom: 1px solid #0E9CFF" type="primary">{{scope.row.budgetDrawingName}}</el-link>
+            <el-link @click="downmloadFile(scope.row,1)" style="border-bottom: 1px solid #0E9CFF" type="primary">
+              {{ scope.row.budgetDrawingName }}
+            </el-link>
           </template>
         </el-table-column>
-        <el-table-column label="更新时间"  align="center" prop="budgetDrawingUpdateTime" :show-overflow-tooltip="false"/>
-  
-        <el-table-column label="预算审批状态"  align="center" prop="budgetDrawingApprovalStatus" :show-overflow-tooltip="false" width="120"/>
+        
+        <el-table-column label="预算审批状态" align="center" prop="budgetDrawingApprovalStatus" :show-overflow-tooltip="false"
+                         width="120"/>
         <el-table-column label="操作" align="center"
                          width="400"
                          fixed="right"
-                         :show-overflow-tooltip="false" >
+                         :show-overflow-tooltip="false">
           <template #default="scope">
             <div style="display:flex;justify-content: center;">
               <el-button
                   type="primary"
                   link
-                  v-show="scope.row.drawingName!=null"
+                  v-show="scope.row.drawingName!=null&&scope.row.drawingApprovalStatus!='待审批'"
                   @click="editFun(scope.row,0)"
-              >重新上传图纸</el-button>
+              >重新上传图纸
+              </el-button>
               <el-button
                   type="primary"
                   link
-                  v-show="scope.row.budgetDrawingName!=null"
+                  v-show="scope.row.budgetDrawingName!=null&&scope.row.budgetDrawingApprovalStatus!='待审批'"
                   @click="editFun(scope.row,1)"
-              >重新上传施工图预算</el-button>
+              >重新上传施工图预算
+              </el-button>
               <el-button
                   type="primary"
                   link
-                  @click="deleteRow(scope.row)"
-              >删除</el-button>
+                  v-show="!(scope.row.drawingUpdateTime!=null)"
+                  @click="editFun(scope.row,1)"
+              >上传图纸
+              </el-button>
+              <el-button
+                  type="primary"
+                  link
+                  v-show="!(scope.row.budgetDrawingUpdateTime!=null)"
+                  @click="editFun(scope.row,1)"
+              >上传施工图预算
+              </el-button>
+              <!--              <el-button-->
+              <!--                  type="primary"-->
+              <!--                  link-->
+              <!--                  @click="deleteRow(scope.row)"-->
+              <!--              >删除</el-button>-->
             </div>
           </template>
         </el-table-column>
@@ -208,30 +320,33 @@
 </template>
 
 <script setup name="prjMan">
-import { list as  recordList,reUploadDrawing,reUploadBudgetDrawing,
-  prjInfoDrawingUploadList,getOne,prjInfoBudgetUploadList,prjInfoList as  getPrjList,
-  uploadDrawing as importCm ,uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
+import {
+  list as recordList, reUploadDrawing, reUploadBudgetDrawing,
+  prjInfoDrawingUploadList, getOne, prjInfoBudgetUploadList, prjInfoList as getPrjList,
+  uploadDrawing as importCm, uploadBudgetDrawing as importCm1, deleteInfo as deleteitem
+} from '@/api/jj/gctzgl'
 // import { getOne } from '@/api/pageB/environmental/index.js'
 // ,importCm,importCm1,deleteitem
 import {defineProps, onMounted, ref} from 'vue';
-const { proxy } = getCurrentInstance();
+
+const {proxy} = getCurrentInstance();
 
 const props = defineProps({
   pageType: String,
   moduleName: String,
 });
 //图纸线
-let tzLine=ref([])
+let tzLine = ref([])
 //施工图线
-let sgtLine=ref([])
-let rowData=ref({})
-const downloadFile=(pay)=>{
-  console.log(pay,'555')
+let sgtLine = ref([])
+let rowData = ref({})
+const downloadFile = (pay) => {
+  console.log(pay, '555')
   // console.log(row)
-  if(clickType.value==0){
-    getOne(pay.fileId).then(response=>{
+  if (clickType.value == 0) {
+    getOne(pay.fileId).then(response => {
       console.log(response)
-      const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+      const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
       const url = URL.createObjectURL(file);
       const link = document.createElement('a');
       link.href = url;
@@ -239,58 +354,63 @@ const downloadFile=(pay)=>{
       document.body.appendChild(link);
       link.click();
     })
-  }else if(clickType.value==1) {
-    getOne(pay.fileId).then(response=>{
+  } else if (clickType.value == 1) {
+    getOne(pay.fileId).then(response => {
       console.log(response)
-      const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+      const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
       const url = URL.createObjectURL(file);
       const link = document.createElement('a');
       link.href = url;
-      link.setAttribute('download',  pay.name); // 设置下载文件名
+      link.setAttribute('download', pay.name); // 设置下载文件名
       document.body.appendChild(link);
       link.click();
     })
-
-  }else {
+    
+  } else {
     ElMessage.error('点击错误')
   }
 }
-let clickType=ref('')
-const downmloadFile=(row,num)=>{
-  clickType.value=num
-  rowData.value=row
-  isOpenTimeLine.value=true
-  if(num==0){
+let clickType = ref('')
+const downmloadFile = (row, num) => {
+  clickType.value = num
+  rowData.value = row
+  isOpenTimeLine.value = true
+  if (num == 0) {
     historyList(
         {
           "prjCode": row.prjCode,
-          "drawingFileId":row.drawingFileId,
+          "drawingFileId": row.drawingFileId,
         }
-    ).then(res=>{
+    ).then(res => {
       console.log(res)
-      tzLine.value=res.data.map(item=>({
-        time:item.drawingUpdateTime,
-        name:item.drawingName,
-        person:item.drawingUpdateUserName,
-        status:item.drawingApprovalStatus,
-        fileId:item.drawingFileId
-      }))
+      tzLine.value = res.data.map(item => ({
+        time: item.drawingUpdateTime,
+        name: item.drawingName,
+        person: item.drawingUpdateUserName,
+        status: item.drawingApprovalStatus,
+        fileId: item.drawingFileId,
+        upreason: item.drawingApprovalUpdateReason,
+        approvereason: item.drawingApprovalReason,
+        
+      })).reverse()
     })
-  }else {
+  } else {
     historyList(
         {
           "prjCode": row.prjCode,
-          "budgetDrawingFileId":row.budgetDrawingFileId
+          "budgetDrawingFileId": row.budgetDrawingFileId
         }
-    ).then(res=>{
+    ).then(res => {
       console.log(res)
-      tzLine.value=res.data.map(item=>({
-        time:item.budgetDrawingUpdateTime,
-        name:item.budgetDrawingName,
-        person:item.budgetDrawingUpdateUserName,
-        status:item.budgetDrawingApprovalStatus,
-        fileId:item.budgetDrawingFileId
-      }))
+      tzLine.value = res.data.map(item => ({
+        time: item.budgetDrawingUpdateTime,
+        name: item.budgetDrawingName,
+        person: item.budgetDrawingUpdateUserName,
+        status: item.budgetDrawingApprovalStatus,
+        fileId: item.budgetDrawingFileId,
+        upreason: item.budgetDrawingApprovalUpdateReason,
+        approvereason: item.budgetDrawingApprovalReason,
+      })).reverse()
     })
   }
   //打开弹窗
@@ -321,21 +441,21 @@ const downmloadFile=(row,num)=>{
   //
   // }
 }
-let diaType=ref(0)
-const openDia=(pay)=>{
-  diaType.value=pay
-  if(diaType.value==0){
-    prjInfoDrawingUploadList().then(res=>{
+let diaType = ref(0)
+const openDia = (pay) => {
+  diaType.value = pay
+  if (diaType.value == 0) {
+    prjInfoDrawingUploadList().then(res => {
       prjOptions.value = res.data
-      isOpenDialog.value=true
+      isOpenDialog.value = true
     })
-  }else if(diaType.value==1){
-    prjInfoBudgetUploadList().then(res=>{
+  } else if (diaType.value == 1) {
+    prjInfoBudgetUploadList().then(res => {
       prjOptions.value = res.data
-      isOpenDialog.value=true
+      isOpenDialog.value = true
     })
   }
-
+  
 }
 let loading = ref(false)
 let tableData = ref([])
@@ -343,53 +463,61 @@ let total = ref(0)
 let pageNo = ref(1)
 let pageSize = ref(10)
 let selectName = ref('')
-let upLoadname=ref  ('')
-let isOpenDialog =ref(false)
-let isOpenTimeLine =ref(false)
-const closeDialog=()=>{
-  upLoadname.value=''
-  diaDisabled.value=false
-  reDia.value=0
-  selectItemUpload.value={
-    value:'',
-    code:''
+let unitName = ref('')
+let planTime = ref([])
+let planPreTime = ref([])
+let preStatus = ref('')
+
+let upLoadname = ref('')
+let isOpenDialog = ref(false)
+let isOpenTimeLine = ref(false)
+const closeDialog = () => {
+  upLoadname.value = ''
+  diaDisabled.value = false
+  reDia.value = 0
+  selectItemUpload.value = {
+    value: '',
+    code: ''
   }
-  console.log(upload.value,'upload.value')
+  updateReason.value = ''
+  console.log(upload.value, 'upload.value')
   upload.value.clearFiles();
   getPrjListFun()
 }
-const closeTimeLine=()=>{
-  rowData.value={}
-  clickType.value=''
+const closeTimeLine = () => {
+  rowData.value = {}
+  clickType.value = ''
 }
-import { useRoute,useRouter} from 'vue-router'
-const router=useRouter()
-const route=useRoute()
+import {useRoute, useRouter} from 'vue-router'
+
+const router = useRouter()
+const route = useRoute()
 // 编辑
-let diaDisabled =ref(false)
-let editFun = (rowData,pay) => {
-  diaType.value=pay
-  reDia.value=1
-  if(diaType.value==0){
-    prjInfoDrawingUploadList().then(res=>{
+let updateReason = ref('')
+let diaDisabled = ref(false)
+let editFun = (rowData, pay) => {
+  diaType.value = pay
+  reDia.value = 1
+  if (diaType.value == 0) {
+    prjInfoDrawingUploadList().then(res => {
       prjOptions.value = res.data
     })
-  }else if(diaType.value==1){
-    prjInfoBudgetUploadList().then(res=>{
+  } else if (diaType.value == 1) {
+    prjInfoBudgetUploadList().then(res => {
       prjOptions.value = res.data
     })
   }
-  isOpenDialog.value=true
-  upLoadname.value=rowData.prjName
-  selectItemUpload.value.code=rowData.prjCode
-  diaDisabled.value=true
+  isOpenDialog.value = true
+  upLoadname.value = rowData.prjName
+  selectItemUpload.value.code = rowData.prjCode
+  diaDisabled.value = true
 }
 
 //导入数据
-const importData=()=>{
+const importData = () => {
 
 }
-const setName=(payload)=>{
+const setName = (payload) => {
   console.log(payload)
   let result;
   switch (payload) {
@@ -397,62 +525,61 @@ const setName=(payload)=>{
       result = '综合';
       break
     case '1':
-      result =  '专业';
+      result = '专业';
       break
     case '2':
-      result =  '工程';
+      result = '工程';
       break
   }
   return result
 }
 //导出数据
-import {encrptfun,decrptfun} from "@/utils/request.js";
+import {encrptfun, decrptfun} from "@/utils/request.js";
 
-const exportData=()=>{
+const exportData = () => {
   exportDataApi({
     "pageType": props.pageType, //页面（0综合看板,1专业看板,2工程看板）
     "moduleName": props.moduleName, //专业名称
     "condition": name.value //模糊条件
-  }).then(response=>{
+  }).then(response => {
     let a = decrptfun('4D68D20BDF1B0450F54380FAD06C415EDCC5956564BE821C751C4C1CDAC402CBF8339A62210BA6BD111570721DE1F03B31374B225486ECB60B09FB0F61644D79B6B02132711FD489718EFEECF7C6357E71C72A8C4F15F91957431EA7ED938603E63BD151218D7613D54D2C161470E7037B5057FCF6DF09D2B8AE79AC4F5BCDD6CEA46D8B2657BF85A9EA9B90932DCD28357D6558F0D39744649D1D18A42E130D97323463060FF9C6591CC783AF86D09D454CB27852C84D8D6633D6BC4175AC47410652A259CA1D95F4C1DE71AB3CF0CCA0BF077082DBCC45A794F3BB162E9D116C2738A9B0932D5A51667050EAAEF64636EAC9170DF9AAADAB099294653A9982C082815DF02A4793F4ACBB8AE621A79363D296A28C618109B00527F8CFFB64A45131E03521AA8545AEA02028F912E94962F30AF1693053B1238A19409415DB955B7213B5395CDCA252A4D0FCB2AE15DBA1D0982CB8A00E8B8E64D5D2548C5AE2C903862585087D51C87D92B4B97E6459018420D7A19386AE7963B0C90B8331B0259872770B2F546AF9555795BF051A5622B89092104EB816AABF1E970ABF984DC6678FCBBF138A5C00FB10FD68CCFA80FFE9867C82703F25B9BF55AB4B339C320801D694E39300ADEF643F0D70E49AB164E676778041E80108C81844C9FB23F291D08E8BB9DAB673EA20DB68954BF731B22E51F17E60BEE4A64599A700249A944EFD1F5A1EE8A17288A4F80368FEBB3C4D887725A2A4FAD8446299FBBF9F013B37E78AD0A2E20AD4ADF513B2FF294ED1AC850E524423F5D77BD197D1159A68CFF3E9E071154C96B35DF11FF7C4EAF61D21C6E40A00E5A876878FBBE0BCB0DBE5591B72DD3C69EE0EFFA0CEF9B8410E2A3CC1C97E75AF98813FAA3B35D4A5E27DF322E7E73414AA6B78C8FC50DC07C6EC72D6C414DD2A0250C58059BD3C55F40229651D9DC9561800D486DF091AFACC7199646C98D1B263DD3C407EC31F429E00E368A4A7BECA429022BB2D2487B184B2DD6416A6BFD8256E5F7266A93A84A68BB587EA130DAD039FA9A38A889004C0312F5F8AD6BEE7DB35064D0BAB05E75E72AECC8A6502469CF9726C8FDD9A60E64ED77B56C5ECD31F169D23C8B4CC30AD70C5B58F23415BE64D4A5A32FB3EAFE6FD406CD1A4268B5C84717E0A0B286C21442DAED60476A1FA29B024EA6E2835EA7E39BA07A4FAB236A7499DBA6A191978F6680B05165363C281F808CECA343D848B3B8FE67BB3D1F7D35B50118432B3E8D946AEEDF48B16C50799F2AC1BA04443AF62BB50116CF5A8B4FF27F852C2E315E6D39891B26C3D549F4EEA471C488E0CB940ECF55497B181E9FD5899D384B1BC7E29A44B685441024CC58F72D6E852815BFB07448EEC2BBF15ECD22B6CEC0E7CDD4159267F5B19821D913E68539C88352D726AFBEAAF98F3BF26A1BD5A11113A78A26BC292932A8E99013F417FD42897379EA529A6B8CDD1BB04192C0F93670D2F59D012D7DF5D858138F6E74424BF7E76756144BFB85D79ED391CB9C22A2BCAF1D9E0A80A12039684A33A450B730F8B374CFB4C4EDE19179FF7B7C49139B571A82686FBCE595686CF9F5C1F1F7EA2785F64CDDC0124FBF96C95E0B05510E178959F6BE3F4BB8591E1F50BA30892E58CC2C731046C6EA55A31DBBE66D115BFEE4CB2A3D46BCF856FBE717B40BAEA3D4B4F3B527540B4DD672622CDEDE4A06F860FBA392769209507A7120247760DFCDA4C8DDE8238B749D8A3B2C52F9F1EC7B35186C4D9C5724677CB3C4F4BF507D0CF05407443B5A7EEC6508CE07108A703448EB3AC92043F0FF32448AE87DAFDDA8E6CBA4B26ED4E9F870CACCF11A2D18A416F36D3D969A258D9D33628D7CDFCF157151E9C7964987747F0CC1EB03B0CD99DCC4FD8D4065860CE8CC49387F8B5990061B36366212737294B2F624F364A0068D15828B9FE578E0760A0410ECF6BC70147B9AE6C9AE77174D006A5D8CC9D46D0FECC3F75BE6161A08B649A54E6EDB6993AEFE3B7BC6D299F5B54FF29F0DD8A2E1C2359D7A6CF1846B4D20FF4CE4491D8A34AC3F61F556FD722EF0605BF5ECCF8757C23E7DFF3B7DF2C72640D30F53E36F467FF9F284834EB417CB797F80749D79234283D79E1FA61014A2E35B43FFBC97C41A276A1E196CCDA7DD609EE8E7A9709BE819F60CAAC985427CB88361D66AD52B9E3DEBAAE46BC2F422F05E10257BBE36E6894B0B0261D7FE7DC0D17AF4B59AEAB09A244BC1DFD1DC89FD6BA0A938B8CFAD78875DA9AE11BF27A0D005E30C3F88573A6E549932A4B947FFB9C940EAE3D62D9994BF2072172668C51BB985077FFE649A6136A6E6AA66A79DFC5880C5885A87FF772106EB566F0B2A87AB214749C38EDD9E650A70AA92A06A3550FBD2B30F2DE2B8B925DDBB6057959BECF6A503C8721B8AC44AA87E2FD875050DD0CC6497628D83C84B49BE4EA32719F39CAF1071C2D9099A206771FFCD72740C1477EC12D5DB55387F9D5A0DA75E68767DA426621364E336CBDA97EE95343A520EA1FF6CAE2057627D4A66468BC4B71EDBF297C19114B1D50A025C9C555E31462C5B58D893B5438B5A25A52F7A5AAC8ED3636CF93A7A85212587F5E28F69B901D3149E16C9C90441613442358FA3E9581458894E86FB608E339076FAFD17FD40714762FF9F0AADA5E476CEEBAFC5C111A7B14D52938D0AE5DE2896C4267FBD36ADE5F25846E75BE958A5F41846AFA4B06002F4C49D0974BBAFAAB4478E7A25F63F09CA7BA4CF5223764EFD0FFC342E97D800A170271F5DA672B4A69A4A08FC6A7BA3F43A4E89D0F85311E00347EC5B87D76CB953E8487E362F15906290A3EC6E2D2F3FD67E0533E2E4ED5FCC93F27D54DC9A1296640308E37C64FED12C498357F01CE06EC5FE21AF6537DC6E890661B3B86B62D1948CD0A6A9D7F9C0028959B4C02774C0AE529D024BA24B3848504C096B6F4AD8C604433C0C8B4268E74AF3391AE1E1930F2BAE220B08CE16C418C88FC453EDDC7C59BFF6B64F74D57AFD60146BBBC293CD529035A80D11E5C53317A7925EE4AEE90FBDB01F7E0DF204AEA97FC0C0D29E0559A705F9B0FEFA900734DB542D2CF576C48ED2536D56F70B7D0C8FD4EA9BB8EE7097BDEC8866829406F52DA6863AE5995EE44C30AD4F7F62D401285088E27298E91FB2E723BC2A7A76B3AE33E6FDB0A6F88D9B1F84F4A1107EF87E735C3AC0137D3A5355D587D3D3F152E89F92756FF24828AF12AD1E219557D0442C1C5FEF94FB4472CF9B8A5BCBB1D2C095E7EFB4A40033C31C46E509376BCABAB30E6F4D5F3B9F6409975A043304224786EF710840F799FC986FB5A88BD267CD4FD3A3134681C3344502BEF495AE096F63AE30173CCE596448D79FD9599690124A2EF7C8E73C9962516EAA608665BC7F88EEC67D6C905BD010196F94398684F9A0CE16B0E2FB282ABB8D9D8B0E1558D8EE5D2D600CD1E9F7AF78FA0B14E04EDC5446EDBBF36EF55A6C5E79E84537D7B5AEC6BBA858797B75C46AFA8B7FD474199B51FB720DA807AF501FDBB9B614CADF698D3560F8656C734AFC1E27EC69CBE97AB8D2457FFABB26807B323A721FA473D3F67FD111D98F8BE8396658C64FDC68043A1577ED0B7A7FABBAB5315EC24BA5E2B370588B94E22BB6405B70BA93ADF9A09CE331D08237575ECED71BBAB3E962A8082E7BFAEE84CB274BDD05E3B39540DD35DAD7540DA2AA6E4AC06E81B38903E2870B76019D2E57F048F976E0E31B07887802E247A266C2C424B8DE93316B9628B80143F3F13706679ABF23A70164C0E8C96FC842518D6D3B0B66265F9F0353195BFE75162D978D6C52CD19EFDD92AE552A280B7BF6BC4D49902F9FD6FE7A86A56D4E70E8AE6076D177DA15CE4DF8780478C5C9D2F81221B6D3B757895CF76A5766038AFF2D8DE7845F614CF4328CA10B315A32AC8F36B78F2A946CAFA32DF75FA1341F36CD1C428DF95EA475529B132413B108CF8D423822B524F0DDE8A91DB165D8AC92E11451742742032F79E0C1451BFBE0E6EF99CDCC9907D343FAA532A28B4C32F2553BBEF41E7FFEFEA648A75399D01167EB42D17CC654D50125CCCB38F2844003DE7A6F9899A99807CB71ACEF5C9B19CDBDDF0E8A08C26B4EF137B677487CE68E4FB67ECE619585453E79B9B6D82D5F8EC9C69DC564C6C8B944459B7D06A3B2E9530B91994F86B7C4BC4AAE0F2A2E576E66C42D6C361068E90B62A59297C7D43B8368005E5EC15D3E83D101DA70EA1AA71E38639D5AB9CDE54EB6DB214B089F9461F4F856CA23A96B6E67EEAD663FD09EC8F4C0838706F2891941C8FFA60098EA951C9FC2421A311074C44EC86AC9F69D8D9C6B2AEDAAE4ADD0A6A761A8E27984A606DE57EEA6D052967B3422D54E9A990780B1CB141F61F2D30F34F1C4B9491EC06990A2CB9158F345AADB79B08914C9A93AA75D956355F1E25490A9E2B0B257815E51391F75F5C71276DFFF3FCC6A3FFA5A52F0391387EB198B188E60980097FC21F82ED1CB1EF82D486745408637E11D0031357FEC81F067543B9079044C1EDC6BEE51B805C1B4DD8B96A7140EFD9B462142988758BBC1D3BFCFC60053B0CC7BC0B560219B7A7CEE988DE28AEAA023CE33E5080E6FA5B2278C16DCCD5C29FF6C3D5371F96896604BAE127C2C928D8DC339722C6DC18F6ED6ED467256AFBE72FA7C6491CDE98E9D159F947BB03B00FB193C71010A400AAE0A48F2519E942DFD649CB67785F397DF38CCCFB0A59C040F92D3AF7AEB3B5CE2D905219591EB1B983B3A2CCAD7031E4A5B160E2460E5729E9AB1E78034F8FBD9894AF8ADB3C70913C6E100478AF393FA21A9CCEA78EED4886E072B6EC13EDA1023049A9148DF33156DB2C7A7BC9408CEEC5628A3268D7636F48AFC4EBF293F7A9CD7E68F2DDD30CC2834A658BF964C82238805B22C4357D9603A2BE6C9301298C6B61511B6FB9A3A6ED7E71AEDCDCEAA2DD7D3DFE8ABD4F4DAAA5F290608FA24C2BEC3224DB6C7492FE7AE76ACD86DE89E3C38D3D72F4E9719EDFD63551F1DB8A40683951E47074C10C369E7E58D81245348989C1D28EA113E2D5D85C4CADA076724F61E7F4F6ADDD64EF7BC3655E261705AB5A28E9479CF5F75B5CE68AEB6DC026A9A042AFF2936F516CF574B87D874CB6E0A1AE6117D9AA55C91173BA7C43B2731FBF2624162C6D90DF38CA1521198134B836A80C3CB6C161AA1752C69C6569E2DAE1B1FBC98CE6053E264E54C3B3CF1240EDA0A8EEAA05DE599423C9AE9AF4E1D166B00C2004EF0A8BBCD88CB9BBF46DB5059FD2FCB231A54B3F639666712E422E9AF5FF2B06C0FA2FC7CDFD1591B188CF2BE42EF8C3532C2CCFF783E3F3F6BC921BC576FD3A055AEA15ECE84FF3A3F494FDAFC9FDB81979E20D5DB07CB309CD6CE95D818F8F0F310D3EBB552095F7CFE125595BD1376C68B3BC8A25917F56F84F488C2D1F2091BD0E29C4ADF38E4EF1F78921C378C89AB4B026DC8E7287F494CC7F7958F819FEB0B2CECF374594A426980D903947A2E9EC44D6FFF78E201F12675415D5770BC0F94F8CFB8D07B00917BF5A7B23A91BA93E8CFD22476F02D35B01E050E9E59A8602D1079D52B32BDAABB8D67FF343AB04C66172ABE017B38675E5EEC1C1DD71B119A23E8EC127F0490D144808D15D385B30CA90A41290897472BD95403ACE0F4BB69FC5BE25F56B0EA307DAA9007F3E55EF1C19DCE9D63B7E0FC68920418B21D3E1461EC7E00EB0DC63ED4FC132EDC27ABB6F9084A599D995200A1D653C3DE1B9E6D687196C03DB69F9A38748299CDEFF41931612588FACA11D667ED7BB28BBC2EF906477EC36EABC1B05C7DA9F0777B725A57DEA774DCBEC27E598EA86B810E4655FE3302DC04A13DF6ED4BB02A6485A5EE014BE66B7097F2B21F224CDF02FE2BAA5FF032C4F2B990E5A7021D37FAF68DEC2D62AA51A91E6E796730E88EF12A0E61FADF26600509F4E6A382A7873C8F451D7AB7E3C949A964DF27C0D8DE9C13ED15FEBE9110C82A17A414A810CDD1EC5F89462AD7472A65A3F98D569F70D31413C73ACA5CF517408EE6BC70567F5BACA40C5747EB1700BD1DCFE5DD8360EC93AE4E54D91710C8D72843856B12879C135A2FD1F12C541238BE2E8EFD24F46074AD3BF7ECD6CA9C1C9BA00BE72483E6C8A983897BFD9B903E83F4FCC51D2F478DFBCA311A71747B495199B042144E5634BFC57A84ED72C5BF74330EE9DD397A213E33BAE388F4BF98D645384A9DAD5B6D2974895C92790110347F22EB7B991E6DC9D708F9EC0A9921D2CB62D174425FBDBDD55D21F491A3A6F2E2E33B9C2224D5E92ECB950E5BD4A7C036F2B59B35FF5D2FAA0EE1A7FDFA09C86E06085462DB4E5257E53A990FEEB65319B1653FCC031284DCEB55EFD50D245D8349EC0F1101195C47333AFF6D39CF475765A041D1DF9AD72086C1618AC1728DDE3BFBA3F005DD870999F8E70B398B7276CF7640F1BA3CDAC86D4204A0AF3C8D01240B690A29F7A28C331C1D039237D0E46F66BC35225CB3021A49101A39A3FDF830BFBFC4111707201E9998ED7F9DD7390C14E05A8786663A15D3B1D22FAEAA2DF851C10D73722AA0F435490B29ACB17AFDF649909310133413DAFCFD1D5ACC6D6782A73AA3CE466BAF6DBD84B07F09597F264874DCCEA84894A74CD0014E26826F03CB8F45FD95E0243FE803248B7E333840847D00D5C687A277707EE85D5581AA434014B9B45114CD31B4D223ECA0C95488F8909976F8A648816A0C2149CD57C674DEA94486D855F1034EE700FC8CF0D1EDDB7FFDD130FD910C396FB4BF56AED0D26F2204CF54DEBA84B11329B2DB2E0EBF98E446EFB2E5FD0E79CD19053DAE88108836E957B1DC6E12B29CA757DA866EFB66D7C2463002356A22BB591A123ACDC1F61346B3DC01EEA2B5A7E073CABF057505483011B929479CA5396C11C441107F8E436A29AB6648BB526D62D55EF97227B04A2A936204780C1B79B7273B0D40C037D261FB5621369BC8297304CF75E1DC9EC995BA7155BE2D6CE1C4AAC16172AE3236E5F0B3DA3F68A880874AAA5DEF0BB670EC820F65169691092430D75BDB7F955E02AB4438010E71004EB7F5642F6AAA6B90256FF54FF85CA39F409868E3CFA043AF5F957D31E01B0559A5F79BE66C08C838015D0FC25F7D8B20A963ED5F0A3807DD709EF4F65E6B8152FC961FB82F47927E5B6FA32E07DC341062FAB2608D516253BCE9FEE630C69E62E0636B8A2344DDF5A44D99BD1057900F4E7942EAB1B883175DF31A0A28FEB2BCCFD97646EB26F683A8E86BB5646A8EB7A33D36C942D5CA1A1E27835C232992D50FB5D90B8232A5A450BC23E302E0A49FA45A44CC6E3A50B6C47EE41201827E0DAF1B1D2060ACAF3506DE2ED9EE2884D85E7F18B0566B59E1A64E0AFAD7448A7CB735030CDF21CB829B4ECCB0B94EFC27D087E6D559C6B6865EED466FA795327C096A26932A83A8C409EDB6EE7D43F6F34C19EE596016B1998807617BEFAF0FA80FD5530104166A29D267583EC80C57D8905EF0F7F3D400ABDA47B054385F4D6C9D1030C68DE50707990C29EDE940F5B045E634278FC1FB20BCF4790FFA0109F90468719D9EECDDD340A6C85C8B47549B8EE3C30BFE5185F2B52EEFB30EB172BF6ADED53AF7A7A1104B15D2594DF3CD81EF9D4A06139DC45F7244AC0C3AE6B7D21897804DD7C4ADB716B2A8F0C888580B08D564D5C44E43D0E4509AD590E2C9825132B5424B8CB90798EF940DB34D842F0F88C663554EAA1E94DBF103EC275A732122A86D126360531870A7406F281635321810E07A661A89B00121C7F82DB532772E71A460A07C91E7492E45174CDAEA39BA3B34F90F5138DE37C0A1B49DE68439DF0C41DB02ECF2C252DAF1D08932DF91F497CA644FFD4385784D600E159CEC416996EC72DD90A8A7D71544C98583FB29837C0D2C1D58663B7F2E0F6C4F5912B8C4DF4B5A15E731DCF011A8AA625BBF7E5A49AAC09D16CF507925D507F824C4318C27556659D057C66587B91E92DA1AC6F7E5B15CDE4D8926F4E236DD5769BC545C6EEEB0C6F897E7C79CA4979F70C77C34F0D7093E0534A39E729BCB9A1B517820AF8A10CABD4B3040F946C7CDDF82F18AA2CACF6E07E881695671A50ADFF6C2CB3779A69909AEB1A6411E62B1E4977C61859ABBFE8739CF1D2B403D527B03240FE112AA62B878D36D8CD396FCA0E965752FB909F5B4A5C1EC71050173576078661E7F8AF843716494D970C43B9B2139F672C85B13390B988C317444B848DFCD660E1D4C0FCD5FB405593184F80B5D7395C67A41FD42CB6C48C19326BAF731D73AC18F10073F1DD75CDE4BAEF5AE9CE6FEE25ACE96A6E5B4D460659EBB5A6E6E80C40383CC8206BADB55B0B1176465B9A61A8BDBC47C4503253349566A08C3F086DCABBBE61FB6C1142631C4B15A49BC00F1A0E6551D33215BBCD0EE726E856F69C4CDFFEE1EF81C8A1F27166B853E149E35CB88EF40A8EBD6999C18DA1864B26FBE8D9699D48378FA04DADC1C052EE36AB11DED49569BF021EDD9DF9B836B63227528C5F39B99B5F28ACA8437A7E5A7394C36F2E75CB30EEEEF2DDA280F1084F428E92923BD8331685D418DAF9C542A8A9CCE374CA249381AAA385452FC1B8A705A80CDEBAD7767463E7A3A4799EE00165E68111F8B3FB038B4212F59A2E71E9B1D251DC9CDFEB25814D794699BCA343D13FC01824057DD21F09EF8DE4A09BBC1A97A9FBD5C52BFB193F59D08FF439E5E987CAC7A6BB185FA3116522A44994ADA5A79CA9E669AA4D12A59BAD1687C1A33B52F98DF24176BF56E76346086E214286EBFF057257AF292C0052DE6F3E16D18B031B9450D0D2C7E488BD080ADF089831EF728FCA77C3E751A1396B9CDAADC525A9B07E20C50F33CAFB98ED07CAE5446E374E8A1C0DF4FEBA0CD04E3F7AE4330F5E291B05B896211FA81D4A0D5795535B2F62C18C3EBCA8AE2907D8AFF6A84551640F606E4FDA3AFF396FA8351AB65263686D69FB7B6F9E4A3742B6C3FD5E7B885F302223D49586CD251A7B85C886CDF094CD9C7BA50E27ACD5654FAC9ECE52C0A50D75AC671AA5C08844417F2E5201678EA92A696D776EA23480D6F7E4A3D68F90C5A05D9C2B84038AD98B4063AC1748E2B475A710DF4D8C295610E2ACF617BF11E2247F984C88E5A4BC0B902FBDF9795461EBEBBB639BC637A2E228E70D45175D6EC0BEFFA4E9537BE9D4AC406F817109DA33F3159EB4B381C90B3D0F4EF0B92476059E702BBC3C693070079F5B079A8384E294F42D7B1F5B8920F534BD4D220BADC922555B7E0B172A454CED3EED487998BB81CA47FE9E4FB01B6B2B4A17D789395CCAC5A53DE1FAF96EB5C1B6E11014E22CC84A6C2D8E3E40299B98616A743FC227AA7990A709A9E97BCF4E5B966B7E439BFEF10EE19364D5D3451380BD7F0D974795824E45ABD1818F6C5A634B840851E8A7B5618C7B97790C1DF20952CE56994D6B2BC7CB9C308681159E5D1B999FE868D174BC79C1EEDD7223B90345D4C8B8430E7606E839FC32192D1B433510F9E861C892EF76639A5154B929B0E44089A03AE7F1C8F05C9992F2600B7778AFB6D2877B21AEA6C6CF9DDE784154D23F9E1102C567C9FB94CC7B0B750C3E9FD2E3F25E214FD8E876F9978A196A027DFEF1C419FC884934AB7567AA22A5B3D4EA4340A8179F3331EB68D2298AC63AB2E9A103B613DFF3A9E6464A8AC706D1D38389426F2EBC2CD3FF1C8593CC8D6671C0A61198C2A80FD08B8C64B45028EC395BF712E29E56B8ACD940C43A4FD8DD817C2C1A46781291B17713BEAA6AE298E2F5DE75E6B9731C16E1B8F9C7B3AE337D4125B31B4C132DE54FF92813C0147646A4B9F7DE2B3A7FBDDD095A641288A62C2C99F4E61230A920E2C1730015B8420EE853348DE8A743EE9E754F7764BCFAFAA4BA1B5D2BE099718E67E17F4621F7A18E5692E32F703F897B40FE5C2989054800454757137C95B26747348F709D5E980C56C03E442A55E97468D27FFF15A6E966BAD82B16FF243CE993D31297DD8C7EB019B42660F17D87D9D26C8F37DAD12BD255878E566363BDA3ADB8F867CE02D79436C73DFE333536F1A8C0BF66726FCC9A3724A016F0B7F4EF60BB6941AFCEC1B25CDE19733D3D39F8FC62C100E396841F0221DFF553167524FAE95C3E429B76C5B6667200283F3B91ECC76DE3228D99D80FCD9A57885823E01D452042D6B293279342DD0A4D432DA0C14DF6CE12B37F8B45B0A25C0CFDC09304739E49862134363F6D56BB212F3CF27DF65223AB8F09C62A298C9ACCF0E68F777EBFCA9292A445068FF0B263158FBB6CCE064F2C9124565BDC5F315F1F46DB76F7C822F95D20B0AA9C4F8243FBEE4E734A07E3CC46966D888D582928DB285C6C76A45E2AC39734F4118261603AAE4C67F83106DB23BCEAF48D09138596C2ED2867625A6ABF3F417B89E91EA6B26BB6A82804DD821630D2438065E28803B6AE1ED73791953F78985C1DD8501824E57565D720441A620414B88EF251EE2AB97A6D0616337CF2E7A14297E476CD30764CB6EF45FAE08A53077882AC7B503CB25E6E6E40EBA07AC136A6A0CEC8A3044A41A83F031DA3DF65D24E2374C81DA186D80431CA5B93D0404A90E2B41689542362B84BDEF132A1EA2371E32BA7F43F5FB8B1749606A5838E9A6729DD17612FC58634618BBCFD460F2984DB41794D42B9CFC3F7F4CBDB232CD78B2C2EFE7EAB682B48C99C6B9AE6827426BE47D64F9AEBF53B85E096B5661062A03A27726659B03CDB0470238A683CE348804B5E2AF11B527852CF78577417B188C9F94259305190AD0D4C21578213C9E53DBB6853B9718DE0C2B9B3959BA36CE1720568648FDBE6215091B6A929DA02B30CF10C41649ACFAC4930286C4D18BA0B1CC9C815D75B89F8F645FEBAA06AC2F8509E06587EDAB06CF8C6A4CED6991778AF27DDB9A20413D6CD56BC9B5A90B1D42B39320879F7A97BB9E5DACF5AE78A60DD675E611C04D19615138820343742C1F17F8E892B85883BD6AC170C2796DA2D5339E89F51C62E4FDB612070A1C8BEAD63A7C64FC34AC63462A0B366F5903DC0644E72130C1A41D118E18B9FFF42BE25752A1A42DA5E6F27F2CA51C21B6611108FDCA8D3F0A24738E3FE5B1DFE54719AED3AA18A3A05C7C644EFAEA0EE8965727540CDA8056EFDA17AE85BCA61347E2CA6971A124EFCF054846B93C6AE054537D487EE8A8F068F665692062BAF2E2399AC349E0227D2BEE044D28703445B9E14CAC47C7A01BC17F3AF8FA2F4FD824335630C3DFDF4C54EECAC0392B8A9FCE3E347C549C91D8B8448FF2BEA290962AF817FDED82890FD5AC86E5821E661190EDCD786A76CC47495FA57B9E83B7A99E20CFC1099D78D30EACA913BF2E2CFF05D689E6572C9492AB15FA4DDB977B6359A097E770AA7017223B86E4E755D3B0B2339403BDCAA3667F0CF4C6EDF5FBBB0C22B27E207CE6328198038811D50B99F48AC283C3FB34ECAFB82CC0668084947522788DC5590F1BA6805FB366174ABB10A6087F9B931175454EFE2C0F809BBB296D40364D75E2508A3258AF6F76321277020E19606E6D8AB486DE857BB781F34D9F6ECD19CFD6B4248EF8CCB1885970A9E6439CFD7C3C5B5EF559A1AF3D7993551EF311A31E41919C6D8BF4B2048656AA4DD7250368DB4763909A3A055E1C2862D767D37BE18E2E276A851064F7EF15F0BDE1F966DC8A2115C823D3C2251AA42EDDCCEB6686104FB5DF27E5BEABEA73F68A01A47C220F9C3B75ECCD67E6C7234E93351C43D774E74329CBDA7E7E461EB286B1EE2CD2A1AFC8FC1C14455308428BBCCA9A92826D9309BFD8C38B48801E19E4B9D0B0291507F3CAE332400D5B740C7CC39B7225F882CF3453A6A868FF65827C8686C601009E70D821C4EFB308B885047BD849A21B223B1D8FF63EEE4C4671D412867F8CB168ED02DBC6467B94005479F0C3895D73647F221B9B5A749246F64D571D6E2652A23D615DBACCC9CE11020C7BACB997F3F65B16AF6ADC93837644F40605E676EDD1FF1FF8425EADC03E8414CFA213C5048440C7730BD3BF1F315710D4A78C231BD4A09CC5E0A0871F822B9789AFF120EEDEA20F106B0C2907036AF8AF747BF02875BD226B03C54D2E558F6FFBDDCDB43CAE0CBC1435ED98CCAE3F8AE7BBE80CF1A18723535378293364EAB271B8F44F0285278507765E1A8F094A9E092B9C2076B54937E01E488E8192D41E14F7CBF9310F2269FE87DE8D51065A47F237D61B2893A1408CB5F3D749ADFA7AE88A82BE9B65CCC860C6FEAD928A2AF4EBAD7278AC2430DB74C0EB3D277AD36B926D08B43BD299F3B9018EDD20E7AAD040676AFDCA22B4DAFDF9989F20E3D34AB2C33AE9C34CA016292E6E7D084F120DC63D266AC33842E467B39193CCE6E58E28EE308730B64A38B72C407002E69D6B6D51226633F22D6352E75E52EB2A7695F7AB101A239B0E7F399577C63969789CFA3ABE725159BCAC650889131F575514F74B74A27D474AF400757BA8B6F07DA3E6E5B2588CDF65DD798ABD494D433085D1A27B077C5A3FAFEBB7B9E430D5EED99AAC3B27E82B65E1B6509A7ACF24F90E47A02F0C0A19D58FDE67FFFB873C3E687EE394F16225365D41D6DE71B3E23067D6F6E4E2520A4B874134A7B8B6C77567DC56C5EB6FA636BE2739784288FC9F8FA664B45D39A2648A0E27BADEB050E7424F04A5A892CBBDCD73F77BB325629582298E21D7DBCAC59A487C5500914C6F641B3460F211E01E59A6A598F27E87A759B7DE42FE911DD2CE6C84E0AE605803667F2748DF3AA245A50E8DDFCA477A99057779709EFB6E9BD9EE90492EE4AB935CC29BA1B62CB5ED6026E244CE0A349F85D62F657DE4D1508CA4602FCA8BD062B5A8526DA2D998ED9637BBD447ED89BC911CCC9322337B9A8E99FECCECE5268B954E08C273DE0AAB32D90F3817075A4E3417CBEAAB15369B6362824A61FB562BBF62CD03D07701B81A422B98772ADC2CB73196898B4DF0AE15DD1505C91B140A9629F95560F8C7611062DCACDE6DFE88DCB93E396B7FE0913D5EA52AE84A6CD2E8448FC1F0C6C915A4595B0AFF5186516C673DD7531A33E15F516A375AFCDA4F70270808FE3E816BA206E00A4298E85380E1B544BBD8C18CFB23A440B9CE09F21B6637F9B39AAF661EF4AD55DC070F696A010B3C71B7885AC3ACDB206475B75EBF35E03F0EB9AC5E8BA897BE5E233DAA6905C641D6A33390B1E39D23B476E9B48EEC28D6C3D1A2C20EF56F0B20115951C8EC2501DA002D401E472D990ECFD15B5FF67A61FE728E1ECE529B946EC5710E4CAE831A838341D24007ED85B3D6C16B6CE027E51900A7430BC7F2B1A210D36C67C36EE4EFE73AE410322C55626D361A266FEFE7C26B8A8E8CD3D44FB9630161C91F07C5CA6326B1E8EEFD1FCFACF08EF9506BC1B049CEE6D7B464A30838A5A7C96D2D781A0804F7634467CAFB1A35CC26026BEB5BCCF761930A2721CE3365D3F26875ADA776A89D9E4F6B4CC5A34E2351D6BF90B8E4DAB2480262A33368885A68830E769974971ED57ED4CC4E6D7E2098C19091327F96390295F7ADF2BDFA9A19026BEC8B4B570DDC260D3CE917CBD7BD5BC04E0014D39FCC2BB3C0051CD86CE9CA879AA1B9E2779D66642A3D469A94C1B576C80E4CB1166F56893600EB5F22879033F0E19518D697764E50A8A3464E7F33CAA0D29867D5F5EFD9A2C246E467BDA0829CC06640FB3474B56A49E2266920BB19B37A436C9420DB452DC9AD49C729643827069FD367837AD64160E3580349F174E1FA100E8382992E43804202237986AB29AEE20D852A0EC9917590CCBEE32CD6E1A21F7FF6FE54CC3AEDD921669A01007F936297A80B9F034CBAA6CE1AD1893FE99D82CE0FE81B1059D186866A222CC32A4AA4FD14ABB2F3E19509DD253E9E105C9EEFB1C83952D01941D1755FF2B84CE18BA616535265BBCA3A3A3D8D531C144C29BCB6FC2C3C2F34C1D3F1C3801538AF4C654F8FCD7AC362D3195DFA40E170F7AFC2762F894C2D5CBF6FD1CE81703615CB4E20A965149495674A07753C494C89576FCA08C85BDE9C9EE32F0DF8CFFA5EE72945262E3358C68B7A3E2920E9645069AA6307F06E7358AB615DD516914E34D75038680C30BE8D27E5663F835747E7A342EF6AA2E6EB2822A2CD7A465ED370EF95602C5A6429F74C5CF4969C1075518B04D65C33EB7BCB9F58FBA89165F5DF85E66FC72C2D694B9EF2D965D452DAC19F694BC7A2BF7BD09D2FDBD43BBAC58FCC4AFA0CA1785A3BF6C4716A90C4153F8639B637371198CD93D7F265E4B5A4E3D43D0C630C6B7C8434621D3359AF81D4644B4C8C5A73A1AE8CDD938CB392A92D00FD6BA688B6D97FC8F7F4241288DA8AB6B6FC2C7CA6BF7ABEA1FEE6B9E4C87223C170A802569B57E95ED2ECC857759AE15ECE93D81AA43A08CF9A3D8FB81C022C84A2BEAA85E1E98094FB9635DD725A036EC6784AA65CF0B62428308F610BB56B6C4DFE7F8C9E67CDCF26977850A24DDBCDA4316EA1ABF3072606E42366ACB3F60B0BBAF56134AF3F4FA53DD27936F11FDF56A4ED80ECB2DB9C6A8F3417A7F1E4109A5FA40D0FBB0320D767793DAAD7793C12D9606A8B4D658E8A00C2668D45AE9939D12521557BDDEB9FE8E077221B612CC9757FB1E9BB17792A50BFB281E660BDFB388D888B009CB49ACB3F1F4A3CACB84106EBE3F124E8AA40EA901CDAC4EB6D6F3B8B6B91EC142519084B4F18A0EC5339FACE3917805BE06F7EE32536AE658E38B87982ED44E51CBF1365E87B1AC2505CB98D76A7ACCA5B9A3899D52CB73567D0092D94DB781FB8E0541F68BEA364AB912A36632B72FC64F92B892C59BEB8EC518566513E5654F12DBC8C2DEF74A25E73404B38EAAAC0894BA5A4264F6675589399446D99BC4B103F2C59A2EEF22242FC4155735B4E98094C5322784EDB65B9EE686A6C6FA4AC65EE821A4B1C2A80C60A78365E0B8DF055B09669A45E27B6D484ADDF597A95D5DE4FFC5A552FF52CB081C2CA3F3C72304B39E507E6ED0EA15CCC66DE3695D480348B57969FDCE78CD712BD22E20A8F751DEB38138633A021E490C415DA0B8CB8D0E3CC127CF85DC5834B95764730BF9044889AD174E155ECE3562938E95E4D085851AA92F8876839232012C6035B8D5D2570838E3BD33CCA48C42FC914835CE5689E7B2534820F30FA999DB317BC579144B04FD8164C6FE3BB35CD733438FAC717321A3865DE6C55C0ECC37201657B2667AAF2D9A2E7A3442E3361BEB22F0ADC8A8E56C44CEB1557D599B97AF5B1743508B58C68580A4ADC32956168F99BFEB16570937633EEF8AEB0F0DC20BB5F1F5DE6567A4D7C40A13DC60E8800EE3473D4F59644538B9F6D238002AF6B409ECBEC14919F29AF6DCBAAA2CF29E08D3419D2EBD3EE859AB5533E31B9FD30CC8982E711220887AA49C1C061E0718B5F601407BF42919605EFDEB71633C040FF3A94BBD87294D462DB8D2042F4575D12B5354A03318ACD50884C1F50333619E9521F7E1DD772492BCB42DA8292A8997E58EFA53121306E62DD6E32A51629BB88070CB14EEAB0CCEC4D77FF5C702AD7E7BE0A71E611EF8ABAC93E66E25E7DC1A5B37D30A4628F21BE2B025982B15100AAF6FBBAD8D56F43B6517B7D114BD877A25BFE369C5990D71B8CB15F89ED007243BD9A8B53847AE9443606B2F1F86D63E5FB03CC3ECDEA4E9EF66E59185A0E15471FC35BE7680399F061AB2DC29415E69D0724AC2BA26271C8E1612CE750429767E3261CB56C99877B53603036A458854A2D58C48D016BD71F12AAD9E9AD54AC454A8AF76AF1A769834A298648E8EC2EE31CA9DB40C04B5AD7191AC299EDD6266AAAE12CF93997A0C3C288E1893EE7472EB5E11350A6920E64E00CCC3AC124C72C38A9C76C13F812DBF45B2DFAF44211BBAB5283D015AB612EC7AEFEB2FA9881F14DAD6414838E214F5B630E424C481D20733E2A5E44C2B1AA86D9757B94FE7EF92BB4C297C9775CA3707FA390D67995611C6F45D02AD0C6B740824A66BB1F0B3F71E789CD62B2C6510D11883D002A44349BB42C6DA876836CC1E81698746581E4F1EF79A8B8205B2BD031E78C95A3191DF3850A08021D44DF735A2E5CA80DD06724280F63C236B9DE21F0CA2A4AEAD3D94B7CDE34592A78E04B63BC4A34517322C1A88B3EA135E18AEC0BA73491E3C6270299F4B86BCFB98DC679FFB7707B59A53BF8090C3FBB9B4E98919851805BE4B60C8882B9EC6DB8395ED21C9B33502FED9ED85FF8D67FC055CA2F00D086E7549BC4FD4A8DF9DFBDD1402C387AF547525559CAE496D00D09A98E60262B3484BC5F79465603E194061D39981C3DFA15D7D41BE75A8C859CA11C0CF1ABAF0FA5FF664DD7367D5D335D7725A7B3E7B6295687A7B4D5607B665332AC1D482991117A5751A3CD3ACEAF997D35CDED2E8385239B47477977C2FD189211F58442016F2628E519DFE1AD9105B2A0A7A61393CCD631EA2C1568A0BEE910A455D2E2C93F8BACFE79039037A4EF831578C1CA17624056E5A5872CA1EEB41E774807AE6BE349195FE786FC572D17DB543F78FEAA27F9AA6417F30D0403E75A38582D0381851ACF14CEE87A2AAA0831D6DA94F334934D5A7B562AC4475DB15C7FC72A20D8EBD8C372DBB5CC8A3E52A50C3AF6CDFB074A0D32F1CBB594AD31476AA768E0AF4D2EB10B04468FCB2B759DA9A82CE06FC642C423F2CFBF2B041FCBC2186C0EF271303A5984241EA904F6A52F27E7A0A4114317A43963C4A4572595D69A26B76C8786AE5D0C0ADAEA3A6EC762FEDCF48D54DE21FE417980F42AD859384465A3257E29A99F07F6612EFF17428F429DB9AC5CC8000A2E6629652FF57B24271333A8C55783F58A4923EC6375600FF66426CAF5CEE4566261EC769D3B86D9024C3697F1629354B5E2D25CFAEC03DAEBC86A2F079B7D81DEF1372C722A7BB99DAFB87E2DF10D4B282335FA3E0FF4B2966CE5F1A86631F6146B609CBD9CBE2BADB48AB1B3BE6B10AED85C0EA8D9CD81001C828547C0404F6C69C9B92045CC31F41A75E791C93D78803C79A9D1E66EE8B22AD78489592F5F9495F7354BEB9F21963EB52D73C7CD63B777FC358197CD1BECFF1B83A90584F2A092199B05109FE6D3B7507031F94293F276A0EBE6AB3656F00EBAFDE1E61ACA8ED6A22C21FCE72415D002460133B75C851AA4506906EA86A40E943A573D2381F26C7DE11C38B93B93E34A94E06A7928B81CD832B7501E1CF248C56D9FB22955AA401204B608B07101D1439C4C7EC8FABB528E74BA66FDD5518FB6D07383F7ACECF66EE7F798E4AE8DC341D011CB7F619465ED8909AD327BC4BE2CFD8B0168F146EF4A1F7002CBA22C3C72874EEA04FEF191B8DB802196D0E0BB08A1879955C5BD2EF9084CAE7F98CB7CAFF27FA3F8C94F64601FDAB37260B9743930919E50EDCB377B7CA32B6320DA194535FB9F269B72BBDE2CB028968DD5FE601EB238E5CB9C9ABAAF1DED912E69D16EE2E863761E1006B59561794CEDF57B1AD611AF4D12410E10473011ED9E1D683FA01A165ACBA9A56705C02A221ADA06F30A2783DCA265AD4350D901DED18195556A566B81760CFD8C430AE6F9CF367EC0A9CD93966F9A7688A5321540460B27895858D43242729244E67AE8C5C7A2345EB75818EBCA1E6B1B15F599D153EDA2E0BFBA3807F2012EDF8D6057BD532AD8AB012C29E93BF24B4D2192B7378245B26EA20118E700ACA1335E567B3A920E108E10D5423DD581A412D0CCC6C97C66FB44271573CEC815217BAE15FE7250664EEB1B93CF2ECEADB9D62ED162DEAD8B1DEBFEC66345D6F38AEF40EDEFAB376C3AEEB57B76D88B1790C204990503B6EB32C0DF6EDDA5AF6918FCE310FDB177E9C3642849D4A325A2F83754A8F24BD250D24C9D78FF29582654DD29B618BAF17A7035E22AED4A363EDEB24C246A576E1DD4E5EA547565AD71106A349E461457DA2DFD497AFFF213DE51157C48CE1BE3CCBF0395BD0F86F8FA7FB21C1FD8085DA63DB9C14A18AF094F48559C35283CB241E4A8CF41A280B5D888330605A03284EA74DEF6B907F235926F085FC0EFF8CE3D34C1C9E67F001883F63EA215F0514AA893AD8667BEC4B3BB6A46D3EC85EE0832CC29EB1E4F429BF20E79F2A982DC83B34251CD685F995FE1FEE57C1497C6C570E35C859C1A7AB2CEE71AB3A96B86ED25FF34202FBD731E41E1B644601FEB84E992124AFC70A8EA1CD3A76E800D19E4F8E1E1D5F02384905EB0FFA0B1C062B754EDB5F1E84CADB538FB115A84F9294A76313FBC3F96579783735F4966A1C207B9938E30B4304757D7ADB4B339FDC387DB88B18C6700CF31ABF62A942AACCEB6585BB4ED5A439339F4FBEC74A0B72C40202BA0083EFE2A1F338D310B6450375A0D650E9943580082742A353D7B0A8D4989A4549EDB76355D28373403668759FB0D692780997D2A6CDC9596B8E7BAD6765951427F72D217F5171FD378F74E06F70A5BA31DF2964F47E4CE4622590052E4399F2F455B00E8E4FD91C9EF270AA3ED2D9A68BD70017D5E9C7B771CEC259900DC531A76BA18CB7B6BF976F369C9BDE51AEC7DE1D114B89CBA10AD57CB868036C600DBC1B3CD3CD22B8D86BC32E5362F7A0200B9338836FEEE893685D5E03A4EC412F3ACBBBE0A0D8746C1FAB02B04056C74F11A807EBFD92894FE80497A630FD3CD48C8FD51FFFF274E55C43E72BE69B29B39FCA7B9BB708F7242EEF2C8F637FF2270583806E355274FF2E49D12AF950DDA9588D2E58F689313935F1690E252617E37113E918A0F696E7DDD2A985383375A13A6767B5160E5DAA7637D02DB1C4EB990F59B6344FFFDD7D281E04D3E1B5E0F93B2B3CF128920B9D277934184D09B8361309691ABA7611D08321F59BC2DC47848680EA901EC9C36F1DB63AF2EF14126D45A380B6AFDC456DB491171E8A1EE5D0B4847E67374237878EACE0570CDCD777C8D8A6D74B966AB66AD4ECDF78F9128BCFD6FF35A480170215942DBE76280B0BA7AB97C2E438CC622717CA1D13DEDC974B211E1B05356E35B222EEA8C1F2B3A9444B88A1F66CDD4F2AC2F2BDBF9BC33F531997637B9BBB52B15E20A3EB9976A194583D70175A4CD4B0AA275BB37CF914795914606B0C700F17441427935B989E5E9B03742A213C46A9BD62E0346CAAA8209EBC5FDCD2B533B408C36447028518AA2EE6885AF3D2A08D777030C377B494A34CBD40B69C93313EBF54E3AE1FFD3D1A3212B4EBBF16A4A79A5558C9A15A3A545929B77DC6801FD96A6B720488CCBC37B65DDF8433D47D18E543C2FEC2DB6945475DBB348857195F981BFA4E81F6A6DAEA9D073564A5153A67D3525A5F5384C8C2DE53203E262BDA9E69B258FE80355339629FB7A39DFC87EF8A5074EEE6BD9DF9E89E861AE3ADD9577F3CD4B9D25C5B7D68833560A176F8A5AB80F54B3CB3F526BEB616D907F28968164DEE0F19887AF7439F2C677462FEEDB601A172B8FF4F5E0C9D6B2AA71DD03DD396123DF660AB8285449B4562D8A36BBE9CFACEEE19FE33905CDB96F57554649A53F2691384DC785F00CD4FE22E49DEAED729BA96965BB93709F4BAED184A72597DBC78C2D1476CA6D0E36FEC2F32D1DE7D2C9C6E78D0CDCEB70F8AD1D88B0CC040B613BDD3686C55C37D8892F28CC1016543E2600F3D69C9027E168EFBE7A4D61BD87BA89738A3844435226056F9BA05F59A320975EE877CAEF3F35A0188BA627AC3C6AA33C40886AFFE256D33CA2E5A30EAAAADA2D2A20770202A21E85B5F85BF126C776ABE2D9987BFE547868F6078A7916768A385B63BDED43627941563DC5F47E0B1C8FFCC35421C81BC4D977CDD861B7390ABAF337D0FD1B3FBF433277DE67F412941D4E68C2B71E6134C52B33F1566F7FE4B11544CB5B0CDC55C7D0FF62BEC9FF0EA2A1944B18B29205481905734545A9ECAF0B988C8F98A1F1F2D2A2938E81E7105E2559D46717C9A13ED56ED7FFE1D89853B3EC320A75980ABE56A3F553E10E40594CA351B386993A40612BA97A6AE392682070AC0D3A814613C24054B3F3CB6CBCAC8EB4C108E12344458F384B3FFD48C24F3A9536CC50A45B8389542A43725AEEE2CDEEDECC82BF70581887C63A42AFD101C231FE0556C2C3081DB4E5F3B97C457E5161EE909D9ACFD8A209FB1118B890892B5535867425F5D3C6945D0D739A09B08D74B4ACE6E56105B4B73D268CAA8C21C1F4F6A54F033F106D0FF4C9C90CD8C7C3ACFE78193047B2B080F2D7B665A2F6A09EC85518572649CA13EB82010587144D075C2E0C1BA8CCF318BB1A5F7BAE0A89A6F482AA8FBF8F88BA577A684F51379BBB0415B08F5773CBBE0029748B8E724590CC5DC11EF3E16593E2A8CA42362EC381A0FE2FA4C07677443F6C825F0E6793DE8F26922A2E4B32D129F2C376C4BE5EA12844F059E2FCB3F08D138AB46F1BF0151D6840A662FB7AEA0F6587ADBDF0AAAFF730C947F2C101353B7D74FDE2334697E4F42E6F89B84A7E7BECA2FB41B28F36EB4BB81DD7C8A4BC5BFEAC8C7A01F511C3DFBEEE8513FBCEC1EE296CF671B96E0C61DF1AB180328998E3187830E3105F60A50192369665CA7A685AB787EB62C37AE89B59E30299AF12D874A1B242B21C3E988C8B32CD9836F651B521C7B5E95CF87B5E03B914D1D801FFD770321C61493CE5FA19A948CBC0610192FDBE9F8F8')
-    const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
     const url = URL.createObjectURL(file);
     const link = document.createElement('a');
     link.href = url;
-    let na=setName(props.pageType)
-    link.setAttribute('download', props.moduleName+na+'.xlsx'); // 设置下载文件名
+    let na = setName(props.pageType)
+    link.setAttribute('download', props.moduleName + na + '.xlsx'); // 设置下载文件名
     document.body.appendChild(link);
     link.click();
   })
 }
 // 查询
-const handleQuery=()=>{
-  pageNo.value=1
-  pageSize.value=10
+const handleQuery = () => {
+  pageNo.value = 1
+  pageSize.value = 10
   getList()
   
 }
 /** 重置按钮操作 */
-const resetQuery=()=> {
-  selectItem.value={
-    code:'',
-    value:''
+const resetQuery = () => {
+  selectItem.value = {
+    code: '',
+    value: ''
   }
-  selectName.value=''
+  selectName.value = ''
   handleQuery();
 }
 
 // 保存
 let deleteRow = (rowData) => {
-  console.log(rowData,'...')
-  deleteitem(rowData.prjCode).then(res=>{
+  console.log(rowData, '...')
+  deleteitem(rowData.prjCode).then(res => {
     handleQuery()
-  },error=>{
+  }, error => {
     handleQuery()
   })
   
   
-  
   // // 前期资料移交-线路工程/变电工程/输变电工程时候需要重组数据（保存时候要重新弄成对象）
   // if(rowData.paramName.includes('前期资料移交')){
   //   let arr = (rowData.paramSetValueCopy).split(',')
@@ -490,7 +617,7 @@ let deleteRow = (rowData) => {
   
 }
 //reset
-const reset=()=>{
+const reset = () => {
   console.log('重置')
   getList()
 }
@@ -498,12 +625,12 @@ const reset=()=>{
 let getList = () => {
   loading.value = true
   recordList({
-    pageSize:pageSize.value,
-    pageNum:pageNo.value,
-  },{
+    pageSize: pageSize.value,
+    pageNum: pageNo.value,
+  }, {
     "prjCode": selectItem.value.code,
     "prjName": selectItem.value.value
-  }).then(res=>{
+  }).then(res => {
     console.log(res)
     loading.value = false
     tableData.value = res.rows
@@ -513,38 +640,44 @@ let getList = () => {
 }
 import {ElMessage} from "element-plus";
 import {historyList, uploadDrawing} from "../../../api/jj/gctzgl";
-let prjOptions=ref([])
-const getPrjListFun=()=>{
-  getPrjList().then(res=>{
+
+let prjOptions = ref([])
+const getPrjListFun = () => {
+  getPrjList().then(res => {
     prjOptions.value = res.data
   })
 }
-const getCmListFun=()=>{
-  console.log(selectItem.value,'条件')
+const getCmListFun = () => {
+  console.log(selectItem.value, '条件')
   // if(selectItem.value.name==''||!selectItem.value.name){
   //   return
   // }
-  getCmList({pageSize:pageSize.value,pageNum:pageNo.value,prjName:selectItem.value.code,prjId:selectItem.value.value}).then(res=>{
-    tableData.value =res.rows.map(item=>({...item,isEdit:true}))
-    total.value=res.total
+  getCmList({
+    pageSize: pageSize.value,
+    pageNum: pageNo.value,
+    prjName: selectItem.value.code,
+    prjId: selectItem.value.value
+  }).then(res => {
+    tableData.value = res.rows.map(item => ({...item, isEdit: true}))
+    total.value = res.total
   })
 }
-let selectOptions=ref([])
+let selectOptions = ref([])
 
-let selectItem=ref({
-  code:'',
-  value:''
+let selectItem = ref({
+  code: '',
+  value: ''
 })
-let selectItemUpload=ref({})
-const setSelectItem=(item)=>{
+let selectItemUpload = ref({})
+const setSelectItem = (item) => {
   console.log(item)
-  selectItem.value=JSON.parse(JSON.stringify(item))
-  selectName.value=item.value
+  selectItem.value = JSON.parse(JSON.stringify(item))
+  selectName.value = item.value
 }
-const setSelectItemUpload=(item)=>{
+const setSelectItemUpload = (item) => {
   console.log(item)
-  selectItemUpload.value=JSON.parse(JSON.stringify(item))
-  upLoadname.value=item.value
+  selectItemUpload.value = JSON.parse(JSON.stringify(item))
+  upLoadname.value = item.value
 }
 const upload = ref(null);
 const file = ref(null);
@@ -564,109 +697,112 @@ const beforeUpload = (fileObj) => {
   }
   return true;
 };
-let reDia=ref(0)
+let reDia = ref(0)
 const submitUpload = () => {
   if (!file.value) {
     alert('请选择一个文件');
     return;
   }
-  if(!selectItemUpload.value.code){
+  if (!selectItemUpload.value.code) {
     ElMessage.error('请选择一个工程')
     return;
   }
   const formData = new FormData();
   formData.append('file', file.value);
   formData.append('prjCode', selectItemUpload.value.code);
+  if (reDia.value == 1) {
+    formData.append('updateReason', updateReason.value);
+  }
   // 使用 fetch 发送请求
-  if(diaType.value==0){
-    if(reDia.value==1){
+  if (diaType.value == 0) {
+    if (reDia.value == 1) {
       reUploadDrawing(formData).then(response => response)
           .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
+            selectItemUpload.value = {
+              code: '',
+              value: ''
             }
-            upLoadname.value=''
+            upLoadname.value = ''
             console.log('Success:', data);
             // 清空文件输入框
             upload.value.clearFiles();
             ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
             handleQuery()
-            isOpenDialog.value=false
+            isOpenDialog.value = false
           })
-    }else if(reDia.value==0){
+    } else if (reDia.value == 0) {
       importCm(formData).then(response => response)
           .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
+            selectItemUpload.value = {
+              code: '',
+              value: ''
             }
-            upLoadname.value=''
+            upLoadname.value = ''
             console.log('Success:', data);
             // 清空文件输入框
             upload.value.clearFiles();
             ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
             handleQuery()
-            isOpenDialog.value=false
+            isOpenDialog.value = false
           })
     }
-   
     
-  }else {
-    if(reDia.value==1){
+    
+  } else {
+    if (reDia.value == 1) {
       reUploadBudgetDrawing(formData).then(response => response)
           .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
+            selectItemUpload.value = {
+              code: '',
+              value: ''
             }
-            upLoadname.value=''
+            upLoadname.value = ''
             console.log('Success:', data);
             // 清空文件输入框
             upload.value.clearFiles();
             ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
             handleQuery()
-            isOpenDialog.value=false
+            isOpenDialog.value = false
           })
-    }else {
+    } else {
       importCm1(formData).then(response => response)
           .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
+            selectItemUpload.value = {
+              code: '',
+              value: ''
             }
-            upLoadname.value=''
+            upLoadname.value = ''
             console.log('Success:', data);
             // 清空文件输入框
             upload.value.clearFiles();
             ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
             handleQuery()
-            isOpenDialog.value=false
+            isOpenDialog.value = false
           })
     }
     
-   
+    
   }
-
- 
+  
+  
 };
-onMounted(()=>{
+onMounted(() => {
   getPrjListFun()
   // handleQuery()
   // getList()
@@ -675,22 +811,23 @@ onMounted(()=>{
 })
 
 
-
 </script>
 <style scoped lang="less">
-.tableWrap{
+.tableWrap {
   padding: 20px;
 }
-.queryRef{
-  display: flex;
-  align-items: center;
+
+.queryRef {
+
 }
+
 .labelItem {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%; /* 设置高度为父容器的高度 */
 }
+
 .el-upload {
   display: inline-block;
 }
diff --git a/src/views/pages/jj/prjManTest.vue b/src/views/pages/jj/prjManTest.vue
new file mode 100644
index 0000000..d5af9df
--- /dev/null
+++ b/src/views/pages/jj/prjManTest.vue
@@ -0,0 +1,838 @@
+<template>
+  <div class="tableWrap">
+    <el-form class="queryRef" ref="queryRef"
+             label-width="140"
+             lable-position="left"
+             style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+             border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="selectName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItem(item)"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        
+        </el-col>
+        <el-col :span="5" :offset="1">
+          <el-form-item label="单位：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="unitName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+            
+            </el-input>
+          </el-form-item>
+        
+        </el-col>
+        <el-col :span="8">
+          
+          <el-form-item label="审批状态：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="preStatus"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+            
+            </el-input>
+          </el-form-item>
+        
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="预算计划上传时间：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planPreTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5" :offset="1">
+          <el-form-item label="图纸计划上传时间：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item class="labelItem">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <el-button type="success" @click="openDia(0)"    v-hasPermi="['tzsc']">图纸上传</el-button>
+            <el-button type="primary" @click="openDia(1)"    v-hasPermi="['sgtsc']">施工图预算上传</el-button>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+   
+    
+    
+    </el-form>
+    <el-dialog v-model="isOpenDialog" width="30vw" @close="closeDialog">
+      <div style="height: 300px">
+        <el-form style="position: relative;padding: 20px;
+                     box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+                     border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="upLoadname"
+                clearable
+                filterable
+                :disabled="diaDisabled"
+                placeholder="请输入名称"
+                style="width: 500px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItemUpload(item)"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="更新原因：" label-position="left" class="labelItem" v-show="reDia==1">
+            <el-input
+                v-model="updateReason"
+                clearable
+                filterable
+                placeholder="请输入名称"
+                style="width: 500px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="ei" style="display: flex;justify-content: flex-start">
+            <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
+            <div>
+              <el-upload
+                  ref="upload"
+                  action=""
+                  :auto-upload="false"
+                  :on-change="handleFileChange"
+                  :before-upload="beforeUpload"
+                  accept=".xls,.xlsx,.zip"
+                  :show-file-list="true"
+                  :limit="1"
+              >
+                <template #trigger>
+                  <el-button type="primary">选取文件</el-button>
+                </template>
+                <el-button style="transform: translateY(-1px)" type="primary" @click="submitUpload">上传</el-button>
+              </el-upload>
+            </div>
+            
+            <template #tip>
+              <div class="el-upload__tip text__red">
+                限制文件上传数量为1
+              </div>
+            </template>
+          </el-form-item>
+        
+        </el-form>
+      </div>
+    
+    </el-dialog>
+    <el-dialog v-model="isOpenTimeLine" width="30vw" @close="closeTimeLine">
+      <div style="height: 500px;overflow-y: auto;">
+        <el-timeline style="height:380px;">
+          <el-timeline-item
+              v-for="(activity, index) in tzLine"
+              :key="index"
+          >
+            更新时间：{{ activity.time }}
+            &nbsp;&nbsp;&nbsp;文件名：
+            <el-link @click="downloadFile(activity)" type="primary"
+                     style="border-bottom: 1px solid #0E9CFF">{{ activity.name }}
+            </el-link>
+            <span v-show="activity.upreason!=''&&activity.upreason!=null"><br><br>更新说明：{{ activity.upreason }}</span>
+            <br><br> 审批人：{{ activity.person }} &nbsp;&nbsp;&nbsp;审批状态：{{ activity.status }}
+            <span v-show="activity.approvereason!=''&&activity.approvereason!=null">  <br><br>审批说明：{{
+                activity.approvereason
+              }}</span>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    
+    </el-dialog>
+    <div style="padding: 20px;
+    box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+    overflow-x: auto;
+    border-radius: 6px;background-color: #fff;">
+      <el-table v-loading="loading" :data="tableData">
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template #default="scope">
+            <span>{{ (pageNo - 1) * pageSize + scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" width="220" align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
+        <el-table-column label="工程名称" width="280" align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="图纸类型" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="出图内容" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column label="图纸计划上传时间"    width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="上传时间"  width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="图纸名称" align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
+          <template #default="scope">
+            <el-link @click="downmloadFile(scope.row,0)" style="border-bottom: 1px solid #0E9CFF" type="primary">
+              {{ scope.row.drawingName }}
+            </el-link>
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="图纸审批状态"  width="220"  align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="预算计划上传时间"  width="220" align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="上传时间"  width="220"  align="center" prop="budgetDrawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="施工图预算"  width="220"  align="center" prop="budgetDrawingName" :show-overflow-tooltip="false">
+          <template #default="scope">
+            <el-link @click="downmloadFile(scope.row,1)" style="border-bottom: 1px solid #0E9CFF" type="primary">
+              {{ scope.row.budgetDrawingName }}
+            </el-link>
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="预算审批状态" align="center" prop="budgetDrawingApprovalStatus" :show-overflow-tooltip="false"
+                         width="120"/>
+        <el-table-column label="操作" align="center"
+                         width="400"
+                         fixed="right"
+                         :show-overflow-tooltip="false">
+          <template #default="scope">
+            <div style="display:flex;justify-content: center;">
+              <el-button
+                  type="primary"
+                  link
+                  v-show="scope.row.drawingName!=null&&scope.row.drawingApprovalStatus!='待审批'"
+                  @click="editFun(scope.row,0)"
+              >重新上传图纸
+              </el-button>
+              <el-button
+                  type="primary"
+                  link
+                  v-show="scope.row.budgetDrawingName!=null&&scope.row.budgetDrawingApprovalStatus!='待审批'"
+                  @click="editFun(scope.row,1)"
+              >重新上传施工图预算
+              </el-button>
+              <el-button
+                  type="primary"
+                  link
+                  v-show="!(scope.row.drawingUpdateTime!=null)"
+                  @click="editFun(scope.row,1)"
+              >上传图纸
+              </el-button>
+              <el-button
+                  type="primary"
+                  link
+                  v-show="!(scope.row.budgetDrawingUpdateTime!=null)"
+                  @click="editFun(scope.row,1)"
+              >上传施工图预算
+              </el-button>
+              <!--              <el-button-->
+              <!--                  type="primary"-->
+              <!--                  link-->
+              <!--                  @click="deleteRow(scope.row)"-->
+              <!--              >删除</el-button>-->
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getList"
+      />
+    </div>
+  
+  </div>
+</template>
+
+<script setup name="prjMan">
+import {
+  list as recordList, reUploadDrawing, reUploadBudgetDrawing,
+  prjInfoDrawingUploadList, getOne, prjInfoBudgetUploadList, prjInfoList as getPrjList,
+  uploadDrawing as importCm, uploadBudgetDrawing as importCm1, deleteInfo as deleteitem
+} from '@/api/jj/gctzgl'
+// import { getOne } from '@/api/pageB/environmental/index.js'
+// ,importCm,importCm1,deleteitem
+import {defineProps, onMounted, ref} from 'vue';
+
+const {proxy} = getCurrentInstance();
+
+const props = defineProps({
+  pageType: String,
+  moduleName: String,
+});
+//图纸线
+let tzLine = ref([])
+//施工图线
+let sgtLine = ref([])
+let rowData = ref({})
+const downloadFile = (pay) => {
+  console.log(pay, '555')
+  // console.log(row)
+  if (clickType.value == 0) {
+    getOne(pay.fileId).then(response => {
+      console.log(response)
+      const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+      const url = URL.createObjectURL(file);
+      const link = document.createElement('a');
+      link.href = url;
+      link.setAttribute('download', pay.name); // 设置下载文件名
+      document.body.appendChild(link);
+      link.click();
+    })
+  } else if (clickType.value == 1) {
+    getOne(pay.fileId).then(response => {
+      console.log(response)
+      const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+      const url = URL.createObjectURL(file);
+      const link = document.createElement('a');
+      link.href = url;
+      link.setAttribute('download', pay.name); // 设置下载文件名
+      document.body.appendChild(link);
+      link.click();
+    })
+    
+  } else {
+    ElMessage.error('点击错误')
+  }
+}
+let clickType = ref('')
+const downmloadFile = (row, num) => {
+  clickType.value = num
+  rowData.value = row
+  isOpenTimeLine.value = true
+  if (num == 0) {
+    historyList(
+        {
+          "prjCode": row.prjCode,
+          "drawingFileId": row.drawingFileId,
+        }
+    ).then(res => {
+      console.log(res)
+      tzLine.value = res.data.map(item => ({
+        time: item.drawingUpdateTime,
+        name: item.drawingName,
+        person: item.drawingUpdateUserName,
+        status: item.drawingApprovalStatus,
+        fileId: item.drawingFileId,
+        upreason: item.drawingApprovalUpdateReason,
+        approvereason: item.drawingApprovalReason,
+        
+      })).reverse()
+    })
+  } else {
+    historyList(
+        {
+          "prjCode": row.prjCode,
+          "budgetDrawingFileId": row.budgetDrawingFileId
+        }
+    ).then(res => {
+      console.log(res)
+      tzLine.value = res.data.map(item => ({
+        time: item.budgetDrawingUpdateTime,
+        name: item.budgetDrawingName,
+        person: item.budgetDrawingUpdateUserName,
+        status: item.budgetDrawingApprovalStatus,
+        fileId: item.budgetDrawingFileId,
+        upreason: item.budgetDrawingApprovalUpdateReason,
+        approvereason: item.budgetDrawingApprovalReason,
+      })).reverse()
+    })
+  }
+  //打开弹窗
+  
+  // console.log(row)
+  // if(pay==0){
+  //   getOne(row.drawingFileId).then(response=>{
+  //     console.log(response)
+  //     const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+  //     const url = URL.createObjectURL(file);
+  //     const link = document.createElement('a');
+  //     link.href = url;
+  //     link.setAttribute('download', row.drawingName); // 设置下载文件名
+  //     document.body.appendChild(link);
+  //     link.click();
+  //   })
+  // }else {
+  //   getOne(row.budgetDrawingFileId).then(response=>{
+  //     console.log(response)
+  //     const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+  //     const url = URL.createObjectURL(file);
+  //     const link = document.createElement('a');
+  //     link.href = url;
+  //     link.setAttribute('download',  row.budgetDrawingName); // 设置下载文件名
+  //     document.body.appendChild(link);
+  //     link.click();
+  //   })
+  //
+  // }
+}
+let diaType = ref(0)
+const openDia = (pay) => {
+  diaType.value = pay
+  if (diaType.value == 0) {
+    prjInfoDrawingUploadList().then(res => {
+      prjOptions.value = res.data
+      isOpenDialog.value = true
+    })
+  } else if (diaType.value == 1) {
+    prjInfoBudgetUploadList().then(res => {
+      prjOptions.value = res.data
+      isOpenDialog.value = true
+    })
+  }
+  
+}
+let loading = ref(false)
+let tableData = ref([])
+let total = ref(0)
+let pageNo = ref(1)
+let pageSize = ref(10)
+let selectName = ref('')
+let unitName = ref('')
+let planTime = ref([])
+let planPreTime = ref([])
+let preStatus = ref('')
+
+let upLoadname = ref('')
+let isOpenDialog = ref(false)
+let isOpenTimeLine = ref(false)
+const closeDialog = () => {
+  upLoadname.value = ''
+  diaDisabled.value = false
+  reDia.value = 0
+  selectItemUpload.value = {
+    value: '',
+    code: ''
+  }
+  updateReason.value = ''
+  console.log(upload.value, 'upload.value')
+  upload.value.clearFiles();
+  getPrjListFun()
+}
+const closeTimeLine = () => {
+  rowData.value = {}
+  clickType.value = ''
+}
+import {useRoute, useRouter} from 'vue-router'
+
+const router = useRouter()
+const route = useRoute()
+// 编辑
+let updateReason = ref('')
+let diaDisabled = ref(false)
+let editFun = (rowData, pay) => {
+  diaType.value = pay
+  reDia.value = 1
+  if (diaType.value == 0) {
+    prjInfoDrawingUploadList().then(res => {
+      prjOptions.value = res.data
+    })
+  } else if (diaType.value == 1) {
+    prjInfoBudgetUploadList().then(res => {
+      prjOptions.value = res.data
+    })
+  }
+  isOpenDialog.value = true
+  upLoadname.value = rowData.prjName
+  selectItemUpload.value.code = rowData.prjCode
+  diaDisabled.value = true
+}
+
+//导入数据
+const importData = () => {
+
+}
+const setName = (payload) => {
+  console.log(payload)
+  let result;
+  switch (payload) {
+    case '0':
+      result = '综合';
+      break
+    case '1':
+      result = '专业';
+      break
+    case '2':
+      result = '工程';
+      break
+  }
+  return result
+}
+//导出数据
+import {encrptfun, decrptfun} from "@/utils/request.js";
+
+const exportData = () => {
+  exportDataApi({
+    "pageType": props.pageType, //页面（0综合看板,1专业看板,2工程看板）
+    "moduleName": props.moduleName, //专业名称
+    "condition": name.value //模糊条件
+  }).then(response => {
+    let a = decrptfun('4D68D20BDF1B0450F54380FAD06C415EDCC5956564BE821C751C4C1CDAC402CBF8339A62210BA6BD111570721DE1F03B31374B225486ECB60B09FB0F61644D79B6B02132711FD489718EFEECF7C6357E71C72A8C4F15F91957431EA7ED938603E63BD151218D7613D54D2C161470E7037B5057FCF6DF09D2B8AE79AC4F5BCDD6CEA46D8B2657BF85A9EA9B90932DCD28357D6558F0D39744649D1D18A42E130D97323463060FF9C6591CC783AF86D09D454CB27852C84D8D6633D6BC4175AC47410652A259CA1D95F4C1DE71AB3CF0CCA0BF077082DBCC45A794F3BB162E9D116C2738A9B0932D5A51667050EAAEF64636EAC9170DF9AAADAB099294653A9982C082815DF02A4793F4ACBB8AE621A79363D296A28C618109B00527F8CFFB64A45131E03521AA8545AEA02028F912E94962F30AF1693053B1238A19409415DB955B7213B5395CDCA252A4D0FCB2AE15DBA1D0982CB8A00E8B8E64D5D2548C5AE2C903862585087D51C87D92B4B97E6459018420D7A19386AE7963B0C90B8331B0259872770B2F546AF9555795BF051A5622B89092104EB816AABF1E970ABF984DC6678FCBBF138A5C00FB10FD68CCFA80FFE9867C82703F25B9BF55AB4B339C320801D694E39300ADEF643F0D70E49AB164E676778041E80108C81844C9FB23F291D08E8BB9DAB673EA20DB68954BF731B22E51F17E60BEE4A64599A700249A944EFD1F5A1EE8A17288A4F80368FEBB3C4D887725A2A4FAD8446299FBBF9F013B37E78AD0A2E20AD4ADF513B2FF294ED1AC850E524423F5D77BD197D1159A68CFF3E9E071154C96B35DF11FF7C4EAF61D21C6E40A00E5A876878FBBE0BCB0DBE5591B72DD3C69EE0EFFA0CEF9B8410E2A3CC1C97E75AF98813FAA3B35D4A5E27DF322E7E73414AA6B78C8FC50DC07C6EC72D6C414DD2A0250C58059BD3C55F40229651D9DC9561800D486DF091AFACC7199646C98D1B263DD3C407EC31F429E00E368A4A7BECA429022BB2D2487B184B2DD6416A6BFD8256E5F7266A93A84A68BB587EA130DAD039FA9A38A889004C0312F5F8AD6BEE7DB35064D0BAB05E75E72AECC8A6502469CF9726C8FDD9A60E64ED77B56C5ECD31F169D23C8B4CC30AD70C5B58F23415BE64D4A5A32FB3EAFE6FD406CD1A4268B5C84717E0A0B286C21442DAED60476A1FA29B024EA6E2835EA7E39BA07A4FAB236A7499DBA6A191978F6680B05165363C281F808CECA343D848B3B8FE67BB3D1F7D35B50118432B3E8D946AEEDF48B16C50799F2AC1BA04443AF62BB50116CF5A8B4FF27F852C2E315E6D39891B26C3D549F4EEA471C488E0CB940ECF55497B181E9FD5899D384B1BC7E29A44B685441024CC58F72D6E852815BFB07448EEC2BBF15ECD22B6CEC0E7CDD4159267F5B19821D913E68539C88352D726AFBEAAF98F3BF26A1BD5A11113A78A26BC292932A8E99013F417FD42897379EA529A6B8CDD1BB04192C0F93670D2F59D012D7DF5D858138F6E74424BF7E76756144BFB85D79ED391CB9C22A2BCAF1D9E0A80A12039684A33A450B730F8B374CFB4C4EDE19179FF7B7C49139B571A82686FBCE595686CF9F5C1F1F7EA2785F64CDDC0124FBF96C95E0B05510E178959F6BE3F4BB8591E1F50BA30892E58CC2C731046C6EA55A31DBBE66D115BFEE4CB2A3D46BCF856FBE717B40BAEA3D4B4F3B527540B4DD672622CDEDE4A06F860FBA392769209507A7120247760DFCDA4C8DDE8238B749D8A3B2C52F9F1EC7B35186C4D9C5724677CB3C4F4BF507D0CF05407443B5A7EEC6508CE07108A703448EB3AC92043F0FF32448AE87DAFDDA8E6CBA4B26ED4E9F870CACCF11A2D18A416F36D3D969A258D9D33628D7CDFCF157151E9C7964987747F0CC1EB03B0CD99DCC4FD8D4065860CE8CC49387F8B5990061B36366212737294B2F624F364A0068D15828B9FE578E0760A0410ECF6BC70147B9AE6C9AE77174D006A5D8CC9D46D0FECC3F75BE6161A08B649A54E6EDB6993AEFE3B7BC6D299F5B54FF29F0DD8A2E1C2359D7A6CF1846B4D20FF4CE4491D8A34AC3F61F556FD722EF0605BF5ECCF8757C23E7DFF3B7DF2C72640D30F53E36F467FF9F284834EB417CB797F80749D79234283D79E1FA61014A2E35B43FFBC97C41A276A1E196CCDA7DD609EE8E7A9709BE819F60CAAC985427CB88361D66AD52B9E3DEBAAE46BC2F422F05E10257BBE36E6894B0B0261D7FE7DC0D17AF4B59AEAB09A244BC1DFD1DC89FD6BA0A938B8CFAD78875DA9AE11BF27A0D005E30C3F88573A6E549932A4B947FFB9C940EAE3D62D9994BF2072172668C51BB985077FFE649A6136A6E6AA66A79DFC5880C5885A87FF772106EB566F0B2A87AB214749C38EDD9E650A70AA92A06A3550FBD2B30F2DE2B8B925DDBB6057959BECF6A503C8721B8AC44AA87E2FD875050DD0CC6497628D83C84B49BE4EA32719F39CAF1071C2D9099A206771FFCD72740C1477EC12D5DB55387F9D5A0DA75E68767DA426621364E336CBDA97EE95343A520EA1FF6CAE2057627D4A66468BC4B71EDBF297C19114B1D50A025C9C555E31462C5B58D893B5438B5A25A52F7A5AAC8ED3636CF93A7A85212587F5E28F69B901D3149E16C9C90441613442358FA3E9581458894E86FB608E339076FAFD17FD40714762FF9F0AADA5E476CEEBAFC5C111A7B14D52938D0AE5DE2896C4267FBD36ADE5F25846E75BE958A5F41846AFA4B06002F4C49D0974BBAFAAB4478E7A25F63F09CA7BA4CF5223764EFD0FFC342E97D800A170271F5DA672B4A69A4A08FC6A7BA3F43A4E89D0F85311E00347EC5B87D76CB953E8487E362F15906290A3EC6E2D2F3FD67E0533E2E4ED5FCC93F27D54DC9A1296640308E37C64FED12C498357F01CE06EC5FE21AF6537DC6E890661B3B86B62D1948CD0A6A9D7F9C0028959B4C02774C0AE529D024BA24B3848504C096B6F4AD8C604433C0C8B4268E74AF3391AE1E1930F2BAE220B08CE16C418C88FC453EDDC7C59BFF6B64F74D57AFD60146BBBC293CD529035A80D11E5C53317A7925EE4AEE90FBDB01F7E0DF204AEA97FC0C0D29E0559A705F9B0FEFA900734DB542D2CF576C48ED2536D56F70B7D0C8FD4EA9BB8EE7097BDEC8866829406F52DA6863AE5995EE44C30AD4F7F62D401285088E27298E91FB2E723BC2A7A76B3AE33E6FDB0A6F88D9B1F84F4A1107EF87E735C3AC0137D3A5355D587D3D3F152E89F92756FF24828AF12AD1E219557D0442C1C5FEF94FB4472CF9B8A5BCBB1D2C095E7EFB4A40033C31C46E509376BCABAB30E6F4D5F3B9F6409975A043304224786EF710840F799FC986FB5A88BD267CD4FD3A3134681C3344502BEF495AE096F63AE30173CCE596448D79FD9599690124A2EF7C8E73C9962516EAA608665BC7F88EEC67D6C905BD010196F94398684F9A0CE16B0E2FB282ABB8D9D8B0E1558D8EE5D2D600CD1E9F7AF78FA0B14E04EDC5446EDBBF36EF55A6C5E79E84537D7B5AEC6BBA858797B75C46AFA8B7FD474199B51FB720DA807AF501FDBB9B614CADF698D3560F8656C734AFC1E27EC69CBE97AB8D2457FFABB26807B323A721FA473D3F67FD111D98F8BE8396658C64FDC68043A1577ED0B7A7FABBAB5315EC24BA5E2B370588B94E22BB6405B70BA93ADF9A09CE331D08237575ECED71BBAB3E962A8082E7BFAEE84CB274BDD05E3B39540DD35DAD7540DA2AA6E4AC06E81B38903E2870B76019D2E57F048F976E0E31B07887802E247A266C2C424B8DE93316B9628B80143F3F13706679ABF23A70164C0E8C96FC842518D6D3B0B66265F9F0353195BFE75162D978D6C52CD19EFDD92AE552A280B7BF6BC4D49902F9FD6FE7A86A56D4E70E8AE6076D177DA15CE4DF8780478C5C9D2F81221B6D3B757895CF76A5766038AFF2D8DE7845F614CF4328CA10B315A32AC8F36B78F2A946CAFA32DF75FA1341F36CD1C428DF95EA475529B132413B108CF8D423822B524F0DDE8A91DB165D8AC92E11451742742032F79E0C1451BFBE0E6EF99CDCC9907D343FAA532A28B4C32F2553BBEF41E7FFEFEA648A75399D01167EB42D17CC654D50125CCCB38F2844003DE7A6F9899A99807CB71ACEF5C9B19CDBDDF0E8A08C26B4EF137B677487CE68E4FB67ECE619585453E79B9B6D82D5F8EC9C69DC564C6C8B944459B7D06A3B2E9530B91994F86B7C4BC4AAE0F2A2E576E66C42D6C361068E90B62A59297C7D43B8368005E5EC15D3E83D101DA70EA1AA71E38639D5AB9CDE54EB6DB214B089F9461F4F856CA23A96B6E67EEAD663FD09EC8F4C0838706F2891941C8FFA60098EA951C9FC2421A311074C44EC86AC9F69D8D9C6B2AEDAAE4ADD0A6A761A8E27984A606DE57EEA6D052967B3422D54E9A990780B1CB141F61F2D30F34F1C4B9491EC06990A2CB9158F345AADB79B08914C9A93AA75D956355F1E25490A9E2B0B257815E51391F75F5C71276DFFF3FCC6A3FFA5A52F0391387EB198B188E60980097FC21F82ED1CB1EF82D486745408637E11D0031357FEC81F067543B9079044C1EDC6BEE51B805C1B4DD8B96A7140EFD9B462142988758BBC1D3BFCFC60053B0CC7BC0B560219B7A7CEE988DE28AEAA023CE33E5080E6FA5B2278C16DCCD5C29FF6C3D5371F96896604BAE127C2C928D8DC339722C6DC18F6ED6ED467256AFBE72FA7C6491CDE98E9D159F947BB03B00FB193C71010A400AAE0A48F2519E942DFD649CB67785F397DF38CCCFB0A59C040F92D3AF7AEB3B5CE2D905219591EB1B983B3A2CCAD7031E4A5B160E2460E5729E9AB1E78034F8FBD9894AF8ADB3C70913C6E100478AF393FA21A9CCEA78EED4886E072B6EC13EDA1023049A9148DF33156DB2C7A7BC9408CEEC5628A3268D7636F48AFC4EBF293F7A9CD7E68F2DDD30CC2834A658BF964C82238805B22C4357D9603A2BE6C9301298C6B61511B6FB9A3A6ED7E71AEDCDCEAA2DD7D3DFE8ABD4F4DAAA5F290608FA24C2BEC3224DB6C7492FE7AE76ACD86DE89E3C38D3D72F4E9719EDFD63551F1DB8A40683951E47074C10C369E7E58D81245348989C1D28EA113E2D5D85C4CADA076724F61E7F4F6ADDD64EF7BC3655E261705AB5A28E9479CF5F75B5CE68AEB6DC026A9A042AFF2936F516CF574B87D874CB6E0A1AE6117D9AA55C91173BA7C43B2731FBF2624162C6D90DF38CA1521198134B836A80C3CB6C161AA1752C69C6569E2DAE1B1FBC98CE6053E264E54C3B3CF1240EDA0A8EEAA05DE599423C9AE9AF4E1D166B00C2004EF0A8BBCD88CB9BBF46DB5059FD2FCB231A54B3F639666712E422E9AF5FF2B06C0FA2FC7CDFD1591B188CF2BE42EF8C3532C2CCFF783E3F3F6BC921BC576FD3A055AEA15ECE84FF3A3F494FDAFC9FDB81979E20D5DB07CB309CD6CE95D818F8F0F310D3EBB552095F7CFE125595BD1376C68B3BC8A25917F56F84F488C2D1F2091BD0E29C4ADF38E4EF1F78921C378C89AB4B026DC8E7287F494CC7F7958F819FEB0B2CECF374594A426980D903947A2E9EC44D6FFF78E201F12675415D5770BC0F94F8CFB8D07B00917BF5A7B23A91BA93E8CFD22476F02D35B01E050E9E59A8602D1079D52B32BDAABB8D67FF343AB04C66172ABE017B38675E5EEC1C1DD71B119A23E8EC127F0490D144808D15D385B30CA90A41290897472BD95403ACE0F4BB69FC5BE25F56B0EA307DAA9007F3E55EF1C19DCE9D63B7E0FC68920418B21D3E1461EC7E00EB0DC63ED4FC132EDC27ABB6F9084A599D995200A1D653C3DE1B9E6D687196C03DB69F9A38748299CDEFF41931612588FACA11D667ED7BB28BBC2EF906477EC36EABC1B05C7DA9F0777B725A57DEA774DCBEC27E598EA86B810E4655FE3302DC04A13DF6ED4BB02A6485A5EE014BE66B7097F2B21F224CDF02FE2BAA5FF032C4F2B990E5A7021D37FAF68DEC2D62AA51A91E6E796730E88EF12A0E61FADF26600509F4E6A382A7873C8F451D7AB7E3C949A964DF27C0D8DE9C13ED15FEBE9110C82A17A414A810CDD1EC5F89462AD7472A65A3F98D569F70D31413C73ACA5CF517408EE6BC70567F5BACA40C5747EB1700BD1DCFE5DD8360EC93AE4E54D91710C8D72843856B12879C135A2FD1F12C541238BE2E8EFD24F46074AD3BF7ECD6CA9C1C9BA00BE72483E6C8A983897BFD9B903E83F4FCC51D2F478DFBCA311A71747B495199B042144E5634BFC57A84ED72C5BF74330EE9DD397A213E33BAE388F4BF98D645384A9DAD5B6D2974895C92790110347F22EB7B991E6DC9D708F9EC0A9921D2CB62D174425FBDBDD55D21F491A3A6F2E2E33B9C2224D5E92ECB950E5BD4A7C036F2B59B35FF5D2FAA0EE1A7FDFA09C86E06085462DB4E5257E53A990FEEB65319B1653FCC031284DCEB55EFD50D245D8349EC0F1101195C47333AFF6D39CF475765A041D1DF9AD72086C1618AC1728DDE3BFBA3F005DD870999F8E70B398B7276CF7640F1BA3CDAC86D4204A0AF3C8D01240B690A29F7A28C331C1D039237D0E46F66BC35225CB3021A49101A39A3FDF830BFBFC4111707201E9998ED7F9DD7390C14E05A8786663A15D3B1D22FAEAA2DF851C10D73722AA0F435490B29ACB17AFDF649909310133413DAFCFD1D5ACC6D6782A73AA3CE466BAF6DBD84B07F09597F264874DCCEA84894A74CD0014E26826F03CB8F45FD95E0243FE803248B7E333840847D00D5C687A277707EE85D5581AA434014B9B45114CD31B4D223ECA0C95488F8909976F8A648816A0C2149CD57C674DEA94486D855F1034EE700FC8CF0D1EDDB7FFDD130FD910C396FB4BF56AED0D26F2204CF54DEBA84B11329B2DB2E0EBF98E446EFB2E5FD0E79CD19053DAE88108836E957B1DC6E12B29CA757DA866EFB66D7C2463002356A22BB591A123ACDC1F61346B3DC01EEA2B5A7E073CABF057505483011B929479CA5396C11C441107F8E436A29AB6648BB526D62D55EF97227B04A2A936204780C1B79B7273B0D40C037D261FB5621369BC8297304CF75E1DC9EC995BA7155BE2D6CE1C4AAC16172AE3236E5F0B3DA3F68A880874AAA5DEF0BB670EC820F65169691092430D75BDB7F955E02AB4438010E71004EB7F5642F6AAA6B90256FF54FF85CA39F409868E3CFA043AF5F957D31E01B0559A5F79BE66C08C838015D0FC25F7D8B20A963ED5F0A3807DD709EF4F65E6B8152FC961FB82F47927E5B6FA32E07DC341062FAB2608D516253BCE9FEE630C69E62E0636B8A2344DDF5A44D99BD1057900F4E7942EAB1B883175DF31A0A28FEB2BCCFD97646EB26F683A8E86BB5646A8EB7A33D36C942D5CA1A1E27835C232992D50FB5D90B8232A5A450BC23E302E0A49FA45A44CC6E3A50B6C47EE41201827E0DAF1B1D2060ACAF3506DE2ED9EE2884D85E7F18B0566B59E1A64E0AFAD7448A7CB735030CDF21CB829B4ECCB0B94EFC27D087E6D559C6B6865EED466FA795327C096A26932A83A8C409EDB6EE7D43F6F34C19EE596016B1998807617BEFAF0FA80FD5530104166A29D267583EC80C57D8905EF0F7F3D400ABDA47B054385F4D6C9D1030C68DE50707990C29EDE940F5B045E634278FC1FB20BCF4790FFA0109F90468719D9EECDDD340A6C85C8B47549B8EE3C30BFE5185F2B52EEFB30EB172BF6ADED53AF7A7A1104B15D2594DF3CD81EF9D4A06139DC45F7244AC0C3AE6B7D21897804DD7C4ADB716B2A8F0C888580B08D564D5C44E43D0E4509AD590E2C9825132B5424B8CB90798EF940DB34D842F0F88C663554EAA1E94DBF103EC275A732122A86D126360531870A7406F281635321810E07A661A89B00121C7F82DB532772E71A460A07C91E7492E45174CDAEA39BA3B34F90F5138DE37C0A1B49DE68439DF0C41DB02ECF2C252DAF1D08932DF91F497CA644FFD4385784D600E159CEC416996EC72DD90A8A7D71544C98583FB29837C0D2C1D58663B7F2E0F6C4F5912B8C4DF4B5A15E731DCF011A8AA625BBF7E5A49AAC09D16CF507925D507F824C4318C27556659D057C66587B91E92DA1AC6F7E5B15CDE4D8926F4E236DD5769BC545C6EEEB0C6F897E7C79CA4979F70C77C34F0D7093E0534A39E729BCB9A1B517820AF8A10CABD4B3040F946C7CDDF82F18AA2CACF6E07E881695671A50ADFF6C2CB3779A69909AEB1A6411E62B1E4977C61859ABBFE8739CF1D2B403D527B03240FE112AA62B878D36D8CD396FCA0E965752FB909F5B4A5C1EC71050173576078661E7F8AF843716494D970C43B9B2139F672C85B13390B988C317444B848DFCD660E1D4C0FCD5FB405593184F80B5D7395C67A41FD42CB6C48C19326BAF731D73AC18F10073F1DD75CDE4BAEF5AE9CE6FEE25ACE96A6E5B4D460659EBB5A6E6E80C40383CC8206BADB55B0B1176465B9A61A8BDBC47C4503253349566A08C3F086DCABBBE61FB6C1142631C4B15A49BC00F1A0E6551D33215BBCD0EE726E856F69C4CDFFEE1EF81C8A1F27166B853E149E35CB88EF40A8EBD6999C18DA1864B26FBE8D9699D48378FA04DADC1C052EE36AB11DED49569BF021EDD9DF9B836B63227528C5F39B99B5F28ACA8437A7E5A7394C36F2E75CB30EEEEF2DDA280F1084F428E92923BD8331685D418DAF9C542A8A9CCE374CA249381AAA385452FC1B8A705A80CDEBAD7767463E7A3A4799EE00165E68111F8B3FB038B4212F59A2E71E9B1D251DC9CDFEB25814D794699BCA343D13FC01824057DD21F09EF8DE4A09BBC1A97A9FBD5C52BFB193F59D08FF439E5E987CAC7A6BB185FA3116522A44994ADA5A79CA9E669AA4D12A59BAD1687C1A33B52F98DF24176BF56E76346086E214286EBFF057257AF292C0052DE6F3E16D18B031B9450D0D2C7E488BD080ADF089831EF728FCA77C3E751A1396B9CDAADC525A9B07E20C50F33CAFB98ED07CAE5446E374E8A1C0DF4FEBA0CD04E3F7AE4330F5E291B05B896211FA81D4A0D5795535B2F62C18C3EBCA8AE2907D8AFF6A84551640F606E4FDA3AFF396FA8351AB65263686D69FB7B6F9E4A3742B6C3FD5E7B885F302223D49586CD251A7B85C886CDF094CD9C7BA50E27ACD5654FAC9ECE52C0A50D75AC671AA5C08844417F2E5201678EA92A696D776EA23480D6F7E4A3D68F90C5A05D9C2B84038AD98B4063AC1748E2B475A710DF4D8C295610E2ACF617BF11E2247F984C88E5A4BC0B902FBDF9795461EBEBBB639BC637A2E228E70D45175D6EC0BEFFA4E9537BE9D4AC406F817109DA33F3159EB4B381C90B3D0F4EF0B92476059E702BBC3C693070079F5B079A8384E294F42D7B1F5B8920F534BD4D220BADC922555B7E0B172A454CED3EED487998BB81CA47FE9E4FB01B6B2B4A17D789395CCAC5A53DE1FAF96EB5C1B6E11014E22CC84A6C2D8E3E40299B98616A743FC227AA7990A709A9E97BCF4E5B966B7E439BFEF10EE19364D5D3451380BD7F0D974795824E45ABD1818F6C5A634B840851E8A7B5618C7B97790C1DF20952CE56994D6B2BC7CB9C308681159E5D1B999FE868D174BC79C1EEDD7223B90345D4C8B8430E7606E839FC32192D1B433510F9E861C892EF76639A5154B929B0E44089A03AE7F1C8F05C9992F2600B7778AFB6D2877B21AEA6C6CF9DDE784154D23F9E1102C567C9FB94CC7B0B750C3E9FD2E3F25E214FD8E876F9978A196A027DFEF1C419FC884934AB7567AA22A5B3D4EA4340A8179F3331EB68D2298AC63AB2E9A103B613DFF3A9E6464A8AC706D1D38389426F2EBC2CD3FF1C8593CC8D6671C0A61198C2A80FD08B8C64B45028EC395BF712E29E56B8ACD940C43A4FD8DD817C2C1A46781291B17713BEAA6AE298E2F5DE75E6B9731C16E1B8F9C7B3AE337D4125B31B4C132DE54FF92813C0147646A4B9F7DE2B3A7FBDDD095A641288A62C2C99F4E61230A920E2C1730015B8420EE853348DE8A743EE9E754F7764BCFAFAA4BA1B5D2BE099718E67E17F4621F7A18E5692E32F703F897B40FE5C2989054800454757137C95B26747348F709D5E980C56C03E442A55E97468D27FFF15A6E966BAD82B16FF243CE993D31297DD8C7EB019B42660F17D87D9D26C8F37DAD12BD255878E566363BDA3ADB8F867CE02D79436C73DFE333536F1A8C0BF66726FCC9A3724A016F0B7F4EF60BB6941AFCEC1B25CDE19733D3D39F8FC62C100E396841F0221DFF553167524FAE95C3E429B76C5B6667200283F3B91ECC76DE3228D99D80FCD9A57885823E01D452042D6B293279342DD0A4D432DA0C14DF6CE12B37F8B45B0A25C0CFDC09304739E49862134363F6D56BB212F3CF27DF65223AB8F09C62A298C9ACCF0E68F777EBFCA9292A445068FF0B263158FBB6CCE064F2C9124565BDC5F315F1F46DB76F7C822F95D20B0AA9C4F8243FBEE4E734A07E3CC46966D888D582928DB285C6C76A45E2AC39734F4118261603AAE4C67F83106DB23BCEAF48D09138596C2ED2867625A6ABF3F417B89E91EA6B26BB6A82804DD821630D2438065E28803B6AE1ED73791953F78985C1DD8501824E57565D720441A620414B88EF251EE2AB97A6D0616337CF2E7A14297E476CD30764CB6EF45FAE08A53077882AC7B503CB25E6E6E40EBA07AC136A6A0CEC8A3044A41A83F031DA3DF65D24E2374C81DA186D80431CA5B93D0404A90E2B41689542362B84BDEF132A1EA2371E32BA7F43F5FB8B1749606A5838E9A6729DD17612FC58634618BBCFD460F2984DB41794D42B9CFC3F7F4CBDB232CD78B2C2EFE7EAB682B48C99C6B9AE6827426BE47D64F9AEBF53B85E096B5661062A03A27726659B03CDB0470238A683CE348804B5E2AF11B527852CF78577417B188C9F94259305190AD0D4C21578213C9E53DBB6853B9718DE0C2B9B3959BA36CE1720568648FDBE6215091B6A929DA02B30CF10C41649ACFAC4930286C4D18BA0B1CC9C815D75B89F8F645FEBAA06AC2F8509E06587EDAB06CF8C6A4CED6991778AF27DDB9A20413D6CD56BC9B5A90B1D42B39320879F7A97BB9E5DACF5AE78A60DD675E611C04D19615138820343742C1F17F8E892B85883BD6AC170C2796DA2D5339E89F51C62E4FDB612070A1C8BEAD63A7C64FC34AC63462A0B366F5903DC0644E72130C1A41D118E18B9FFF42BE25752A1A42DA5E6F27F2CA51C21B6611108FDCA8D3F0A24738E3FE5B1DFE54719AED3AA18A3A05C7C644EFAEA0EE8965727540CDA8056EFDA17AE85BCA61347E2CA6971A124EFCF054846B93C6AE054537D487EE8A8F068F665692062BAF2E2399AC349E0227D2BEE044D28703445B9E14CAC47C7A01BC17F3AF8FA2F4FD824335630C3DFDF4C54EECAC0392B8A9FCE3E347C549C91D8B8448FF2BEA290962AF817FDED82890FD5AC86E5821E661190EDCD786A76CC47495FA57B9E83B7A99E20CFC1099D78D30EACA913BF2E2CFF05D689E6572C9492AB15FA4DDB977B6359A097E770AA7017223B86E4E755D3B0B2339403BDCAA3667F0CF4C6EDF5FBBB0C22B27E207CE6328198038811D50B99F48AC283C3FB34ECAFB82CC0668084947522788DC5590F1BA6805FB366174ABB10A6087F9B931175454EFE2C0F809BBB296D40364D75E2508A3258AF6F76321277020E19606E6D8AB486DE857BB781F34D9F6ECD19CFD6B4248EF8CCB1885970A9E6439CFD7C3C5B5EF559A1AF3D7993551EF311A31E41919C6D8BF4B2048656AA4DD7250368DB4763909A3A055E1C2862D767D37BE18E2E276A851064F7EF15F0BDE1F966DC8A2115C823D3C2251AA42EDDCCEB6686104FB5DF27E5BEABEA73F68A01A47C220F9C3B75ECCD67E6C7234E93351C43D774E74329CBDA7E7E461EB286B1EE2CD2A1AFC8FC1C14455308428BBCCA9A92826D9309BFD8C38B48801E19E4B9D0B0291507F3CAE332400D5B740C7CC39B7225F882CF3453A6A868FF65827C8686C601009E70D821C4EFB308B885047BD849A21B223B1D8FF63EEE4C4671D412867F8CB168ED02DBC6467B94005479F0C3895D73647F221B9B5A749246F64D571D6E2652A23D615DBACCC9CE11020C7BACB997F3F65B16AF6ADC93837644F40605E676EDD1FF1FF8425EADC03E8414CFA213C5048440C7730BD3BF1F315710D4A78C231BD4A09CC5E0A0871F822B9789AFF120EEDEA20F106B0C2907036AF8AF747BF02875BD226B03C54D2E558F6FFBDDCDB43CAE0CBC1435ED98CCAE3F8AE7BBE80CF1A18723535378293364EAB271B8F44F0285278507765E1A8F094A9E092B9C2076B54937E01E488E8192D41E14F7CBF9310F2269FE87DE8D51065A47F237D61B2893A1408CB5F3D749ADFA7AE88A82BE9B65CCC860C6FEAD928A2AF4EBAD7278AC2430DB74C0EB3D277AD36B926D08B43BD299F3B9018EDD20E7AAD040676AFDCA22B4DAFDF9989F20E3D34AB2C33AE9C34CA016292E6E7D084F120DC63D266AC33842E467B39193CCE6E58E28EE308730B64A38B72C407002E69D6B6D51226633F22D6352E75E52EB2A7695F7AB101A239B0E7F399577C63969789CFA3ABE725159BCAC650889131F575514F74B74A27D474AF400757BA8B6F07DA3E6E5B2588CDF65DD798ABD494D433085D1A27B077C5A3FAFEBB7B9E430D5EED99AAC3B27E82B65E1B6509A7ACF24F90E47A02F0C0A19D58FDE67FFFB873C3E687EE394F16225365D41D6DE71B3E23067D6F6E4E2520A4B874134A7B8B6C77567DC56C5EB6FA636BE2739784288FC9F8FA664B45D39A2648A0E27BADEB050E7424F04A5A892CBBDCD73F77BB325629582298E21D7DBCAC59A487C5500914C6F641B3460F211E01E59A6A598F27E87A759B7DE42FE911DD2CE6C84E0AE605803667F2748DF3AA245A50E8DDFCA477A99057779709EFB6E9BD9EE90492EE4AB935CC29BA1B62CB5ED6026E244CE0A349F85D62F657DE4D1508CA4602FCA8BD062B5A8526DA2D998ED9637BBD447ED89BC911CCC9322337B9A8E99FECCECE5268B954E08C273DE0AAB32D90F3817075A4E3417CBEAAB15369B6362824A61FB562BBF62CD03D07701B81A422B98772ADC2CB73196898B4DF0AE15DD1505C91B140A9629F95560F8C7611062DCACDE6DFE88DCB93E396B7FE0913D5EA52AE84A6CD2E8448FC1F0C6C915A4595B0AFF5186516C673DD7531A33E15F516A375AFCDA4F70270808FE3E816BA206E00A4298E85380E1B544BBD8C18CFB23A440B9CE09F21B6637F9B39AAF661EF4AD55DC070F696A010B3C71B7885AC3ACDB206475B75EBF35E03F0EB9AC5E8BA897BE5E233DAA6905C641D6A33390B1E39D23B476E9B48EEC28D6C3D1A2C20EF56F0B20115951C8EC2501DA002D401E472D990ECFD15B5FF67A61FE728E1ECE529B946EC5710E4CAE831A838341D24007ED85B3D6C16B6CE027E51900A7430BC7F2B1A210D36C67C36EE4EFE73AE410322C55626D361A266FEFE7C26B8A8E8CD3D44FB9630161C91F07C5CA6326B1E8EEFD1FCFACF08EF9506BC1B049CEE6D7B464A30838A5A7C96D2D781A0804F7634467CAFB1A35CC26026BEB5BCCF761930A2721CE3365D3F26875ADA776A89D9E4F6B4CC5A34E2351D6BF90B8E4DAB2480262A33368885A68830E769974971ED57ED4CC4E6D7E2098C19091327F96390295F7ADF2BDFA9A19026BEC8B4B570DDC260D3CE917CBD7BD5BC04E0014D39FCC2BB3C0051CD86CE9CA879AA1B9E2779D66642A3D469A94C1B576C80E4CB1166F56893600EB5F22879033F0E19518D697764E50A8A3464E7F33CAA0D29867D5F5EFD9A2C246E467BDA0829CC06640FB3474B56A49E2266920BB19B37A436C9420DB452DC9AD49C729643827069FD367837AD64160E3580349F174E1FA100E8382992E43804202237986AB29AEE20D852A0EC9917590CCBEE32CD6E1A21F7FF6FE54CC3AEDD921669A01007F936297A80B9F034CBAA6CE1AD1893FE99D82CE0FE81B1059D186866A222CC32A4AA4FD14ABB2F3E19509DD253E9E105C9EEFB1C83952D01941D1755FF2B84CE18BA616535265BBCA3A3A3D8D531C144C29BCB6FC2C3C2F34C1D3F1C3801538AF4C654F8FCD7AC362D3195DFA40E170F7AFC2762F894C2D5CBF6FD1CE81703615CB4E20A965149495674A07753C494C89576FCA08C85BDE9C9EE32F0DF8CFFA5EE72945262E3358C68B7A3E2920E9645069AA6307F06E7358AB615DD516914E34D75038680C30BE8D27E5663F835747E7A342EF6AA2E6EB2822A2CD7A465ED370EF95602C5A6429F74C5CF4969C1075518B04D65C33EB7BCB9F58FBA89165F5DF85E66FC72C2D694B9EF2D965D452DAC19F694BC7A2BF7BD09D2FDBD43BBAC58FCC4AFA0CA1785A3BF6C4716A90C4153F8639B637371198CD93D7F265E4B5A4E3D43D0C630C6B7C8434621D3359AF81D4644B4C8C5A73A1AE8CDD938CB392A92D00FD6BA688B6D97FC8F7F4241288DA8AB6B6FC2C7CA6BF7ABEA1FEE6B9E4C87223C170A802569B57E95ED2ECC857759AE15ECE93D81AA43A08CF9A3D8FB81C022C84A2BEAA85E1E98094FB9635DD725A036EC6784AA65CF0B62428308F610BB56B6C4DFE7F8C9E67CDCF26977850A24DDBCDA4316EA1ABF3072606E42366ACB3F60B0BBAF56134AF3F4FA53DD27936F11FDF56A4ED80ECB2DB9C6A8F3417A7F1E4109A5FA40D0FBB0320D767793DAAD7793C12D9606A8B4D658E8A00C2668D45AE9939D12521557BDDEB9FE8E077221B612CC9757FB1E9BB17792A50BFB281E660BDFB388D888B009CB49ACB3F1F4A3CACB84106EBE3F124E8AA40EA901CDAC4EB6D6F3B8B6B91EC142519084B4F18A0EC5339FACE3917805BE06F7EE32536AE658E38B87982ED44E51CBF1365E87B1AC2505CB98D76A7ACCA5B9A3899D52CB73567D0092D94DB781FB8E0541F68BEA364AB912A36632B72FC64F92B892C59BEB8EC518566513E5654F12DBC8C2DEF74A25E73404B38EAAAC0894BA5A4264F6675589399446D99BC4B103F2C59A2EEF22242FC4155735B4E98094C5322784EDB65B9EE686A6C6FA4AC65EE821A4B1C2A80C60A78365E0B8DF055B09669A45E27B6D484ADDF597A95D5DE4FFC5A552FF52CB081C2CA3F3C72304B39E507E6ED0EA15CCC66DE3695D480348B57969FDCE78CD712BD22E20A8F751DEB38138633A021E490C415DA0B8CB8D0E3CC127CF85DC5834B95764730BF9044889AD174E155ECE3562938E95E4D085851AA92F8876839232012C6035B8D5D2570838E3BD33CCA48C42FC914835CE5689E7B2534820F30FA999DB317BC579144B04FD8164C6FE3BB35CD733438FAC717321A3865DE6C55C0ECC37201657B2667AAF2D9A2E7A3442E3361BEB22F0ADC8A8E56C44CEB1557D599B97AF5B1743508B58C68580A4ADC32956168F99BFEB16570937633EEF8AEB0F0DC20BB5F1F5DE6567A4D7C40A13DC60E8800EE3473D4F59644538B9F6D238002AF6B409ECBEC14919F29AF6DCBAAA2CF29E08D3419D2EBD3EE859AB5533E31B9FD30CC8982E711220887AA49C1C061E0718B5F601407BF42919605EFDEB71633C040FF3A94BBD87294D462DB8D2042F4575D12B5354A03318ACD50884C1F50333619E9521F7E1DD772492BCB42DA8292A8997E58EFA53121306E62DD6E32A51629BB88070CB14EEAB0CCEC4D77FF5C702AD7E7BE0A71E611EF8ABAC93E66E25E7DC1A5B37D30A4628F21BE2B025982B15100AAF6FBBAD8D56F43B6517B7D114BD877A25BFE369C5990D71B8CB15F89ED007243BD9A8B53847AE9443606B2F1F86D63E5FB03CC3ECDEA4E9EF66E59185A0E15471FC35BE7680399F061AB2DC29415E69D0724AC2BA26271C8E1612CE750429767E3261CB56C99877B53603036A458854A2D58C48D016BD71F12AAD9E9AD54AC454A8AF76AF1A769834A298648E8EC2EE31CA9DB40C04B5AD7191AC299EDD6266AAAE12CF93997A0C3C288E1893EE7472EB5E11350A6920E64E00CCC3AC124C72C38A9C76C13F812DBF45B2DFAF44211BBAB5283D015AB612EC7AEFEB2FA9881F14DAD6414838E214F5B630E424C481D20733E2A5E44C2B1AA86D9757B94FE7EF92BB4C297C9775CA3707FA390D67995611C6F45D02AD0C6B740824A66BB1F0B3F71E789CD62B2C6510D11883D002A44349BB42C6DA876836CC1E81698746581E4F1EF79A8B8205B2BD031E78C95A3191DF3850A08021D44DF735A2E5CA80DD06724280F63C236B9DE21F0CA2A4AEAD3D94B7CDE34592A78E04B63BC4A34517322C1A88B3EA135E18AEC0BA73491E3C6270299F4B86BCFB98DC679FFB7707B59A53BF8090C3FBB9B4E98919851805BE4B60C8882B9EC6DB8395ED21C9B33502FED9ED85FF8D67FC055CA2F00D086E7549BC4FD4A8DF9DFBDD1402C387AF547525559CAE496D00D09A98E60262B3484BC5F79465603E194061D39981C3DFA15D7D41BE75A8C859CA11C0CF1ABAF0FA5FF664DD7367D5D335D7725A7B3E7B6295687A7B4D5607B665332AC1D482991117A5751A3CD3ACEAF997D35CDED2E8385239B47477977C2FD189211F58442016F2628E519DFE1AD9105B2A0A7A61393CCD631EA2C1568A0BEE910A455D2E2C93F8BACFE79039037A4EF831578C1CA17624056E5A5872CA1EEB41E774807AE6BE349195FE786FC572D17DB543F78FEAA27F9AA6417F30D0403E75A38582D0381851ACF14CEE87A2AAA0831D6DA94F334934D5A7B562AC4475DB15C7FC72A20D8EBD8C372DBB5CC8A3E52A50C3AF6CDFB074A0D32F1CBB594AD31476AA768E0AF4D2EB10B04468FCB2B759DA9A82CE06FC642C423F2CFBF2B041FCBC2186C0EF271303A5984241EA904F6A52F27E7A0A4114317A43963C4A4572595D69A26B76C8786AE5D0C0ADAEA3A6EC762FEDCF48D54DE21FE417980F42AD859384465A3257E29A99F07F6612EFF17428F429DB9AC5CC8000A2E6629652FF57B24271333A8C55783F58A4923EC6375600FF66426CAF5CEE4566261EC769D3B86D9024C3697F1629354B5E2D25CFAEC03DAEBC86A2F079B7D81DEF1372C722A7BB99DAFB87E2DF10D4B282335FA3E0FF4B2966CE5F1A86631F6146B609CBD9CBE2BADB48AB1B3BE6B10AED85C0EA8D9CD81001C828547C0404F6C69C9B92045CC31F41A75E791C93D78803C79A9D1E66EE8B22AD78489592F5F9495F7354BEB9F21963EB52D73C7CD63B777FC358197CD1BECFF1B83A90584F2A092199B05109FE6D3B7507031F94293F276A0EBE6AB3656F00EBAFDE1E61ACA8ED6A22C21FCE72415D002460133B75C851AA4506906EA86A40E943A573D2381F26C7DE11C38B93B93E34A94E06A7928B81CD832B7501E1CF248C56D9FB22955AA401204B608B07101D1439C4C7EC8FABB528E74BA66FDD5518FB6D07383F7ACECF66EE7F798E4AE8DC341D011CB7F619465ED8909AD327BC4BE2CFD8B0168F146EF4A1F7002CBA22C3C72874EEA04FEF191B8DB802196D0E0BB08A1879955C5BD2EF9084CAE7F98CB7CAFF27FA3F8C94F64601FDAB37260B9743930919E50EDCB377B7CA32B6320DA194535FB9F269B72BBDE2CB028968DD5FE601EB238E5CB9C9ABAAF1DED912E69D16EE2E863761E1006B59561794CEDF57B1AD611AF4D12410E10473011ED9E1D683FA01A165ACBA9A56705C02A221ADA06F30A2783DCA265AD4350D901DED18195556A566B81760CFD8C430AE6F9CF367EC0A9CD93966F9A7688A5321540460B27895858D43242729244E67AE8C5C7A2345EB75818EBCA1E6B1B15F599D153EDA2E0BFBA3807F2012EDF8D6057BD532AD8AB012C29E93BF24B4D2192B7378245B26EA20118E700ACA1335E567B3A920E108E10D5423DD581A412D0CCC6C97C66FB44271573CEC815217BAE15FE7250664EEB1B93CF2ECEADB9D62ED162DEAD8B1DEBFEC66345D6F38AEF40EDEFAB376C3AEEB57B76D88B1790C204990503B6EB32C0DF6EDDA5AF6918FCE310FDB177E9C3642849D4A325A2F83754A8F24BD250D24C9D78FF29582654DD29B618BAF17A7035E22AED4A363EDEB24C246A576E1DD4E5EA547565AD71106A349E461457DA2DFD497AFFF213DE51157C48CE1BE3CCBF0395BD0F86F8FA7FB21C1FD8085DA63DB9C14A18AF094F48559C35283CB241E4A8CF41A280B5D888330605A03284EA74DEF6B907F235926F085FC0EFF8CE3D34C1C9E67F001883F63EA215F0514AA893AD8667BEC4B3BB6A46D3EC85EE0832CC29EB1E4F429BF20E79F2A982DC83B34251CD685F995FE1FEE57C1497C6C570E35C859C1A7AB2CEE71AB3A96B86ED25FF34202FBD731E41E1B644601FEB84E992124AFC70A8EA1CD3A76E800D19E4F8E1E1D5F02384905EB0FFA0B1C062B754EDB5F1E84CADB538FB115A84F9294A76313FBC3F96579783735F4966A1C207B9938E30B4304757D7ADB4B339FDC387DB88B18C6700CF31ABF62A942AACCEB6585BB4ED5A439339F4FBEC74A0B72C40202BA0083EFE2A1F338D310B6450375A0D650E9943580082742A353D7B0A8D4989A4549EDB76355D28373403668759FB0D692780997D2A6CDC9596B8E7BAD6765951427F72D217F5171FD378F74E06F70A5BA31DF2964F47E4CE4622590052E4399F2F455B00E8E4FD91C9EF270AA3ED2D9A68BD70017D5E9C7B771CEC259900DC531A76BA18CB7B6BF976F369C9BDE51AEC7DE1D114B89CBA10AD57CB868036C600DBC1B3CD3CD22B8D86BC32E5362F7A0200B9338836FEEE893685D5E03A4EC412F3ACBBBE0A0D8746C1FAB02B04056C74F11A807EBFD92894FE80497A630FD3CD48C8FD51FFFF274E55C43E72BE69B29B39FCA7B9BB708F7242EEF2C8F637FF2270583806E355274FF2E49D12AF950DDA9588D2E58F689313935F1690E252617E37113E918A0F696E7DDD2A985383375A13A6767B5160E5DAA7637D02DB1C4EB990F59B6344FFFDD7D281E04D3E1B5E0F93B2B3CF128920B9D277934184D09B8361309691ABA7611D08321F59BC2DC47848680EA901EC9C36F1DB63AF2EF14126D45A380B6AFDC456DB491171E8A1EE5D0B4847E67374237878EACE0570CDCD777C8D8A6D74B966AB66AD4ECDF78F9128BCFD6FF35A480170215942DBE76280B0BA7AB97C2E438CC622717CA1D13DEDC974B211E1B05356E35B222EEA8C1F2B3A9444B88A1F66CDD4F2AC2F2BDBF9BC33F531997637B9BBB52B15E20A3EB9976A194583D70175A4CD4B0AA275BB37CF914795914606B0C700F17441427935B989E5E9B03742A213C46A9BD62E0346CAAA8209EBC5FDCD2B533B408C36447028518AA2EE6885AF3D2A08D777030C377B494A34CBD40B69C93313EBF54E3AE1FFD3D1A3212B4EBBF16A4A79A5558C9A15A3A545929B77DC6801FD96A6B720488CCBC37B65DDF8433D47D18E543C2FEC2DB6945475DBB348857195F981BFA4E81F6A6DAEA9D073564A5153A67D3525A5F5384C8C2DE53203E262BDA9E69B258FE80355339629FB7A39DFC87EF8A5074EEE6BD9DF9E89E861AE3ADD9577F3CD4B9D25C5B7D68833560A176F8A5AB80F54B3CB3F526BEB616D907F28968164DEE0F19887AF7439F2C677462FEEDB601A172B8FF4F5E0C9D6B2AA71DD03DD396123DF660AB8285449B4562D8A36BBE9CFACEEE19FE33905CDB96F57554649A53F2691384DC785F00CD4FE22E49DEAED729BA96965BB93709F4BAED184A72597DBC78C2D1476CA6D0E36FEC2F32D1DE7D2C9C6E78D0CDCEB70F8AD1D88B0CC040B613BDD3686C55C37D8892F28CC1016543E2600F3D69C9027E168EFBE7A4D61BD87BA89738A3844435226056F9BA05F59A320975EE877CAEF3F35A0188BA627AC3C6AA33C40886AFFE256D33CA2E5A30EAAAADA2D2A20770202A21E85B5F85BF126C776ABE2D9987BFE547868F6078A7916768A385B63BDED43627941563DC5F47E0B1C8FFCC35421C81BC4D977CDD861B7390ABAF337D0FD1B3FBF433277DE67F412941D4E68C2B71E6134C52B33F1566F7FE4B11544CB5B0CDC55C7D0FF62BEC9FF0EA2A1944B18B29205481905734545A9ECAF0B988C8F98A1F1F2D2A2938E81E7105E2559D46717C9A13ED56ED7FFE1D89853B3EC320A75980ABE56A3F553E10E40594CA351B386993A40612BA97A6AE392682070AC0D3A814613C24054B3F3CB6CBCAC8EB4C108E12344458F384B3FFD48C24F3A9536CC50A45B8389542A43725AEEE2CDEEDECC82BF70581887C63A42AFD101C231FE0556C2C3081DB4E5F3B97C457E5161EE909D9ACFD8A209FB1118B890892B5535867425F5D3C6945D0D739A09B08D74B4ACE6E56105B4B73D268CAA8C21C1F4F6A54F033F106D0FF4C9C90CD8C7C3ACFE78193047B2B080F2D7B665A2F6A09EC85518572649CA13EB82010587144D075C2E0C1BA8CCF318BB1A5F7BAE0A89A6F482AA8FBF8F88BA577A684F51379BBB0415B08F5773CBBE0029748B8E724590CC5DC11EF3E16593E2A8CA42362EC381A0FE2FA4C07677443F6C825F0E6793DE8F26922A2E4B32D129F2C376C4BE5EA12844F059E2FCB3F08D138AB46F1BF0151D6840A662FB7AEA0F6587ADBDF0AAAFF730C947F2C101353B7D74FDE2334697E4F42E6F89B84A7E7BECA2FB41B28F36EB4BB81DD7C8A4BC5BFEAC8C7A01F511C3DFBEEE8513FBCEC1EE296CF671B96E0C61DF1AB180328998E3187830E3105F60A50192369665CA7A685AB787EB62C37AE89B59E30299AF12D874A1B242B21C3E988C8B32CD9836F651B521C7B5E95CF87B5E03B914D1D801FFD770321C61493CE5FA19A948CBC0610192FDBE9F8F8')
+    const file = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+    const url = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = url;
+    let na = setName(props.pageType)
+    link.setAttribute('download', props.moduleName + na + '.xlsx'); // 设置下载文件名
+    document.body.appendChild(link);
+    link.click();
+  })
+}
+// 查询
+const handleQuery = () => {
+  pageNo.value = 1
+  pageSize.value = 10
+  getList()
+  
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  selectItem.value = {
+    code: '',
+    value: ''
+  }
+  selectName.value = ''
+  handleQuery();
+}
+
+// 保存
+let deleteRow = (rowData) => {
+  console.log(rowData, '...')
+  deleteitem(rowData.prjCode).then(res => {
+    handleQuery()
+  }, error => {
+    handleQuery()
+  })
+  
+  
+  // // 前期资料移交-线路工程/变电工程/输变电工程时候需要重组数据（保存时候要重新弄成对象）
+  // if(rowData.paramName.includes('前期资料移交')){
+  //   let arr = (rowData.paramSetValueCopy).split(',')
+  //   // 根据数组长度判断是否是数组对象
+  //   if(arr.length>3){
+  //     // 是数组
+  //     var result = [];
+  //     for(var i=0;i<arr.length;i+=3){
+  //       result.push(arr.slice(i,i+3));
+  //     }
+  //     let newArr = result.map(ele=>{
+  //       return {
+  //         sj: ele[0],
+  //         jh: ele[1],
+  //         zjmc: ele[2]
+  //       }
+  //     })
+  //     rowData.paramSetValue = JSON.stringify(newArr)
+  //   }else{
+  //     // 否则就一个对象
+  //     let obj = {
+  //       zjmc: arr[0]?arr[0]:'',
+  //       jh: arr[1]?arr[1]:'',
+  //       sj: arr[2]?arr[2]:'',
+  //     }
+  //     rowData.paramSetValue = JSON.stringify(obj)
+  //   }
+  //
+  // }else{
+  //   // 正常数据
+  //   rowData.paramSetValue = rowData.paramSetValueCopy
+  // }
+  // rowData.isOpen = rowData.isOpenCopy == true?1:0
+  // rowData.isEdit = true
+  
+}
+//reset
+const reset = () => {
+  console.log('重置')
+  getList()
+}
+// 获取列表数据
+let getList = () => {
+  loading.value = true
+  recordList({
+    pageSize: pageSize.value,
+    pageNum: pageNo.value,
+  }, {
+    "prjCode": selectItem.value.code,
+    "prjName": selectItem.value.value
+  }).then(res => {
+    console.log(res)
+    loading.value = false
+    tableData.value = res.rows
+    total.value = res.total
+    // pageNo.value = res.data.current
+  })
+}
+import {ElMessage} from "element-plus";
+import {historyList, uploadDrawing} from "../../../api/jj/gctzgl";
+
+let prjOptions = ref([])
+const getPrjListFun = () => {
+  getPrjList().then(res => {
+    prjOptions.value = res.data
+  })
+}
+const getCmListFun = () => {
+  console.log(selectItem.value, '条件')
+  // if(selectItem.value.name==''||!selectItem.value.name){
+  //   return
+  // }
+  getCmList({
+    pageSize: pageSize.value,
+    pageNum: pageNo.value,
+    prjName: selectItem.value.code,
+    prjId: selectItem.value.value
+  }).then(res => {
+    tableData.value = res.rows.map(item => ({...item, isEdit: true}))
+    total.value = res.total
+  })
+}
+let selectOptions = ref([])
+
+let selectItem = ref({
+  code: '',
+  value: ''
+})
+let selectItemUpload = ref({})
+const setSelectItem = (item) => {
+  console.log(item)
+  selectItem.value = JSON.parse(JSON.stringify(item))
+  selectName.value = item.value
+}
+const setSelectItemUpload = (item) => {
+  console.log(item)
+  selectItemUpload.value = JSON.parse(JSON.stringify(item))
+  upLoadname.value = item.value
+}
+const upload = ref(null);
+const file = ref(null);
+const file1 = ref(null);
+const handleFileChange = (fileObj) => {
+  console.log(fileObj)
+  file.value = fileObj.raw;
+};
+const handleFileChange1 = (fileObj) => {
+  console.log(fileObj)
+  file1.value = fileObj.raw;
+};
+const beforeUpload = (fileObj) => {
+  if (!fileObj.type.includes('application/vnd.ms-excel') && !fileObj.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+    alert('只能上传 .xls 或 .xlsx 文件!');
+    return false;
+  }
+  return true;
+};
+let reDia = ref(0)
+const submitUpload = () => {
+  if (!file.value) {
+    alert('请选择一个文件');
+    return;
+  }
+  if (!selectItemUpload.value.code) {
+    ElMessage.error('请选择一个工程')
+    return;
+  }
+  const formData = new FormData();
+  formData.append('file', file.value);
+  formData.append('prjCode', selectItemUpload.value.code);
+  if (reDia.value == 1) {
+    formData.append('updateReason', updateReason.value);
+  }
+  // 使用 fetch 发送请求
+  if (diaType.value == 0) {
+    if (reDia.value == 1) {
+      reUploadDrawing(formData).then(response => response)
+          .then(data => {
+            selectItemUpload.value = {
+              code: '',
+              value: ''
+            }
+            upLoadname.value = ''
+            console.log('Success:', data);
+            // 清空文件输入框
+            upload.value.clearFiles();
+            ElMessage.success('上传成功')
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
+            handleQuery()
+            isOpenDialog.value = false
+          })
+    } else if (reDia.value == 0) {
+      importCm(formData).then(response => response)
+          .then(data => {
+            selectItemUpload.value = {
+              code: '',
+              value: ''
+            }
+            upLoadname.value = ''
+            console.log('Success:', data);
+            // 清空文件输入框
+            upload.value.clearFiles();
+            ElMessage.success('上传成功')
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
+            handleQuery()
+            isOpenDialog.value = false
+          })
+    }
+    
+    
+  } else {
+    if (reDia.value == 1) {
+      reUploadBudgetDrawing(formData).then(response => response)
+          .then(data => {
+            selectItemUpload.value = {
+              code: '',
+              value: ''
+            }
+            upLoadname.value = ''
+            console.log('Success:', data);
+            // 清空文件输入框
+            upload.value.clearFiles();
+            ElMessage.success('上传成功')
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
+            handleQuery()
+            isOpenDialog.value = false
+          })
+    } else {
+      importCm1(formData).then(response => response)
+          .then(data => {
+            selectItemUpload.value = {
+              code: '',
+              value: ''
+            }
+            upLoadname.value = ''
+            console.log('Success:', data);
+            // 清空文件输入框
+            upload.value.clearFiles();
+            ElMessage.success('上传成功')
+            file.value = null
+            selectItem.value.code = ''
+            selectItem.value.value = ''
+            selectName.value = ''
+            handleQuery()
+            isOpenDialog.value = false
+          })
+    }
+    
+    
+  }
+  
+  
+};
+onMounted(() => {
+  getPrjListFun()
+  // handleQuery()
+  // getList()
+  // tableData.value=[]
+  getList()
+})
+
+
+</script>
+<style scoped lang="less">
+.tableWrap {
+  padding: 20px;
+}
+
+.queryRef {
+
+}
+
+.labelItem {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%; /* 设置高度为父容器的高度 */
+}
+
+.el-upload {
+  display: inline-block;
+}
+
+.el-button {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/pages/jj/prjapro.vue b/src/views/pages/jj/prjapro.vue
index f3f3405..8a90785 100644
--- a/src/views/pages/jj/prjapro.vue
+++ b/src/views/pages/jj/prjapro.vue
@@ -1,67 +1,134 @@
 <template>
   <div class="tableWrap">
-    <el-form class="queryRef"  ref="queryRef" :inline="true" style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+    <el-form class="queryRef"  ref="queryRef"
+             label-width="140"
+             lable-position="left"
+             style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
              border-radius: 6px;background-color: #fff;margin-bottom: 20px">
-      <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
-        <!--        <el-input-->
-        <!--            v-model="name"-->
-        <!--            placeholder="请输入名称"-->
-        <!--            clearable-->
-        <!--            style="width: 200px"-->
-        <!--            @keyup.enter="handleQuery"-->
-        <!--        />-->
-        <!--  -->
-        <el-select
-            v-model="selectName"
-            filterable
-            placeholder="请输入名称"
-            style="width: 500px"
-        >
-          <el-option
-              v-for="item in prjOptions"
-              :key="item.code"
-              :label="item.value"
-              @click.native="setSelectItem(item)"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-      <el-form-item class="ei" style="position: absolute;right: 0px">
-        <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
-        <!--        <el-upload-->
-        <!--            ref="upload"-->
-        <!--            action=""-->
-        <!--            :auto-upload="false"-->
-        <!--            :on-change="handleFileChange"-->
-        <!--            :before-upload="beforeUpload"-->
-        <!--            accept=".xls,.xlsx"-->
-        <!--            :show-file-list="false"-->
-        <!--        >-->
-        <!--          <template #trigger>-->
-        <!--            <el-button type="primary">选取文件</el-button>-->
-        <!--          </template>-->
-        <!--        </el-upload>-->
-<!--        <el-button type="success" @click="openDia(0)">图纸上传</el-button>-->
-<!--        <el-button type="primary" @click="openDia(1)">施工图预算上传</el-button>-->
-        <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
-        <!--        <el-upload-->
-        <!--            ref="upload1"-->
-        <!--            action="#"-->
-        <!--            :http-request="submitUpload1"-->
-        <!--            :on-change="handleFileChange1"-->
-        <!--            accept=".xls,.xlsx"-->
-        <!--            :show-file-list="false"-->
-        <!--            :limit="1"-->
-        <!--        >-->
-        <!--          <template #trigger>-->
-        <!--            <el-button type="primary"  @click="isOpenDialog=true">施工图预算上传</el-button>-->
-        <!--          </template>-->
-        <!--        </el-upload>-->
-      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem" >
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="selectName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItem(item)"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单位：" prop="name" label-position="left" class="labelItem" >
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="unitName"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+    
+            </el-input>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="8">
+       
+          <el-form-item label="审批状态：" prop="name" label-position="left" class="labelItem" >
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-input
+                v-model="preStatus"
+                filterable
+                placeholder="请输入名称"
+                style="width: 300px"
+            >
+    
+            </el-input>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+      
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="预算计划上传时间：" prop="name" label-position="left" class="labelItem" >
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planPreTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5" :offset="3">
+          <el-form-item label="图纸计划上传时间：" prop="name" label-position="left" class="labelItem" >
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-date-picker
+                v-model="planTime"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="3">
+          <el-form-item class="labelItem">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      
     
     </el-form>
 <!--    <el-dialog v-model="isOpenDialog" width="30vw" @close="closeDialog">-->
@@ -127,16 +194,24 @@
 <!--    -->
 <!--    </el-dialog>-->
     <el-dialog v-model="isOpenTimeLine" width="30vw" @close="closeTimeLine" :title="titleN" center>
-      <div style="height: 500px;overflow: scroll;position: relative">
-        <el-timeline>
+      <div style="height: 500px;overflow-y: auto;position: relative;">
+        <el-timeline style="height:380px;">
           <el-timeline-item
               v-for="(activity, index) in tzLine"
               :key="index"
           >
-            更新时间：{{ activity.time }} &nbsp;&nbsp;&nbsp;文件名： <el-link @click="downloadFile(activity)" type="primary" style="border-bottom: 1px solid #0E9CFF">{{ activity.name }}</el-link> <br><br> 审批人：{{ activity.person }} &nbsp;&nbsp;&nbsp;审批状态：{{ activity.status }}
+            更新时间：{{ activity.time }} &nbsp;&nbsp;&nbsp;
+            文件名： <el-link @click="downloadFile(activity)" type="primary" style="border-bottom: 1px solid #0E9CFF">{{ activity.name }}</el-link>
+            <span v-show="activity.upreason!=''&&activity.upreason!=null"><br><br>更新说明：{{ activity.upreason }}</span>
+            <br><br> 审批人：{{ activity.person }} &nbsp;&nbsp;&nbsp;审批状态：{{ activity.status }}
+            <span v-show="activity.approvereason!=''&&activity.approvereason!=null">  <br><br>审批说明：{{ activity.approvereason }}</span>
+
           </el-timeline-item>
         </el-timeline>
-        
+        <div style="position: absolute;bottom:30px;display: flex;width: 80%;align-items: center"
+             v-show="titleN=='审批图纸'||titleN=='审批施工图预算'">
+           <div style="width: 20%" >审批说明：</div><el-input v-model="spreason"></el-input>
+        </div>
       </div>
       <div v-if="editFunisTrue" style="display: flex;justify-content: flex-end">
       <el-button type="primary" @click="approveH(1)">批准</el-button>
@@ -148,29 +223,34 @@
     overflow-x: auto;
     border-radius: 6px;background-color: #fff;">
       <el-table v-loading="loading" :data="tableData">
-        <el-table-column label="序号" type="index" width="50" align="center">
+        <el-table-column   label="序号" type="index" width="50" align="center">
           <template #default="scope">
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
-        <el-table-column label="工程名称"   align="center" prop="prjName" :show-overflow-tooltip="false"/>
-        <el-table-column label="图纸名称"  align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
+        <el-table-column   label="单位"    width="220"  align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="工程名称" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="图纸类型" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        <el-table-column   label="出图内容" width="280"  align="center" prop="prjName" :show-overflow-tooltip="false"/>
+        
+        <el-table-column label="图纸计划上传时间"    width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+  
+        <el-table-column label="上传时间"    width="220"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
+        <el-table-column   label="图纸名称" align="center"
+                           prop="drawingName" :show-overflow-tooltip="true" width="300">
           <template #default="scope">
             <el-link  @click="downmloadFile(scope.row,0)" style="border-bottom: 1px solid #0E9CFF" type="primary">{{scope.row.drawingName}}</el-link>
           </template>
         </el-table-column>
-        
-        <el-table-column label="更新时间"  align="center" prop="drawingUpdateTime" :show-overflow-tooltip="false"/>
-        <el-table-column label="图纸审批状态"  align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
-        
-        <el-table-column label="施工图预算"  align="center" prop="budgetDrawingName" :show-overflow-tooltip="false">
+        <el-table-column label="图纸审批状态"  width="220" align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="预算计划上传时间"  width="220" align="center" prop="drawingApprovalStatus" :show-overflow-tooltip="false"/>
+        <el-table-column label="上传时间"     width="220" align="center" prop="budgetDrawingUpdateTime"
+                         :show-overflow-tooltip="false"/>
+        <el-table-column label="施工图预算"  width="220" align="center" prop="budgetDrawingName" :show-overflow-tooltip="false">
           <template #default="scope">
             <el-link @click="downmloadFile(scope.row,1)" style="border-bottom: 1px solid #0E9CFF" type="primary">{{scope.row.budgetDrawingName}}</el-link>
           </template>
         </el-table-column>
-        <el-table-column label="更新时间"  align="center" prop="budgetDrawingUpdateTime" :show-overflow-tooltip="false"/>
-        
         <el-table-column label="预算审批状态"  align="center" prop="budgetDrawingApprovalStatus" :show-overflow-tooltip="false" width="120"/>
         <el-table-column label="操作" align="center"
                          width="400"
@@ -219,7 +299,7 @@ import { approve,list as  recordList,reUploadDrawing,reUploadBudgetDrawing,
 // ,importCm,importCm1,deleteitem
 import {defineProps, onMounted, ref} from 'vue';
 const { proxy } = getCurrentInstance();
-
+let spreason=ref('')
 const props = defineProps({
   pageType: String,
   moduleName: String,
@@ -272,13 +352,31 @@ const downmloadFile=(row,num)=>{
         }
     ).then(res=>{
       console.log(res)
-      tzLine.value=res.data.map(item=>({
-        time:item.drawingUpdateTime,
-        name:item.drawingName,
-        person:item.drawingUpdateUserName,
-        status:item.drawingApprovalStatus,
-        fileId:item.drawingFileId
-      }))
+      console.log(statusApprove.value,'statusApprove')
+      console.log(statusApprove.value!='')
+      if(statusApprove.value!==''){
+        tzLine.value=[res.data.map(item=>({
+          time:item.drawingUpdateTime,
+          name:item.drawingName,
+          person:item.drawingUpdateUserName,
+          status:item.drawingApprovalStatus,
+          fileId:item.drawingFileId,
+          upreason:item.drawingApprovalUpdateReason,
+          approvereason:item.drawingApprovalReason,
+        }))[0]]
+        console.log(tzLine.value,'进来了')
+      }else {
+        tzLine.value=res.data.map(item=>({
+          time:item.drawingUpdateTime,
+          name:item.drawingName,
+          person:item.drawingUpdateUserName,
+          status:item.drawingApprovalStatus,
+          fileId:item.drawingFileId,
+          upreason:item.drawingApprovalUpdateReason,
+          approvereason:item.drawingApprovalReason,
+        })).reverse()
+      }
+  
     })
   }else {
     historyList(
@@ -287,14 +385,33 @@ const downmloadFile=(row,num)=>{
           "budgetDrawingFileId":row.budgetDrawingFileId
         }
     ).then(res=>{
+      console.log(statusApprove.value,'statusApprove')
+  
       console.log(res)
-      tzLine.value=res.data.map(item=>({
-        time:item.budgetDrawingUpdateTime,
-        name:item.budgetDrawingName,
-        person:item.budgetDrawingUpdateUserName,
-        status:item.budgetDrawingApprovalStatus,
-        fileId:item.budgetDrawingFileId
-      }))
+      if(statusApprove.value!==''){
+        tzLine.value=[(
+            res.data.map(item=>({
+              time:item.drawingUpdateTime,
+              name:item.drawingName,
+              person:item.drawingUpdateUserName,
+              status:item.drawingApprovalStatus,
+              fileId:item.drawingFileId,
+              upreason:item.drawingApprovalUpdateReason,
+              approvereason:item.drawingApprovalReason,
+            }))[0]
+        )]
+      }else {
+        tzLine.value=res.data.map(item=>({
+          time:item.budgetDrawingUpdateTime,
+          name:item.budgetDrawingName,
+          person:item.budgetDrawingUpdateUserName,
+          status:item.budgetDrawingApprovalStatus,
+          fileId:item.budgetDrawingFileId,
+          upreason:item.budgetDrawingApprovalUpdateReason,
+          approvereason:item.budgetDrawingApprovalReason,
+        })).reverse()
+      }
+  
     })
   }
   //打开弹窗
@@ -346,7 +463,14 @@ let tableData = ref([])
 let total = ref(0)
 let pageNo = ref(1)
 let pageSize = ref(10)
+
 let selectName = ref('')
+let unitName = ref('')
+let planTime = ref([])
+let planPreTime = ref([])
+let preStatus = ref('')
+
+
 let upLoadname=ref  ('')
 let isOpenDialog =ref(false)
 let isOpenTimeLine =ref(false)
@@ -367,6 +491,8 @@ const closeTimeLine=()=>{
   editFunisTrue.value=false
   clickType.value=''
   statusApprove.value=''
+  titleN.value=''
+  spreason.value=''
 }
 import { useRoute,useRouter} from 'vue-router'
 const router=useRouter()
@@ -378,11 +504,12 @@ let editFunisTrue=ref(false)
 const approveH=(pay)=>{
   console.log(rowData.value,'approve')
   if(statusApprove.value==0){
-  //图纸
+  //图纸 budgetDrawingApprovalReason drawingApprovalReason
     approve({
       "prjCode":rowData.value.prjCode,
       "drawingFileId":rowData.value.drawingFileId,
       "drawingApprovalStatus":pay,
+      drawingApprovalReason:spreason.value
      }).then(res=>{
       console.log(res)
       if(res.code==200){
@@ -396,7 +523,8 @@ const approveH=(pay)=>{
     approve({
       "prjCode":rowData.value.prjCode,
       "budgetDrawingFileId":rowData.value.budgetDrawingFileId,
-      "budgetDrawingApprovalStatus":pay
+      "budgetDrawingApprovalStatus":pay,
+      budgetDrawingApprovalReason:spreason.value
     }).then(res=>{
       console.log(res)
       if(res.code==200){
@@ -733,8 +861,6 @@ onMounted(()=>{
   padding: 20px;
 }
 .queryRef{
-  display: flex;
-  align-items: center;
 }
 .labelItem {
   display: flex;
@@ -742,6 +868,13 @@ onMounted(()=>{
   align-items: center;
   height: 100%; /* 设置高度为父容器的高度 */
 }
+.labelItem1 {
+ 
+  /deep/.el-form-item__content{
+    width:150px!important;
+    background: red;
+  }
+}
 .el-upload {
   display: inline-block;
 }
@@ -749,4 +882,5 @@ onMounted(()=>{
 .el-button {
   margin-right: 10px;
 }
+
 </style>
diff --git a/vite.config.js b/vite.config.js
index f9346c8..37a0e77 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -64,9 +64,9 @@ export default defineConfig(({ mode, command }) => {
           // target: "http://192.168.3.210:20241",
           //测试
           // target: "http://192.168.133.127:20241",
-          // target: "http://192.168.133.127:20241",
+          target: "http://192.168.133.127:20241",
           // 相斌
-          target: "http://192.168.3.33:20241",
+          // target: "http://192.168.3.33:20241",
           changeOrigin: true,
           // target: 'http://192.168.3.114:20241',//广瑞
           rewrite: (p) => p.replace(/^\/sgtjzhzxsp-api/, '')