From 1502ba1d63f18344dcd6d924c62a341ddeb8e2ef Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Fri, 23 May 2025 14:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8F=E6=BB=A8=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=BA=E7=9C=9F=E5=AE=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/.env.development | 1 + main/src/views/login/index.vue | 8 +- .../.env.development | 2 + .../.env.production | 3 +- .../src/assets/images/logo.png | Bin 0 -> 12663 bytes .../src/layouts/component/Logo/index.vue | 8 +- .../src/router/index.js | 6 +- .../src/router/modules/inputSupplies/index.js | 50 ++++++------ .../src/router/modules/productOperateMain.js | 40 +++++----- .../src/router/modules/resource.js | 14 ++-- .../src/router/modules/statisticAnalysis.js | 12 +-- .../src/router/modules/trace.js | 4 +- .../src/views/home/index.vue | 56 +++++++------- .../enterpriseDealerCheck/index.vue | 72 +++++++++++++++--- .../material/seed/index.vue | 8 +- .../src/views/trace/record/seed/index.vue | 24 +++++- .../src/views/trace/search/index.vue | 2 +- .../src/views/trace/statistic/index.vue | 22 +++--- .../src/views/trace/search/index.vue | 2 +- 19 files changed, 205 insertions(+), 129 deletions(-) create mode 100644 sub-government-affairs-service/src/assets/images/logo.png diff --git a/main/.env.development b/main/.env.development index a332768..328aab0 100644 --- a/main/.env.development +++ b/main/.env.development @@ -12,5 +12,6 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080'//线下测试 VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' \ No newline at end of file diff --git a/main/src/views/login/index.vue b/main/src/views/login/index.vue index a11cc1a..78e67eb 100644 --- a/main/src/views/login/index.vue +++ b/main/src/views/login/index.vue @@ -16,7 +16,7 @@ - + 记住密码 @@ -61,13 +61,13 @@ export default { username: 'admin', password: 'admin123', rememberMe: false, - code: '', + code: '1', uuid: '', }, loginRules: { username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }], - code: [{ required: true, trigger: 'change', message: '请输入验证码' }], + // code: [{ required: true, trigger: 'change', message: '请输入验证码' }], }, loading: false, // 验证码开关 diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 187aabc..ec64d21 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -6,5 +6,7 @@ VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-government-affairs-service' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.14:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index fa327e9..63cf3cc 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,7 +1,8 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' -VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +# VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/src/assets/images/logo.png b/sub-government-affairs-service/src/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7da947304e8d9a5b15bb7b8c295a865cdf5b0a GIT binary patch literal 12663 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 z z`Eoaq;;49a*(;Y`an|({RWX<8q|zK*K6g^`d23sdJ_(a<84cCEUyoRvgu+7X4#jz7 zmxaB^OYl5xCrJj_sp_bJGAyFp@Mxn>o>J6?R?2_J-&AOZ=cC*l@b7n30hgdpM$3pG z6$KxRVLzf#kIB9m#9kr+S=8tbH>cxx^x0ymwRYjC2be4!c&FB}rl3hG>>0CFnGtB7 zvR+=9)Z3^I^Wr<3X#fE*f-R*^t%6<$&(~muzq9X{y`?p^m*YOGxA$QB$%Qwv`wusv z_DJ7fywPe#N3!zV6hX7Cs^MzP(^n^jVy0Q`|4wxpYHZdC@sEN>FOlsWg`wo`D=xqG z5m!cqr-`E{>EG3s+(xCVlDaO%u=-z>sh7$={Q++AYUUI%*m8Sc8U$K=p+VWOg>b#W za`sv(?ix`#E~etQ%9FVbZT-2a@2Vu}e30Xo0OL7{9m~eW9WTJ`cI`LD(G%LUEMw>6rV)PwNEj{Kuha$!T z4Lv=*_pi|#&zGy|O2{+##SwBICX%s_MX)%E@_qdm^RJC|w5DGiXZ0;I(iO>r6k3g`6)n zEPV*{8as0@Qa1OY9PZ)^I8Vo@(w{Cv6#m9zmiICv8kmh@WOMYEa8lCW^06-CygS=L zv4 z&lE%fUqXYuyyuEvxAhTb0!(n+8>xIt`ueeMb4Is?xj27E3GywuH+ zC!=_De{XclDS}CPs(;)w*-c2rQ^cbt4Q(tGN^UojT@cr^?Ktdy7*NW3MSfaJnD+*^N74 zwImxohh%lVo~{pL`i>jl2`#4ZbP!WQf25?a+f#n&$I8dHsi`M&JC^H&iOD25^)ZGu z>&}X~mHgdPDTyV?I9rwg>}&T*)BvhDlNZrlZST6p7fw;f)a0&iqSU}5|CMxSK^t9}kA3@g&&LQ;2 z-ToWI3bq+~=KRI5w<(4l6X7)GOt0EIeY8xBPSo!k{@1QNe^sK6IF$QEPOy~7uQ2Cv z^vZ{(Hxgmsn|C2FWOuPv(sOY3D=2(*Mkky4s^Uw?*vIP-Xc7jgmH17?l=|^Gqt6fs z!f@?=8=Dx@yeulP(cm~#(#;EbU0r#me6n=XuCh*hBr~kV0HeIey56tT6T#9hKyl@A zsHUc3V~jCvjXO7xg+y27SgD|-+z}1q!Wg0n^S2n5Ga**s*}_;J7CNnGJRJ&4pJeKG^J|Ms#SjlXkk1!XCdFv;oe(N!^F|tIIF{Fk zB!@yG%Gpjb_k*f+v(6qKtLAsPDKWa5#oBz{w|>M+pU-5CF8_tub*Bh&T-4NFJ6q4j zP@OZq7jzUX8BRP8Vg+$O2Us?0xFG|sjXZ``lE7V!rliM%t2U3U-CnmM;;>=UM zSfsd=HGg>|Y1X?StnE9`Y(f_y6~$7JuVLW_bb;X$A%*GU9fVgr2HyB4{4^>o5x^CH(j0o4qT>M{1{VvLsfxOfl8Rph)m29 zkPGKeTvI~DTuYZi6cr-BcT!?o_cp5u02jd(sdLc3%^=QJ<}2i%PR>NoGp3DbDJ25h z0h`z4EOpz6CLoTP_Rx14vdm^khxBK&<|7q+OPIvj3k9PKLM{tc#o<}#f?*E*Zqv!eCl z@e70Js)y!Iev1*C-^-2Kqu%`S15qxitZ;8$jdO+Ba?kVoyl799a+WU3tuD2M;|$QR zzJ1sR4pg0DQ5E^O#1%vf-8^3AX$G3b8ymg9?+~6c4Fbg9b6H|*2`0vuE##kkf)G9;BP=xLv`Hy( zD-B%V-wUPWoMYDS{Fh1Tkk+Q_77%QTSsJUpc zKeJ_d&MJ#3n{SRh*{~vA0O*%`}HZO{76ABH%gWk+K>JbL7OF(mC z%*Mtfwx3vXKdsz8HK)XeGH?83ls0M{k;b6sk7^vihnS0K_#62_U=oOR($XqMuNtHNDS$WiIIb52V zk@d=qfpvIG6h_~n;GkZVUFdsWk5xo0O|3Vo^NlAl?E}^dewTH4+P|###XC2HhM8(F31kTT8GD%h*B+S()f4US3 z;YMyJNVz$4GMCG12wWJA-qgg3{vb*MHGTd{zW1zoYzkbA6sv$R{va-xB_1$$BF|va zWx%Wf>Bp7UZ3#KJlo6^1Ls^usXktWaSUqnx#vB;0lX)p!S#M^OZ9w9h^chO8&TMox zeR#e5>#{5Le9f>UKa&cVRYBj9kp0!f#4=X*Pm|Pkgy~_ z$)FDwzu(7|3&R@|A4F3+90=&$%;8GVxuzLUILM)0@aVy0?PpfN}R2pW$jBWw#I>g>9RDA-h8d0>ilG&nq~i4t6bY;yTP zj4~d{*7^pn`rK6F$W4vKV_u+G+-Vez6u!8ZQS{GsGMU8I(m>&;M-T3q(QgH@OD{9%Wv60}?-xFIKWe;5#S=lD{qEG9F!v zw4j0?6FoHbpV){PkDw`yRh&BcJlK8gb1Wea>sT4dTnQg`RJOL0vid74IE5U;-o zXxqgzpW}JV&DIRWVAtjM>QF42{V&}0HUvT%dO@|dKLqi*x)do^C69%&BcN^hQ>xOC z0pTH;giOB?ac52^|4Z?nVDn&FVf}WO>Q4PrGHnRL=MO>QIA7-l;%`)@t2CK6hENR$ z3E!ds?8Lw(N;Z5kIO*pUW^=`Ep%3QC(u?mVGv2!7V35h&RS#b|=R9kB^Rj)>$;L-p zl^6t~d)f(Cd%SI=ctOlLz=w816*(jxtM}?$+iGh_e5QkZwvz1cG$$Kz!Xk@I5R(Ej za^kf+EL3L#?X3DRdON$kXN!SDZ-M24Yzo|&`_D06XZPkrS;u;-UXODJt}aMSzd0NC z=%0$B^}*$3F`1n3DsarBBZ0PKc3B5GGOW0FJtxz~mG2q?0>xn4f@Y|J*~?QKJQPu2_xK~iCN z&To~VEx_W^@)~OJ=ruwPo@n>Sfm$!i;F`tSkMlBWwxbe5fu3DX z7Ly?QY&gy`W@;8e#L;D=IK_j{b2+v&t*MDd*;-%6OOT81*Khk|mn$2#d`^ITiHgL? zi%|i{l!Eyg2GcY+dtaYSjC8E8ay{y<|CXhHEXEf&ky!d^e+8F2m7JV+v4s-c-QPMg zfZ8ixrZq8Gp!)Y6JfzLp3idIg325K84xGwTKZ5H9+p{ogQFh+lN%=3+u{S;{@7kud zypcKcuZ%UFM#~4SBG^^tonoo-Ha?c`mtH(KVrpY|Esp(VUIW5TzE_G2%GtMsNDGzI9->vZ7 zFWP?Ce|EV1aJ1;Ff)YT`1uykUD}*a(=~CWBBX)aNA17!<^;^t$JN9+Z76KjpCl=Qr zM=2;-$OBoDr%M!0dEMbhm8tm_?M5LT;;HMnku_m9KwP1)*~^sD=jwEK760SA7GSli z00tc(JM$K|&M@KTkj!ixb$-8yW*6``UHpr89kaW(c&_ z$<%co3AjwY{6)I@qA`!F6{>>a7MlfQs4C)$#Vf5tzeel!E~=|1$6W`Y7ark#in#(M z4FzlODXtP~*v=oaEDz>(HVS1$?p;XKK@Pi-AedHF9MACx1it2Ff6qk4;JjP0n)yvP z>gOTB#u>T(g*_hI`Q!4$b}-3hvPoOl$ks}*lC@BGwnu$+YLu&rf*2GL0}VJZ7cRhW zff8dI-AxK8L{FjKgO*cV3nfFJpCg7-dZxif0Q`ohW4FPOGV`B!{lj`SjnjmOTmset zn+PR7&Q@=%lrfbWsC2YW`z2o_T2gR59aCC=mPxmsE1M zAvk{C4R<>DtO0g)N^iHvb08To0ibQ8@N6b)<;wXX2AX&?G1N<^A8JBC0*iKo(~ z{pK03SDKXA)OV(8to*^y*G@_nUI$2l?YY7s5H?>kwz&ErcIQTFfu++4#@Fy}$WY|g zYQL`qJfF5cO>&&z7X96Uc;&u}I2wlPI7MtCO4K4_zZykCnbA-yFy+&Ec6*6xBWxb>esa9Uv;#Z-b65#H-sbx6-q%;bvxlzAS8O^)FawvT4iK$qP%!>=n9Sm4+Afc9+91Rr zUXaFkl{GX~h(i4?{t$p?EoRoW#{hQ@xt2%Ih2xAEAH#3N2H)y#4Q5rw z?F+%L2On}5O!g~+p4e>rfn^k=khZcJ_EmgplkE&h=|G|~Zs-J%m}qru0P_?cXDsM) zbis)dgCTETzgb{Mj5_uLt>&4a#RIzp1lL2}$h@_{{~6I{#?7k+V$VYMDoWy#7UF4j zw`|vuaZTtY5d?@jfj8uFllT6+lqDGZuSeimDAum!=Ko#$jb)0Ntdvlcd-7i=1wdL{ LL99l^An< @@ -43,5 +43,9 @@ const { VITE_APP_TITLE } = import.meta.env; line-height: 35px; color: $color-primary; } + .logo-picture { + width: 100%; + height: 50px; + } } diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 9ac3c03..5e19252 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -47,10 +47,10 @@ export const constantRoutes = [ ...resourceRouter, ...productOperateMainRoutes, ...inputSuppliesRoutes, - produceGoods, - ...plantingAndBreedingRouter, + // produceGoods, + // ...plantingAndBreedingRouter, ...traceRouter, - ...systemRouter, + // ...systemRouter, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index b4a21d2..7274aca 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -34,30 +34,30 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), meta: { title: '肥料管理', icon: '' }, }, - { - path: '/sub-government-affairs-service/material/pesticide', - name: 'input-supplies-pesticide', - component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/material/ratPoison', - name: 'input-supplies-ratPoison', - component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), - meta: { title: '兽药管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/material/pesticide', + // name: 'input-supplies-pesticide', + // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + // meta: { title: '农药管理', icon: '' }, + // }, + // { + // path: '/sub-government-affairs-service/material/ratPoison', + // name: 'input-supplies-ratPoison', + // component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), + // meta: { title: '兽药管理', icon: '' }, + // }, { path: '/sub-government-affairs-service/material/seed', name: 'input-supplies-seed', component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种源管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/material/farmMachinery', - name: 'input-supplies-farmMachinery', - component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), - meta: { title: '农机管理', icon: '' }, + meta: { title: '种子管理', icon: '' }, }, + // { + // path: '/sub-government-affairs-service/material/farmMachinery', + // name: 'input-supplies-farmMachinery', + // component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), + // meta: { title: '农机管理', icon: '' }, + // }, ], }, { @@ -72,12 +72,12 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), meta: { title: '企业经销商抽检', icon: '' }, }, - { - path: '/sub-government-affairs-service/useSupervise', - name: 'useSupervise', - component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), - meta: { title: '使用监管', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/useSupervise', + // name: 'useSupervise', + // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), + // meta: { title: '使用监管', icon: '' }, + // }, { path: '/sub-government-affairs-service/leaseSupervise', name: 'leaseSupervise', diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js index 8ec8eb7..eecb357 100644 --- a/sub-government-affairs-service/src/router/modules/productOperateMain.js +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -8,37 +8,37 @@ export default [ redirect: '/sub-government-affairs-service/mainHome', meta: { title: '生产经营主体', icon: 'icon-shop' }, children: [ - { - path: '/sub-government-affairs-service/mainHome', - component: () => import('@/views/productOperateMain/home/index.vue'), - name: 'mainHome', - meta: { title: '数据可视化管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/mainHome', + // component: () => import('@/views/productOperateMain/home/index.vue'), + // name: 'mainHome', + // meta: { title: '数据可视化管理', icon: '' }, + // }, { path: '/sub-government-affairs-service/individual', component: () => import('@/views/productOperateMain/individual/index.vue'), name: 'individual', - meta: { title: '个体户', icon: '' }, - }, - { - path: '/sub-government-affairs-service/collective', - component: () => import('@/views/productOperateMain/collective/index.vue'), - name: 'collective', - meta: { title: '村集体', icon: '' }, + meta: { title: '农户', icon: '' }, }, + // { + // path: '/sub-government-affairs-service/collective', + // component: () => import('@/views/productOperateMain/collective/index.vue'), + // name: 'collective', + // meta: { title: '村集体', icon: '' }, + // }, { path: '/sub-government-affairs-service/coop', component: () => import('@/views/productOperateMain/coOp/index.vue'), name: 'coop', - meta: { title: '合作社', icon: '' }, - }, - { - path: '/sub-government-affairs-service/enterprise', - component: () => import('@/views/productOperateMain/enterprise/index.vue'), - name: 'enterprise', - meta: { title: '经营企业', icon: '' }, + meta: { title: '农企合作社', icon: '' }, }, // { + // path: '/sub-government-affairs-service/enterprise', + // component: () => import('@/views/productOperateMain/enterprise/index.vue'), + // name: 'enterprise', + // meta: { title: '经营企业', icon: '' }, + // }, + // { // path: '/sub-government-affairs-service/individual', // component: () => import('@/views/productOperateMain/individual/index.vue'), // name: 'individual', diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index cc07d30..570c443 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -31,17 +31,17 @@ export default [ name: 'member', meta: { title: '新增网格员', icon: '' }, }, - { - path: '/sub-government-affairs-service/grid--management', - component: () => import('@/views/resource/grid/GridManagement.vue'), - name: 'management', - meta: { title: '网格化管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/grid--management', + // component: () => import('@/views/resource/grid/GridManagement.vue'), + // name: 'management', + // meta: { title: '网格化管理', icon: '' }, + // }, ], }, ...annualplanRouters, ...landsRoutes, - ...statisticsRoutes, + // ...statisticsRoutes, ...dictRoutes, ], }, diff --git a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js index 870447c..cfe4464 100644 --- a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js +++ b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js @@ -8,12 +8,12 @@ export default [ redirect: '/sub-government-affairs-service/analysis-land', meta: { title: '统计分析', icon: 'icon-test' }, children: [ - { - path: '/sub-government-affairs-service/analysis-land', - component: () => import('@/views/resource/statisticAnalysis/land/index.vue'), - name: 'analysis-land', - meta: { title: '土地利用与规划分析', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/analysis-land', + // component: () => import('@/views/resource/statisticAnalysis/land/index.vue'), + // name: 'analysis-land', + // meta: { title: '土地利用与规划分析', icon: '' }, + // }, { path: '/sub-government-affairs-service/analysis-agriculture', name: 'analysis-agriculture', diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js index c223a69..ee74665 100644 --- a/sub-government-affairs-service/src/router/modules/trace.js +++ b/sub-government-affairs-service/src/router/modules/trace.js @@ -13,7 +13,7 @@ export default [ path: '/sub-government-affairs-service/record', name: 'record', component: Views, - meta: { title: '种养植档案', icon: 'Tickets' }, + meta: { title: '种植档案', icon: 'Tickets' }, redirect: '/sub-government-affairs-service/record-base', children: [ { @@ -26,7 +26,7 @@ export default [ path: '/sub-government-affairs-service/record-seed', component: () => import('@/views/trace/record/seed/index.vue'), name: 'record-seed', - meta: { title: '种源档案', icon: '' }, + meta: { title: '种子档案', icon: '' }, }, ], }, diff --git a/sub-government-affairs-service/src/views/home/index.vue b/sub-government-affairs-service/src/views/home/index.vue index 78ebb27..b3888ca 100644 --- a/sub-government-affairs-service/src/views/home/index.vue +++ b/sub-government-affairs-service/src/views/home/index.vue @@ -6,13 +6,13 @@ 综合数据统计 -

