From dc35cb8354c60c02e0c37fc0d593fe5d49fb2cf7 Mon Sep 17 00:00:00 2001 From: dhr <2216804034@qq.com> Date: Mon, 8 Sep 2025 15:44:35 +0800 Subject: [PATCH 01/19] 0908 --- src/api/largeScreen/index.ts | 7 ++++ src/views/equipment/equipmentGPS.vue | 4 +-- src/views/largeScreen/components/header.vue | 32 ++++++++++++++++++- .../overallPlanMaterialSupply/index.vue | 20 ++++++------ .../landTransferLedger/index.vue | 26 ++++++++++----- src/views/tender/supplierInput/index.vue | 6 ++-- 6 files changed, 72 insertions(+), 23 deletions(-) diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts index 87acda0..6df57ff 100644 --- a/src/api/largeScreen/index.ts +++ b/src/api/largeScreen/index.ts @@ -98,3 +98,10 @@ export const cashTotal = () => { method: 'get' }); }; +//安全天数 +export const getSafetyDay = (projectId) => { + return request({ + url: '/money/big/screen/safetyDay/' + projectId, + method: 'get' + }); +}; diff --git a/src/views/equipment/equipmentGPS.vue b/src/views/equipment/equipmentGPS.vue index 8a24dea..f5ad8ff 100644 --- a/src/views/equipment/equipmentGPS.vue +++ b/src/views/equipment/equipmentGPS.vue @@ -140,9 +140,9 @@ const createEarth = () => { // 加载底图 loadBaseMap(earthInstance.viewer); - // 可以取消注释以下代码来设置初始视角 + // // 可以取消注释以下代码来设置初始视角 // YJ.Global.flyTo(earthInstance, view); - // YJ.Global.setDefaultView(earthInstance.viewer, view) + // YJ.Global.setDefaultView(earthInstance.viewer, view); // 地球创建完成后获取并渲染轨迹数据 getTrajectoryData(); diff --git a/src/views/largeScreen/components/header.vue b/src/views/largeScreen/components/header.vue index bd16c8e..3066b3e 100644 --- a/src/views/largeScreen/components/header.vue +++ b/src/views/largeScreen/components/header.vue @@ -6,7 +6,7 @@
安全生产天数:
- 1,235 + {{ safetyDay }}
@@ -41,12 +41,42 @@ diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue index 56c849b..0781865 100644 --- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue +++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue @@ -73,12 +73,12 @@ --> - - - - - - + + + + + + @@ -214,7 +214,7 @@ const getInfo = () => { console.log('res.data', masterDataRes); Object.assign(form.value, masterDataRes?.data[0]); // console.log('form', form.value); - tableData.value = res.rows.reverse();//翻转 + tableData.value = res.rows; //正序显示 loading.value = false; buttonLoading.value = false; }); @@ -319,9 +319,7 @@ onMounted(() => { .el-input__inner, .el-select .el-input__inner { border-radius: 4px; - transition: - border-color 0.2s, - box-shadow 0.2s; + transition: border-color 0.2s, box-shadow 0.2s; &:focus { border-color: var(--primary-light); @@ -331,9 +329,7 @@ onMounted(() => { .el-textarea__inner { border-radius: 4px; - transition: - border-color 0.2s, - box-shadow 0.2s; + transition: border-color 0.2s, box-shadow 0.2s; &:focus { border-color: var(--primary-light); diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue index a3a86c6..e92ea01 100644 --- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue +++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue @@ -292,7 +292,7 @@
- {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示:当前剩余${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }} + {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示:当前剩余${sonSummaryInfo.remainingArea} 亩` : '' }}
@@ -325,7 +325,7 @@
- {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示:当前剩余 ${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }} + {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示:当前剩余 ${sonSummaryInfo.remainingArea} 亩` : '' }}
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 540bb57..872df4a 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -46,16 +46,16 @@ :load="loadChildren" :has-children="hasChildren" > - - + + - - - - + + + + @@ -65,7 +65,7 @@ {{ scope.row.createTime }} - + - From 23ceb718e9ffad9dce515c4e87bcf749cb3f7e7a Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Tue, 9 Sep 2025 10:18:28 +0800 Subject: [PATCH 06/19] tijiao --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index a2cbec4..719816d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +# VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 @@ -13,7 +13,7 @@ VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 -# VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' From 84246a3a615d31e2aa3ca0c033d4cc8062d7d745 Mon Sep 17 00:00:00 2001 From: dhr <2216804034@qq.com> Date: Tue, 9 Sep 2025 10:37:05 +0800 Subject: [PATCH 07/19] 0909 --- .env.development | 2 +- public/xx.xlsx | Bin 0 -> 10871 bytes src/api/supplierInput/supplierInput/index.ts | 19 ++++ src/views/tender/supplierInput/index.vue | 92 +++++++++++++++++-- 4 files changed, 106 insertions(+), 7 deletions(-) create mode 100644 public/xx.xlsx diff --git a/.env.development b/.env.development index d3e8059..519f596 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 diff --git a/public/xx.xlsx b/public/xx.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fb25b99e7eead984a3897e39476344c1e68a3430 GIT binary patch literal 10871 zcmbt)Wmp``)-Dbq*kHlkg1fuByL)gM+}(mp2s*)oTae)Ht|7sKTW|;(xI=Qz-aGlu zcb@0oTR&=gx|dYFRlTa0D9b^^AVNH~2*q{br{90KXW$ESM>A!hqmv7hGMEe#d;{Sp z8HL&)qaY*%ga8x-1lm8zOq`q;J?-tX6T4)4gfS(qf*+Yj+q3H;rPB*A#a-v9{$M=}x%Y4|=&5>`pX-P%wqmnq{pS-&jDMDzo;&7;JQ z$BN-=R2>{H&J3JCf3@Pciuc*z(8dc5IRlo-{l!6GY7c%(C|eZIM{Dfo(E$*s&7H_% z(TnSLtHfnvewR*q%jIQb%S@9+%|bUD2zL)xyBNP?opN5PssP5?1dKJ{pIDnY0xh1v zj!jyX?P133KZae+-E3F*QetJrci$uIM8mDp`h4iKrrmUcc#A;zHO|VNqR;ag_cB6n z(oL$JyEDF39ty%LbKKUT8i_(yOeq-H98XHb`oYN_J9JQ9CvOo99UUyLZivLj{Rzod z#@TRZb_qLzXaOgi*f2*jSDr+na!Griw%GcNdXE>eb+RqJGX`07hPVJ+-&?@C*( zgk$*uZ>f|$(mSDkrJ2k-_t|RYu}bb7eyl7Y^r!}v(A5kh>Bp8f#nYUn@@n&Wg&z$& zu#wSj?Ou;dzP^Rmjq6_a_b7;DCqY&(0^ak-F;-b(q)=1vpbVu8u_aA;YixF@D3|&BfKx{t5lUL=oE% zW}NWjkRK5VKJxNqb9vaY*!?JUyc6g7IdcgJ#j%{4uYi>DhtUY;w*a++0Q zsBxm1ibI&UL_xyRl^KdhYS(oJ`3O*Ewx4I)lE}iSO}^5$w8?Pl#)>W~;(SG$E;unh z{Mfs25`ts1(Nyo6skxWi;4te`{-t3fPu&+Uv@Q)D-Bb{_436D@?Q2*g|CbIj{Jsfy z%SM4%MJ_qPHR?%}23yr@O}KJ;Xmk?YKBSvoCT0HU7m?zjlfkuaSz5dKfD0g61Z4X{6^IzNIGxeCj=EvJovk`VgnGzDn+m2 zQ7d1uIqS(AtbPl9Sd)?wPE-=OQjebw?C<#e^}L?3V^k303ETf{YM{Z`dfNRoGXI$X z5>iK7R(5%3{KOy;E~r30n7$ zPDm@6HQ=5&_m!%SRTo|oHvPW%Zq8WhX3f|E%D_dSX;+|Ny37VA( zgPlVaa>~vC-~gL&ER8o`ZmrMfX>69f z8NCKJ!EZVHU*v4@zsa3_ptoBG>5h6Y!n3Eh=!>K-#dkKKln)4|E5OU0krNNP+V8)4 zkd5oJ)lVhZpvwrD&39*#v-~K$Lptm7p*YChL3mMZR=BW+6>qX6oP6^8l5oBV8{Xu# z3G|oOaG%xkPJ7_$u+;Jn*v&#CTz=l$Iq`H5)?+FB=8|*T^K$C@D{^I`Cn994Ft%}# zLLapS(XGO(eEDKB4__(vCYINOL{-{T6h6)xi9+q<8A~`4<_T|;tdg<;8k-5nkyKn% zRJFy1)7m+gFP`+^yZ(cs8okM#&>{bruXQGAF2#gb#mr$ck-gt z&z|eYh^EeoZ%VXmZh^3w%Ay9N-G}7X`f13RzGxUaWJN#yf6lbO*_*QK|6;}92DwB3 zVkuc1RZO?@MDr%ary%(}9xlM9jA@p1nb0dx5s+mbbyO_4_ln0zU2yNa9f+KE2!Vr0 zMM2W)G*Xv!osmdINpfj`9B(L6ls_*$#xqi?E(s8S8tKlu{*q`)Mv{Mkym<%#3%mX; zI#k&grDs7Fgax6U%_wT3#wJoPNvmr&QqZ)&$jBm;AF@-zV0)y3$@rAQt*V=&!4H-# zzz>dSDPc4{vcV5pWS#}h&8abpBByF8H6hiH+|s(X1sGkpMk6rYJ~plIF&mufUi(F? zLeU~CVx zQlCvAk)#fXaKr{jpt3|U=_~*bK_L`d6hAj)Qev0%0sw~~77FObF$rdtNFyBuU?a$d zVs+!0gybANE76xJhug(h)&7$*XO_|?p$BLp*oGnpS5g-MDQoa@ zh_nB{=FTAc|2X&E*ar{Re7s1*HYuivxPJTt{FO|%6UxlP-7zIWDTxh<W z_7;D9cFGf`PA-D2JPGcvs0RO z;l4+n9m7ohLdzvaXc%cUQx(~L(U^&OE*cD!ybNY)SBW$|-s1T) z?}}nFw8Cv&_v5u2I@-G(U>k-2eO-`OOOG!18NgI5lzXno2KMZYEzxtS3D5H36+K&2 zi0c{c--GKG)MfR)xttLK3HjZO?F2lW^g^y~ zSlM+;QFL{;L@BlM(FfJ@slfLh5S-|s#&^JP zrdMOSYgc?)o7k+!Ahax3(H&8jX7dDga7#`WRiQ;tF*V!K;10~d889}S$Rr=!d+>mc(`U<9e8C2dXICr<8pgCz}eypE=k>ks=z3fO`Cl$Ts4 zB1*AML@6_%HNrF_tX4sqp=bXbW-XiY6P%9Mr$LeFLyC;TxXiTdsv z^-Lpza{A9m(*iL)7>@F1k14#iVuivLiu~D38)?(IL{HS0r5_KQ@6xCdY8-^0&{?#geu$j%4k{NGljIpC zEEgJIDWW>}*M&N-bi(6XhUQt-FajV1Bi*6@s_*&OH>;1?s3qpRZD}g#wU{O#hp_Yn z8i_4!(J!&gj)ooHXIal)mXh>^7SKllw)2ab!A>}QR$ehF9^Fd-Rb}bk3;Htg4O3a= zhRr$}mCcGQnP;?ZmhL)~*?_P#^cNBwZ_FEe)?V4kN=wVr(7vMN=(d}o*Liu$NY{S< z*y$o0yrWJub~b3U#ukAjd9)DN!}_q**+?Fz;T4zdg6*aJBj$1nI7-N6JSjR3JB4Jv zD1z?JJ2|=tU}laW~YfHB#qG2a1t|zSWWDzo5E=D*}5hhl*(V5Y0`lixQ10+HkA$2^yjJ$wlv15B)k86GQ+g zNczVldeqR*X~k%xUMc9Vksp`C7qX>)+84@cTYSFI+s_&&Z#OILjM-E<11jY}vcy`DXgOFf-mm!) zRPY{jhrx4UyZ^Wg)o(plx?VTB$mM9cinMX=mx@O$EIphaQC=B^WK0@Qv*^7$M!SoY zNQz|wkl}$wT@Df7Nq)=J5BtIcfBYDUp|cds&nizsUOVDqd`q=WMlKs+8g0QC zD9#G0tn=D_hQ9|l7ikWWd`dE8fCbs4zsCShevS-EHP7{qHMhxbHcvrgw?L<}NN=+i zpB2dhWWPoZtI*G)U}E57oWS2fmF~YMC?P3ZkRhcmvY87)@q(NP3_+?H`9Y{~S+U4w zA4*NF=Mah_8!(TFcoXwBS4A27bUjs)_B27j=}xz_-w<+{N*1;I2suj?^|45$P1;uD zeOD=Cz{9n>r#HXv58(CvkCTg>2#s5x624kjAM#S6UJG*#RRw?P=@UtuEfs*lNZoQ0 zq>me=h8rHAh`_~^M|k^ZmqSIN>R`oH;8@)8yGy=t`duDqTXzn8ra`m#a_-T8V4ea9=r3nM#dp)XEyPk_@EI1RjHh!+n zG?1g#C^mgA3Z>2y^}%+nmuJA*12tQH_f2;$SuRxAj0}MX?G~)TS7CiOeIKJD84sgV ztm}!G!}OW~)MW?soo3Zf&fAaonKu*X4u(8& znhhP^6hys>xeY&z8Fk-V$V#cS^Sh+W#5i8yyh2r&Ne=9@nr0;QUh&LVO}{`H%VlZ$ z7BdF$Wpi4}UF(v%%3;NADVlmml9y|sQaUGTVWpjqzE;ihZOep}eTi6UU<<@XfDf9h zw;SQ>Z{Zam%Y8g!1WL@p(2((S}0GAobJoN%KW?`%OTryVyoz8p;p2j;J5a4~EW zR@Bw=WT0H;awU3?yKdIY*<8z#t+sxScng#vlk~_EEOr*V4R_tke9NfeDD9ZDL!A0q z$tb{f-_tQ=h)I84kE=kH60Pq{BhUBQ)MLA+IFU9>O_g>@4bxDxzU*wC?6oSB7Wwz7 z7X(*yTGO%W`S)hSrpK^LW~;aERQ~Vsr%32HB3ZpZ)bn`hHCrzzE0|;E zg3S0T&0}x36Q4Odt`*~oC8wlk-|zQ*fd2@FMKLD>Z93!i%9`x@TLN7Oor_x0f`rGG zVs#SKnHb>N_ChFq^>B*BKy^i>E#=;FZPxt+`OfENkym%X1V1L|R*K1xHS7Y|ei64m^^e`o1*^M&(t9 zBTc5dBo}1>!t7K>w5zr3ed?=ay28*b4gNmnU4h{j_zjpQy6~)BVe`T2Cb75c4Cg&= zxt%X?-D;{k36r0>4$?28+^r?#4rW#;;9z(b@lCJU4h6LP^M`|m5yF{@hc(bFEcc*4 zai?Nssht7j2^ROs8BlnA8CS7cykhB91a1U+f=Gm<$s70H@Z+MxRe zk3^`Op+pa3eTinKje#}VyB!Xu>X4B9V}@p`M6OUIiFPzr7#^`fW&O}tS3!ZQSR@HS zeB9tHPFBn+8?)8)?lb>LDWN1JF_H5m8H`4@WN~9_Dg{G5w*6@BxXK&4V)%AcgF1OQq@Zi&7e84kxPMVtLBfnf_UN!rJiD9*hWJ*@rP!Fn`Vid7{$Uu zhhJS~g&g6%C$&E553u@jp$uyzHAvec7FmqE21wzoaJ@=Td?_w*1IC8rI_qhWooa7PO?<#E-?{MyWz)kLBW=OZXns= z;7Q?t|L<)KyKA@OSl;DbtsN zYMn*u&8K0rP_*G0L^gtNlVZ8KKrdC1wX_+Uh(vSi%$Cu%+IRGZ=_+VO@a00}3$CkbU2Jgo zk>26Rq^=x`>xvmr1@5bLyIoG%%8v^x-WSwhwlk~bU#PQ44V6m$f{@*q!X(ql3rpnb>=UX=%gtBFc|UM&1P19taU zEwW~_bveJ)P(VV(u>{|F81lCW-StgOtUTHa!#$V|4(9F}b44)iT&%{wQVPIB%Ry7& zxxSZIA0H7CgeN`kh!9oQ$YH-`mQJzk-~Ar49}i_+Y%Biq^d^{wQYAiDgb+(MgsW`8 z>cQpeTi5wb6)`MOxiM%uA>=!NYgF*Z=EY|8hX`t>)qpE@*?4r`!T~*-eAb=E+k?+- zS5QGTjjB*-*ciPB7ehvt9bS$PcRuH+57?8rb_0`%`9lDO9pV+fyIoXBSP;-mI`l}$ z@1BK*tK&!7+i>b`8he9CR5C>ym}*ci-QFc9 zoxz5&!tvr&p>|G>Z+YM9OQX+`Ptm0)P#8ROe!Gh`3VUcMCzNxmTI86()tuurLKaJN}V5c@t1`7(8 zVzk4+s+PHs9fVuzG?l<=h=ZyUmX~f9X^dhqRtrm0=mpC#)5Q8EHZ*fiGIB}0N}2O3 zacV4D6I2yMuWuCuU1|{8hbY5bJI~R1Fw0N1jf~1{~ET4^v{58evQAlr-*~qL*?^9)F(< zo4$@T<$jN{QPR%CT-4wpa9?YXH}OdyNBiNB^62+G#4VyvcjJNOTnz5w>ML?9W ziTo$-ECse+~1SGt#7l}S$(5d z;r)t_q54#~OP<4=tCSHnRJ&kvwv)<>)zO!{GDWQ?ChSnD#hFkoUx3ADyqKwAB#v8j zs4lt{;q8`M!PhkEn*;<*wRM>oitZX`<0_l|30aNWvQMS`!-%+Z;e)a;=*iA>1i;8n;==c`7YBlg^#^VtEe2uobJTzuj z#J-w_Igj<(qiWauUq?pzJVwCfWavNLhiuZ-q9}rv=WLJFNA_(XsSk{Hs8E zzSsmC-KKhCwwql7R!oR*{z3=Zr34%t&jip-aOBuSHln=3k^xylKP*k{_0pDphckWp zfW9K}Ys#Fl8{wImo$jv0DZRQ8Y2HxEyn{yy)`8y5R4+jeBWd6nLz&0_o(un1{^LKv zIcWD8_zetW^HYcd{0okG{UUqHi~l=F@h@~0Ya7Qx9&%#&b(8{9iDpa=}WBRgJc_@)Y z);D@15MjwnSC=_DHaK!yjlUhdOcZxNE$Cz!c=d9Kn}7q0G;boCvp~fqwIo?3Gvw$A zU6rCj_}Nz=Q%9_VHb00dc^2x&W5O>DT-WHMJCPtJap`sILFh=y_b57D?-*Ih2S-k? z%KG`TC)-_y7Y$VDM?M*I+IBnnlk-=YrUC`aY?0G4{E2{RM0zEc0 zCzBWx<28#CigoDO@15)ysi5GK@1U2)P$EGwnKHbGHyw}nZAg-Iwy!D0XIJLRjV`qz z6}=0W%PonM-=2Z6(n8g`J>fa@plhd2Zf%%#;5&m$3FpgYUh+G|)k4x$pFt9g$@|rj zO)-yqq5&B#I~{%6_!!&dzN)6{B6AY(cd66M(}J`vd^RY8MKt*xup7!VqR?Ve$r9Dt zUH1c39iCxnY;!E^26CB)oaTqRZ+mn$9L45E>58ymv$P?~aeh1l68H%#hL?6|#4TLR zl%xvdJ(mNhPd1bbzX_rsr9u`0J(|lAuK}+a^BZnW*P)Ud-?E|NrRr?UUk^LkiNjoi z$g-us$q%53(AYsFam<0f9~Bcsw_PUA!#ykuV+)8Vx|Rg)ICi)|=xoEBj11hozd9eU z?x}luIgEHX{&j~z^ow8V-pXZrVnYXg>v`9?8RtEmvK%B7=FiyducEO(R|dQ|5Recg z;J%yUKd#d+0sp(jc@pre{)~?7Z~ODR(myTG6UQ&5N`LYEd}IEbvZq(_S9>aUdusov zi~C*QpOtY>#J}`W|C8-sb#i|~^k=Qt-`vUIE&Z3$e^-9}$^K`#(%%7)o+fPzj);QI&3|L~9VHL)f7qu#2l}TWd(!g@CD1?F{)bunQ_i1BfWPIG zf(QMdQUZTU_%nw0w*&^PUlRU`=>1>J9lU43%Kx3h{(Xo1nZ*8EBj}%Of2Xwn9P*z* z>c0g%qW{$UPuTw3pr4AWezm6+j`_91zm-`1KJq_{te$v(t=h-`!TWc~m9iY{)8_%W Qb`byp52n+ldiwW&0Qb?&SpWb4 literal 0 HcmV?d00001 diff --git a/src/api/supplierInput/supplierInput/index.ts b/src/api/supplierInput/supplierInput/index.ts index 834b072..0838699 100644 --- a/src/api/supplierInput/supplierInput/index.ts +++ b/src/api/supplierInput/supplierInput/index.ts @@ -61,3 +61,22 @@ export const delSupplierInput = (id: string | number | Array) = method: 'delete' }); }; +//导入供商入库 +export const leadingIn = (formData: FormData, projectId) => { + return request({ + url: '/supplierInput/supplierInput/import?projectId=' + projectId, + method: 'post', + data: formData, + + headers: { + 'Content-Type': 'multipart/form-data' + } + }); +}; +//导入供商出库 +export const leadingOut = () => { + return request({ + url: '/supplierInput/supplierInput/export', + method: 'post' + }); +}; diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue index 3709164..a3afeda 100644 --- a/src/views/tender/supplierInput/index.vue +++ b/src/views/tender/supplierInput/index.vue @@ -31,9 +31,14 @@ 新增 - + + 导入 + + + 导出模板 + @@ -309,7 +314,14 @@ diff --git a/src/views/projectLarge/digitalizationScreen/components/header.vue b/src/views/projectLarge/digitalizationScreen/components/header.vue new file mode 100644 index 0000000..d911f88 --- /dev/null +++ b/src/views/projectLarge/digitalizationScreen/components/header.vue @@ -0,0 +1,327 @@ + + + + + diff --git a/src/views/projectLarge/digitalizationScreen/components/leftPage.vue b/src/views/projectLarge/digitalizationScreen/components/leftPage.vue new file mode 100644 index 0000000..b7e438b --- /dev/null +++ b/src/views/projectLarge/digitalizationScreen/components/leftPage.vue @@ -0,0 +1,326 @@ + - diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts index bcdf958..502ddc2 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts +++ b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts @@ -1,51 +1,54 @@ export let pieOption = { // 定义中心文字 graphic: [ - { - type: 'text', - left: 'center', - top: '40%', - style: { - // 需要从接口替换 - text: '70%', - fontSize: 24, - fontWeight: 'bold', - fill: '#fff' - } - }, - { - type: 'text', - left: 'center', - top: '50%', - style: { - text: '总进度', - fontSize: 14, - fill: '#fff' - } - }, + // { + // type: 'text', + // left: 'center', + // top: '40%', + // style: { + // // 需要从接口替换 + // text: '70%', + // fontSize: 24, + // fontWeight: 'bold', + // fill: '#fff' + // } + // } + // { + // type: 'text', + // left: 'center', + // top: '50%', + // style: { + // text: '111', + // fontSize: 14, + // fill: '#fff' + // } + // } ], - legend: { - show: true, - type: 'plain', - bottom: 20, - itemWidth: 12, - itemHeight: 12, - textStyle: { - color: '#fff' - } - }, + // legend: { + // show: true, + // type: 'plain', + // bottom: 20, + // itemWidth: 12, + // itemHeight: 12, + // textStyle: { + // color: '#fff' + // } + // }, series: { type: 'pie', data: [], radius: [50, 80], center: ['50%', '45%'], - itemStyle: { - borderColor: '#fff', - borderWidth: 1 - }, + // itemStyle: { + // borderColor: '#fff', + // borderWidth: 1 + // }, label: { alignTo: 'edge', - formatter: '{name|{b}}\n{percent|{c} %}', + formatter: function (params) { + // 只显示前三个数据项 + return `{name|${params.data.name}}\n{percent|${params.data.completionRate}MW}`; + }, minMargin: 10, edgeDistance: 20, lineHeight: 15, @@ -62,7 +65,7 @@ export let pieOption = { }, legend: { top: 'bottom' - }, + } } }; @@ -72,16 +75,39 @@ export let barOption = { itemWidth: 12, itemHeight: 12, // 调整文字与图标间距 - data: ['计划流转面积', '已流转面积'], + data: ['计划产值', '实际产值'], top: 0, - right: 20, + right: 10, + bottom: 10, textStyle: { - color: '#fff', + color: '#fff' } }, + + tooltip: { + show: true, + backgroundColor: '', + trigger: 'axis', + // formatter: '{b0}:{c0}万元', + formatter: (params: any) => { + // params 是数组,对应每条柱子 + return params + .map((p: any) => `${p.seriesName}:${Number(p.value).toFixed(2)} 亿元`) + + .join('
'); + }, + textStyle: { + color: '#fff' + }, + axisPointer: { + type: 'shadow' // 默认为直线,可选为:'line' | 'shadow', + } + // borderColor: 'rgba(252, 217, 18, 1)' + }, xAxis: { type: 'category', - data: ['地块1', '地块2', '地块3', '地块4', '地块5', '地块6'], + data: [], + axisLabel: { color: '#fff' }, @@ -93,34 +119,71 @@ export let barOption = { } }, yAxis: { - name: '单位:m²', + name: '单位:亿元', type: 'value', axisLabel: { formatter: '{value}' + }, + splitLine: { + show: false // 不显示分割线 } }, grid: { - bottom: 0, // 距离容器底部的距离 - containLabel: true // 确保坐标轴标签不被裁剪 + left: '12%', + top: '15%', // 顶部留一点空间给 legend + bottom: '8%', + right: '2%' }, series: [ { - name: '计划流转面积', + name: '计划产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(29, 253, 253)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 修改y为1表示从底部开始 + x2: 0, + y2: 0, // 修改y2为0表示渐变到顶部 + colorStops: [ + { + offset: 0, + color: 'rgba(255, 209, 92, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(255, 209, 92, 1)' // 顶部透明度1 + } + ] + } + } }, { - name: '已流转面积', + name: '实际产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(25, 181, 251)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 从底部开始 + x2: 0, + y2: 0, // 到顶部结束 + colorStops: [ + { + offset: 0, + color: 'rgba(7, 209, 250, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(7, 209, 250, 1)' // 顶部透明度1 + } + ] + } + } } ] }; @@ -129,7 +192,7 @@ export let mapOption = { geo: { map: 'ch', roam: true, - aspectScale: Math.cos((47 * Math.PI) / 180), + aspectScale: Math.cos((47 * Math.PI) / 180) }, series: [ { @@ -147,7 +210,7 @@ export let mapOption = { { name: 'i', value: [9.085994375000002, 47.55395822835779] }, { name: 'j', value: [8.653968125000002, 47.47709530818285] }, { name: 'k', value: [8.203158125000002, 47.44506909144329] } - ], + ] } ] }; diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index 0d08c08..e57e5b6 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -1,13 +1,60 @@