农村人口

+

人口

万人

耕地面积

- + 万亩 @@ -38,7 +38,8 @@ - + + @@ -51,14 +52,15 @@ - - - - - + + @@ -85,11 +87,11 @@ const state = reactive({ }, yAxis: { type: 'value', - name: '亩', + name: '万亩', }, tooltip: { formatter: function (params) { - return `${params.name}：${params.value}亩`; + return `${params.name}：${params.value}万亩`; }, }, barStyle: { @@ -101,16 +103,16 @@ const state = reactive({ }, }, areaData: [ - { value: 230, name: '耿马镇' }, - { value: 165, name: '勐永镇' }, - { value: 217, name: '勐撒镇' }, - { value: 200, name: '孟定镇' }, - { value: 305, name: '大兴乡' }, + { value: 2, name: '耿马镇' }, + { value: 6, name: '勐永镇' }, + { value: 4, name: '勐撒镇' }, + { value: 2, name: '孟定镇' }, + { value: 3, name: '大兴乡' }, ], breedingOption: { color: ['#41b879', '#fed500'], title: { - text: '种养殖综合数据统计', + text: '种殖综合数据统计', textStyle: { color: '#333', }, @@ -131,9 +133,9 @@ const state = reactive({ }, breedingData: [ { value: 230, name: '种植面积', unit: '亩' }, - { value: 165, name: '养殖面积', unit: '亩' }, + // { value: 165, name: '养殖面积', unit: '亩' }, { value: 217, name: '种植基地', unit: '个' }, - { value: 200, name: '养殖基地', unit: '个' }, + // { value: 200, name: '养殖基地', unit: '个' }, ], inputsOption: { color: ['#ffd500'], @@ -192,9 +194,9 @@ const state = reactive({ }, inputsData: [ { value: 75, name: '农药使用', type: '投入品', max: 100, unit: '吨' }, - { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' }, - { value: 74, name: '种源使用', type: '投入品', max: 100, unit: '万吨' }, - { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' }, + // { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' }, + { value: 74, name: '种子使用', type: '投入品', max: 100, unit: '吨' }, + // { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' }, { value: 65, name: '肥料使用', type: '投入品', max: 100, unit: '吨' }, ], businessOption: { @@ -233,12 +235,12 @@ const state = reactive({ ], }, businessData: [ - { value: 28, name: '个体户' }, - { value: 358, name: '村集体' }, - { value: 217, name: '合作社' }, - { value: 128, name: '农资企业' }, - { value: 22, name: '种源企业' }, - { value: 41, name: '生产加工企业' }, + { value: 217, name: '农户' }, + // { value: 358, name: '村集体' }, + { value: 28, name: '农企/合作社' }, + // { value: 128, name: '农资企业' }, + // { value: 22, name: '种源企业' }, + // { value: 41, name: '生产加工企业' }, ], codingOption: { color: ['#41b879', '#ffd500'], diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue index fc4c94f..2ab2ba9 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue @@ -21,7 +21,8 @@ @row-update="handleRowUpdate" > @@ -154,16 +155,65 @@ async function getData(resetPage) { searchCondition.value ); console.log('params', params); - for (let i = 0; i < 14; i++) { - data.value.push({ - taskNum: '20220101' + `${i}${i}${i}${i}${i}`, - taskType: i % 2 == 0 ? '0' : '1', - enterpriseName: '上海XX有限公司', - enterpriseOwner: '张三', - phone: '123456789', - status: i % 2 == 0 ? '0' : '1', - }); - } + data.value = [ + { + taskNum: '202451211', + taskType: '0', + enterpriseName: '合肥丰乐种业股份有限公司', + enterpriseOwner: '戴登安', + phone: '18785733748', + status: '0', + }, + { + taskNum: '202471241', + taskType: '0', + enterpriseName: '山东登海种业股份有限公司', + enterpriseOwner: '唐世伟', + phone: '18785733748', + status: '0', + }, + { + taskNum: '2024111241', + taskType: '0', + enterpriseName: '甘肃省敦煌种业股份有限公司', + enterpriseOwner: '李世晓', + phone: '15685474526', + status: '0', + }, + { + taskNum: '2024112244', + taskType: '1', + enterpriseName: '河南秋乐种业科技股份有限公司', + enterpriseOwner: '侯传伟', + phone: '17485693256', + status: '1', + }, + { + taskNum: '2024122242', + taskType: '0', + enterpriseName: '安徽荃银高科种业股份有限公司', + enterpriseOwner: '应敏杰', + phone: '18423568745', + status: '0', + }, + { + taskNum: '2024122242', + taskType: '0', + enterpriseName: '辽宁东亚种业有限公司', + enterpriseOwner: '杨永华', + phone: '15236989568', + status: '0', + }, + { + taskNum: '202472255', + taskType: '0', + enterpriseName: '云南广大种业有限公司', + enterpriseOwner: '王云贵', + phone: '13888965335', + status: '0', + }, + ]; + pageData.value.total = data.value.length; _loading.value = false; } diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue index b17c05f..b5cae96 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue @@ -1,6 +1,6 @@