From 88c52b96932e39f7d3739c25f900b5a79acfe3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd>
Date: Fri, 15 Dec 2023 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ownerContract.js                      |  53 ++++
 src/assets/images/login_title.png             | Bin 8180 -> 8791 bytes
 src/layout/components/Navbar.vue              | 146 +++++++----
 src/router/index.js                           |   5 +
 src/store/modules/companyImg.js               |  19 ++
 src/views/system/FactoryInformation/index.vue | 234 ++++++++++++++++++
 6 files changed, 407 insertions(+), 50 deletions(-)
 create mode 100644 src/api/ownerContract.js
 create mode 100644 src/store/modules/companyImg.js
 create mode 100644 src/views/system/FactoryInformation/index.vue

diff --git a/src/api/ownerContract.js b/src/api/ownerContract.js
new file mode 100644
index 0000000..cd06efa
--- /dev/null
+++ b/src/api/ownerContract.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 机构合同基本信息新增
+export function addOwnerContBase(data) {
+  return request({
+    url: `/owner/contract/addOwnerContBase`,
+    method: 'post',
+    data
+  })
+}
+
+// 机构合同基本信息修改
+export function modifyOwnerContBaseById(data) {
+  return request({
+    url: `/updateOrganInfo`,
+    method: 'post',
+    data
+  })
+}
+
+// 根据ID查看合同基本信息详情
+export function findOwnById(id) {
+  return request({
+    url: `/owner/contract/findById/${id}`,
+    method: 'get'
+  })
+}
+
+// 根据ID查看合同基本信息详情
+export function findByOrganId(organId) {
+  return request({
+    url: `/owner/contract/findByOrganId/${organId}`,
+    method: 'get'
+  })
+}
+
+// 获取登录用户机构信息
+export function getOrganInfo(params) {
+  return request({
+    url: `/getOrganInfo`,
+    method: 'get',
+    params
+  })
+}
+
+export function updateLogoImg(params) {
+  return request({
+    url: ``,
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/images/login_title.png b/src/assets/images/login_title.png
index d47e846e4389d3d37a81832ccb9bd2e681296a3e..ac0de129ed93ad55d91ed3511700cfb56dea1a9f 100644
GIT binary patch
delta 7934
zcmb7JMNk|Jlf@k}_~1?;xVsG=+&#DjNRYrlkU?f}g1ZbMXn;Wy++~o2Fh~+KxVr?m
z{kFFLulBNs?bGY7*L~=Eedv0B6=qcGUtutd3k#~M2#E+uDTxRQ38|_|34_!?YO2a&
zLSiZsQevR=Fbw+tkOcovQagqdyNH9cv!uPS1fRHrhy$O4v#2nil#`<npNo{Fl%uGq
zi-?rCLplgE1=9MW^cNZ$qr0Yxl5ybtfz6Z8Li^O8&bB9oE`okz?_2_HGrKa3Ny=G-
zqAzwc55Oj(kU-_1QlyrdcOk(&>>T~mFIskVjAD)50va7pbuvvm2!mb2-RAmw6xx3x
ze0l&Pi1nWgjT!ncgrMQE{F|VG@czZ&0E~a}|Kk5Y>AiTT)Y1PlXQfi;?)>H4F-J5O
zS~xdp|2=BI`t}Cm+^@z<-ZKEiWND!2dAdKJXWaebYx7=VZ96e(1LeW;cv(C|0W@{3
zI9LdGU)e)>AP=^l1liHhwBrE3)wJtgKjiF4qMka7W{+W?&X?<%TOSv1(BWl82{M<#
zJHewCDYunF-^50Aexeo>`wr8jrf6-|faVAyVX(ZnHwqGGIkpnOhVau>WUARc2bt8$
zWCQb*>d6$M0E|pzm$%;@AM<Z2K2m*+ZbTVHF=mTg91DmE0NJjG3m#tW?}7pS1GGju
zI3C!cMJqrQR>Wucx=Xl6IVi;@4&AnEs{=<w89+m3i+yv*CPJsyDZn?pZ+m$M&KpM<
zxiCi+Kw6*CEDFpm+FUZ9JF0(v)s(oTdvB3N{N7roHyeFRcfPWr*s#uVC}#C760O-`
z&aQf#&+B10+|k(Z307_y!=DlMgLkRUF(01lNRK!cklWg|a{5y_yvH<<b2FwoExB{E
z+o)va{{WA`UmLQ6@Q4jHtizI4kE_{E+&_kfLiis8{t}isK8L1h@G;1LH}ZbXA-Ny)
z>}^rsB;{d1%~yToQd4Rb3qp;Pl*ImJbcu1DHuv9J82NXoK@kB>4a2sPx}C6!H)@mJ
zQ3*MVZ!agGz_?N7B;9}?q9=hlVmr->(bBOna+RtE>;TjgCxXc5q4(7DAsD~g(z>oj
zAh!Wyt)>BQx31fAY4fdb;93MdGMU&ZnW`J+c1w;2)|+p+*M#U~GC#M~{yZN(^O(oU
zARV?NRs1mI)S@gvmD3t?NvIAHbsmFy*Al6aYc}{CST>B)EAU_=>d-Zi{&4O`{)$c)
zrso1+YURi}`FR{$L?B?W)WdljG&X4r8Cg-2)Gyo;rhYH_^XPrm1_#4P+s&E>iut~a
zV}d}auHi7sT4k1?Yo_s{@B^g9lNT!fOfjcB@Y^3*hx&XeoHcQ2porpv^oKt~^@_!Z
zM}*U#_=1;nY0r%Zr7pmKjApe<ey-oNCJwPf6Ji@%-lX)@=CKuWT2Atd9KKaDgpgmz
zeb*?pNmk;8OOZFA+YL3H>|05v{+Sjc>sM(wmlFAW1!}u+GT|dRKn|p`qZec^c2&{F
z;_LlszYxWt36-y&9qzM@J++K)NWEIdS!VbxALtS-cg&2O(ikT~Wk|{U9c+tZGhdt+
z^2}wm9edEe**;gYsT=w=g1>4t0C{i*y@mg}-s?rY#%Em)9^2HfO0Tjfwb$yP{GG%M
z)1x@1f6;^RDjsxhKm1Zq*>==APqqSZO)M>7$O{o*ov%SgY(A&T^E|DMwUT^!SvUT<
zm3-N!wp+$HZ$5YRHq_w@Z<>xC*SJB3j98W-c)u;kbD}L?ZoMr28DjPU31K}{@d58C
zAN2lq{Bl;XZ9P(wEZe1;GEkP1nJ#6dAP(ZnY;n^k(Z#dL?MPy?cu&wp(ofE5tU#M_
zpK4QW`ums>RFKfH&o+|A?933|?osekT6=FrB)zN?DfOKKzPQ%m<;3>e51gvxa9)&v
zDtM+y0H<Lo;F+r#ybeopgY=fYX~Le<A>?FQlWP{=Dv$B|?v_JQATE48u0fSun=z`h
zgNDr1FBHT2C4MQdhDH~e@;CE~`3TW1?KhXrcLnAFvkr6_-;Te-I&Zi2xt}c1K$UT!
zM4|2RCxsqSi*o6A4Ge{IVrI)y2`ckJ_a=$&67L2V4M{jy=%<es(jh0Qp~>DS*hT7j
z8gj4((*6vo6WqKv?P=QJhe=lBOtP$k09*?~tpNj`8Cc&=t!&0Y{8~jVafG@W9yKvk
z@Dr*!#xa_hrj*1mkbF+EOJuuBbF~YPtFaeaA6MK1Fl6)^WzOc%B(Rn71Pa<@e1((x
zsrm%SIfaK3Re8kqK_J&VabM@8>q9tuuyc)f9uwBL2?O+`kaK-`xLL_E!qnKOr=im4
zZa)qj`L_@P*Fam<lgYSPx(}+j%AljEe-tyI=R#-b?5fU`aPR7LWrWMNoY|NAnmL<L
z*(u#)eALQJx`brn(WIKDP5<mIqmzD-Le2JiLg1*$sQ^PAM7iwZ<ZoAod`0`WFUHkb
zuIB#;HgQ{**hxQIX{i|tconISz-8`}U1<%6OL1-C2%GDlBjB8{GCWRkik5akZ%K-N
z2y7^`-eQ4micb@vg*xt}SQlY?Dl8oHh9mk8gH>p937_tPD|ZOYbS3_t?da1J4zuL`
znF>;W!9fU+iOyHp_4%dh=!VX)&8J~o@&d^>l0#~=b?#<`Bb@&1<k4#6*`3J1T+5d~
z`?otjy?_O%P9G0^adsR7e|Fj%jvoqjlQi=cBi~r&yeJcY-7~no4@YsmLN0h|36e!}
zLGT6=<e@G(<EYt@_GX*=^Y<}QUlC4DX6TmRQoSI^UD)Q;ooMtj*3@ZD1>)vtXVj6<
zkH8H25~rmJe*2#N)}NGnq?=UO|FFuhdmGpPxBB?IJ^2+$eiiL)w&3!W1=os-AM)Le
zJ+;4PFE1)M4)+*$gz($E(+C^M`;WC2{`jj5Jm0d#YW$^xY9R46YGT~?%eS!Wcuxiu
z{CEU$;CELqW~Ky>l-Gg#1-mZq5zT22nYTUE1T%p)<*Zci=uI;D-Jj?yhRE+0He)l5
zuj<EO+RM_?8<7D>7elppqj)1eowTns$hS=x2Md$W?Rlyh{X#z-BwEXk{shCkA47Q*
z7s5Ef*WKOkQ?T>CY$%=?P9jW_Nz|0*24Rp0b8CjUqOxcoB4>r0kn6O+0FwcxTz>a7
zCf4ROF~X3zeAzQY)p+OTZ@A~!U&@}Ra^={3=eFK!=H)yG>OZzId@#`vAfIU?su|F8
zc%@vJJA+L4+qE14XqS1Gy~2F#eJw1=AhVRY#>q#*938P<-6}y5aB-YcNn7yM^k)o&
zlsvOdm^m(GyE~#)S6~x6oowDjtAkjUiUYkF%H^crR%+9LNesUUHT4@ssm_qxHVyYf
zlNZ@>Z0cFuyb@e2ii3~#9mQFJ2jrEosX6s|RJjHQX@T{~ln@`$4^~o8$-{5WdELMG
zoMlU$fjiEscdj}DnBQXrEOIBe6JsF@vBKc$BRF;LX<N}^6$+D-w++(@r!jO2=ZV3+
z;7R<tRNqHHL6<a*$XBl0#pfYSt#eLT9CZDAb;r5gX@+Da#g)>tdh7J+WJ!YZu)+;y
zUiPcXpNEj;FAJT~Knp1@XH{C1_K0bvgJ2W=J;h9GxlM9aur$MLDMKE;s}bZ|yw`iy
zXTN=wCn#T|D^+w~r}^1%<k~79zuNB={E5*U^xe9aR}-km{U-P^nUpWg826P5x0^z(
ztP1&=bxL^*Tg!8nga$c6n&bVt#_+~l#SY#|{X<g3pvc`IlkfAI5_^KmP0-e{oF|&V
zC0PlvHt0^Kp2gprhYG(@W4!<p=Mf$Ihn<F(OSgf&O)F4`Z7CK=$HFU3p_mm|Wbo8j
z|B<wWNUBb|G-&}4X*A`2xRYo=Lw>s`&Hh`rJnNUWjS<dui>P+)Mq)q*I|p%3eotfP
z@YqRPBMaJP>S%tEV{0i&?$BZE;}TzI$%6@s`0!f{JdHt0oZ{>9=izJ!;1yoJpQp*|
z7FI@0Oa(_g8)-tIHgzH(+AWzmp-T=YL&B@hVO?o9boo3p`71mw6^nV)mqdB^gH%3h
zLa2HXiy-wVZ~Ae~EHNytu~7h0#6!EwznT&Mt<(wep|w2lNBXeF3&*d}k&!T0HldVv
zR?23ov@MA4R9h(hp9^M)2R*+kd;9x|k@A*B?`6Y92CFW#fjIk;cQ4_NUilLF4YDof
zu_Ln{8XyBpNoFIeeyiSM9f?i>de0n^p)8Pij0Wttt2q;v(9iQ0lP9p}ZiM*w5-vW>
z!oE({a|rXi0sp4ZN{ef0e9-)a*AwXr^@U?Mn_$B{lD#=LerH2^e-L+rV{>X90wgck
zeNca;#I86efYhW;=M~I@AA`BZG1Koe<f&7F-o`n4dHRChZ1<>lXh~9nDtXj@46?iM
zauEkjh*C$t<`OL{JbRs+2L#uGd_F$?IbG_8F^sJGIqu?15CQ_*Lb|`>D>PyK<wm}>
zL`)MjeVPfyAQy+Uw2%&`!EM@Ua{xsWJCBxQqd|K8bm=KIu%tDa$oGtnYpJ9I)<10e
zk7`TS|L}EwI@vXlf^l#6lss0WC=ZX{+XQ0Sl{*LzN2|{()a7#pKRBv%^OMR;vZJ4{
zD11y9b&58BUCFR(xbsHs@qr|$d^Tw~hdmX)@fBLGP(CRn4e$y$(o(0ZVVlROD4<Nf
zoz4Q4?$sbh&qE~URx34ge}e1ZAxw{|R9GS#{Gv#^snACYKTR=;yuuRtVTmEW@TKVE
ziOa6OwoDugUN#}Y#Y>a$<zH4+!n}A+AFiw?-c;~72_*nXG!_y(OE=2(ec6r=_tAWf
z;#Cua#UO-`JhcHw8mxQHaEd-#5!>Ha);e$SXp@OEY2i&N)n>Hnlfv$pAV8_UjQK|%
z+alFKQ>%O7MXlAUD3*Xd9i)@P%}1bm;YLZ{Y$K5qL9;b9kQ4%O4s*o^?T}aq>6xNS
zyOvHgCx(G8J1j#9ga`44US3!ue(+til_JpYvJN0-nIiMcO}D}rQryJn8BJWLIWJIQ
z9=S}^XL%Fbk*wlsK?^4>TJvugCMf`aEU{R{m4?KoZ@y#xK-NTz@v5oe?cdzke!uUQ
zTCCHCe0^B78jzJwx0T*3SMBy%dhRnLs9UwV<TW`Qmh-vCl%nD=;cYJpHM6l1#`%K$
z+<y#$bb6=XLKWatwsn^qpj!Dk;`mT|#FFwP*UVwEH>O4wx3y&uKu+YIyl_;80x4^T
zdD%s?8x{1vHUvf<jH&YerFTPk9)J@Ww$!)4WVEZGb0EI`^i57C%XQ83r0gj@<Kh$E
z*a^b6GL=UXr_vW%$PwPioyY*nN>AFmM^;FWT2-%LB?eHS1hvhjY@E$b%NZL~isBZI
zNm(c_ti2Dv`ngfl?g^_^Ucy`Olka`-pX*OK{-TK+Z(?IX4H$t5OcQd$Ho>LD?=4i*
z_+Ck!e#T|7#-nRa5^c6%fAD2k0Chq5wk%pmMpRQQxSu+c=m9RNcxi8gp(=}3u@GZ5
z&Hg1f$<C{<IyR04LOmIh-%1xF_*mt8KKS`jB|uvlQ5zi<-d*U=RQvxr(6yv9Lm9?{
z9RVANHQJV!5$`gGq^!y&c<N(-*YS%1OP<g+W;99ulc<}RvAQ0&8wCrRn(CC)XD{<i
zpNyG0Rp^KLcM5+_48Hhevsbei`U`>$_6%92%+=Z*Mr?iKdCs|EDra=0J^12)^gQGu
zei3E=``o}a*n0X%ww5ohR^cwapBE&-$KHuW50AfGU~4U+qgxAc7b|9nYgjRuc+`C;
zSfp~<An`mvYSVnWD^D7SYBMNjDapy(4uwQHvOz^I=BJLde{~Gl*}mv2Xn_DXxz|3>
zfNij_@S>cd$B7mO7v_D_YRXL7ElQw6*JWQ?ALTjxPo?Wz^6A`dh11)AdR-|ejH&v9
zK^^_Nz6Ff9Q-odB*^NlRg6I(om~#j(v`F0fJjZfGxBR~Idx_Ev_~i}$;rf>6I5{pn
zTRkP&)5#Z5g00yXQu19l6arcW+j*@Wr#zlAJW@gHO^g5eeBU7x&ki)UxEVh7$xzj>
zhHRU^_^gXB@D(mDElS0A$^OxX{3cS$BH!dnK0!+3yohmrT>e#hn{yhUy}SxUJ!}cd
zkt7q48|?eDtXoKh%kT&O6V06z%XwrIXAH;9h54h^Z2H8bhH197IRxj#w{OE7mEDay
z)#ssf_EMdpX6HJAK-Y`(BmI8(y%>n&J=nXsK`_hZN<MOY_@HCp`~>Yc)FQb}D)X;I
zuRwU3ux#n-7&iKbl9z7B-XL}`TqlL2Iwdn_&orbSZblK1nFG(}Rrkz(M{9E+U+Tp*
z(uE%cTFuvJNt!f%2hm*ia6c()lHDuZ%&mviy`b8i-jStaM&kq8kMj9nfELZTZus4;
z6Si2WDGk-yy|#p%WRe|+wiIU=yyka|ZviB=J72=D9(=-sw<%FY45PLCZ=3>DaQdI4
zJuvsqL=@o$RPs9s+LOHFcziOHdZt5=`VB*)0E|^#AS%Y-4ykm0j2M&g;3h0z#=-l0
zE6S2BLvDUw&-U1kw^VS6N=m(b;AuOK_U*YR+kLcIU>kE&uo2ygRFW>fM;<tC&*P{a
z^+waKL;L?W>#!n|1?nX#l<~^^h~-Z4VeSMWZe!*vpBX;rSteEaN66N^Dnc`$r^RoB
zLv%1Cxfe_+AwvFlfL4dwGdpG|$6-8|^>iRA_8S#hv-p77TbpgZ79#$$-T-z=1&La~
zl~lEvC02g|P8aXUqMl)zYPYu#*6Mrq7S4?}JSTK8#$yd0+VW<bDSDmPo~?L_%`f4~
zI`E`Va@%T<vOQ1H-F~>AM1tf}BeC|3Zs<+`qinZ1L>1V<o04Q3^dXqkC!&OBp9DG~
z;?|kOoDozS+@z^RV9+3F@&QV?^h__x?zK%yoZ{!*n|jCJObKXb-ZSeW+wb02d(uqj
zHc$P|-s=*P_N*I3NL~3OLZ{rUjqE&wn=UPYKKN^mv4rIKhZUH47;-iiQ!b=x0!MOH
z%N|xwkis?ol?<n4=>5-xQ7C(~!j7Lzjtnj+kh5E0>y&zlk)`62p+;5Z=Gr+nCb~a2
zf-5EicMhlAt-)Q{_*zcQnA8zI`V;G#&{r^s{i{byAGWtAaWcAHqPcL)$%Oq+kN*3Y
z!$w`#`hgw|Iw9F2?*u*W{=8*eh8vvg7W3eXLPEQX|LA`7gppxB`)XzV%?j@$(WL=!
z^jXu>qx$s?B11cg_he0tj$nSd@3Zqpw~~Y*iy2FU7fsZxhRldN9>W+?GSAbDA5VA0
zLAZ$?CV7`N`B<_Z?~R2C1)M~_!WXWU&!(uG6c!}%<T3vio+tyAhov?@7a#Ydl3cXJ
zf;3o_SrKl9cNnIVoqo~DPwyr<i(WKRbC&)NfSD4!ezmzJ!)CH_cN3GO=k*+dbv<r9
zw_4+Tz@vuIGxccE!M`?7wSwRZyA^(0zW5U=%W|L%jn1NxN4PpI5BO^2^MmWPp(if~
zxjs6ZGJ$jO@8nfrKgIx2u(0O%OYoimL}sWpoB*8}I-ERzeZOEQ%4mo8ffMNMpW})X
z#3htb=%gXzZPmpM^s!D^c=-+#P}LiXZx3HNmh%;y-lh?zn&pg$95zll*N2IFIu&;x
z`Inx?7k2Z;#Z{^ASa&|n9_s#{R=b*n1z}EpvC$5sv6H<fF$HZg)UZ$yNecafG}7h+
zz8UYnAj995x$uh`*Sd>Vr9p$9K#Prv-VqqWSfqfy$^h&^!l4k&6p~W%`7*N(97aWY
zS%Nc)_!C~@!7#iG1{ERqz`Cm5X~H}DI$2<coT?f584qb|5ysvrljB0#n9?JN%xsBK
z>Bw&LEBrHq))gaEAYd0hM{NedoXd=y2k+HEAs`}*0xTA5gM!!U4T*j`YcH%eW4+bb
zx<#6lKybe+`@{h|ci?`Ia>^nY5gO^9AMX94>v#yG>q}vSU1K$dE443+#1;DCc3VYA
z-TSbav{cQ7@|Dn!nA+19!ncbp=f)w(2|hQ^gP(J~PATaP{+OgzMC=fzsem!ABdLWk
zfXJXFAl1u`%9GbX8%NRt6u1|NOY?4M%y&%qOePV*Gl+i2ju2S2w7~i--{Ft?S+^?!
zpuRZj=Q#|ZEXsIwf$!}%fBe0jfh)ESEcH|!cC;WNNRIxfH-8vA6H#%bC8?r{jNEk`
zA3DiM7_H%Yqc`#umjyCLqJkF`jHRPbFmJMuq?05126<r$dJ9?`XMQHM32%uQ&3U`&
zUQNjog)PYfYAuoUdM-|S)FeKl+*FuD5ZIUTy4b^oPpy$ia>nscPeSx2%aKXi?(<LZ
z()+MsVsuB9vV*N?>>N7v1qCB?tMSM3=_tqaENiTUQ0lnmcp}I-qm#7EM%W56QGM$Z
znZE!>;nui{W`|#<hg!7qf<Z3v>2#zbNoZKgepZ!SKPb^ktap(DbUZ^LU;UD5{WA`8
z$NPIS@gWJ(MH1eB`~z)ZlR-`OJklC@Kz@J>AjrLb_zVNE!UT?H1!SF$wFd7JLz}Tq
z224{xhESD?PmoN8faD6}v*QH0?U_iTC8H<GJFpN=)$I*H9p}aEA~ZzpPKJCFe{`GU
zkRWJ~8KyOG4L<ZO!(pH$3&GV&)(H#8j-s1?>qlz&*7w$$eb1M<kk_q6P{fQ~RHhe*
zsUG|E&q2|)_uV+G?2kXY9*c{}aQfSJLI{W<Dv$25fh3>2Qo^ZFBIt=zw890~eYLG|
zDBn0>qAY&yS>!<n?1&2v?Ru_+LwL3f%Tf_HK?UN`-El>(8S!!s91cGd7x0*0{z0rG
z>AA6^J@R8h98vm!TzdX71{v<hhM(6=C%^kkL=5GDNyGcBIBI^&tvHA1pDlf*t!HU4
zsB7{jgD8Vu<;xswq7Q9kIO*UF(1KYtaM5N~bjg)<6JO`vn#~nJG7H>kswqfo6sXU~
zio27|)TTr&@P3gvRO5M#zB|;E1Irid@DM49KU355>02wnUiDM`eRoU4uu@07F5eve
zS0@k{7vfep7k?LYxSQZR&j-?6FebXT&ID@7LxvRafsWQ01i3VPDZ;l;=D@_!6b)&t
zaxyiA7D137ZTYNXy7H9ns6VWLZgKfTe2dFfy@?Wy!ghmUov&StJ9)|*jBhEN_T59<
zi}nXMd;4E}GX%ccGAdNq#GSnk_eu6CKOZ-!Gd%tBU3U51Y{@^rr1*}q8|d3=RzLj5
z2IK*+#c3QZh28hNycKp<l;sE1jvq`XwE4Kt@X9*i=0#bu)Zvu9$c3dyKGhw)-ywM8
z=od=>C)sU*DGgckFt6xoprN0TW7w9(TyJwxy>!!Qi4r5hcNh%1_IK`pjS0-4;-hi)
z4zaOex$|~ONFgpKJJ)_m;2D7Db&t5jETl6MjVU-yl{w1S$L%Mfs}VaiXeBP4sGB|<
zDF9>MTD#@M>|J(zX|*HF%&)Xl^IS-tdZ=}eIoUP3P3Juqs^Aig8<=PE@hGZ}z=bqp
zIU5k&4S%N?y0P69h-M^6CPt1v0SJr(RF*UPiTT|h@Sa>vqHj!G%wLE+{Lrw=hSZ!G
zo^#V>x3Rdr$hEmGJ5YwhSmqMDn~mC;4uZ9M8vv-h`0aY)R>F%LY__uba%4&n&8%(k
zb#@B+;)}JbY!dWl`F-w(iGtgT%WfW9>%Tu2&J?A27uek9mKaaM-eiRFBPB0#;V*B_
zmD2>~aH17)q6UR-&>90}wv=*MAuQTlul6idSEoYe>wPJ5(r&M8dFhj2$*TcAAXf&I
z-!Wj;dJ-{u%@>O3Hd~&NaK1+YxoM1UcV0)f=QP0L%F)V;ZB)Ansdn@zyX8);4-ICX
zl6BrJ(JyuQuz#c^<hLa{FQ&d~{qUU1$?TYGzBwtV)P_6Q%3_CA5Yh1&!qL&p3AN>Z
zbSN*1%6Rx7eAS_7v(T=pCtOKQZH;-~gQRB=7CWrKLkxR&8}DnCtYNn?Pg9PZtHK*b
z<}XHufNt<QI@%i=lmHVGlM!%CXXCieINSj1ntusYBCc5ewd2{qh1TAiv>yyTI(DXN
zfL`sf;cT>Z_Tdt5YfTHt=j~8V3PLF?mXPB0J*7*Q*jv7G>03!ZH(%2iT?ko?>%`Q7
zr>Qs8joiR{G6OSl;*Gs5l9nip!Io6ZOR`(*o93+Z<qrvjoSnkC2(MF)=%sn_f`&F$
z@n=0Fh<2WdWfI1z9v4jO_0X4RB9tIW4)0G2-1hZQ*%oLsac_fTgiMV(NLrVd*J1?;
z-i>blC9RXG_!tpKmJgXbR;HFl5AQx@yXX0jOS=*$Etc8BRGF-945UIsvkq@2{~vpG
z8cSf@G=c~NZ31_e<zK5;(!eeTkS>R%OqV15s27fo_GIW^Yc$y>_uoyLs=6u&kX__|
E0T%4>VE_OC

delta 7246
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
TP;xfuzai=>+R9}x%h3M<Hrnxe

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c71bc18..ff700b4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,14 +1,41 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <breadcrumb
+      id="breadcrumb-container"
+      class="breadcrumb-container"
+      v-if="!topNav"
+    />
+
+    <!--图片-->
+    <div
+      style="
+        display: inline-block;
+        width: 66%;
+        margin-left: 30px;
+        line-height: 40px;
+      "
+    >
+      <!--<el-image src="/images/logo.png" style="width:100%;height:40px"></el-image>-->
+      <el-image
+        v-show="this.companyImg != null || this.companyImg !=''"
+        :src="this.companyImg"
+        style="width: 100%; height: 46px"
+      ></el-image>
+    </div>
+
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
-        
+
         <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
@@ -22,12 +49,14 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <el-dropdown
+        class="avatar-container right-menu-item hover-effect"
+        trigger="click"
+      >
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -47,15 +76,17 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import { mapGetters } from "vuex";
+import Breadcrumb from "@/components/Breadcrumb";
+import TopNav from "@/components/TopNav";
+import Hamburger from "@/components/Hamburger";
+import Screenfull from "@/components/Screenfull";
+import SizeSelect from "@/components/SizeSelect";
+import Search from "@/components/HeaderSearch";
+import RuoYiGit from "@/components/RuoYi/Git";
+import RuoYiDoc from "@/components/RuoYi/Doc";
+
+import * as ownerServer from "@/api/ownerContract";
 
 export default {
   components: {
@@ -66,48 +97,63 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
+  },
+  created() {
+    this.getOwnInfo();
+  },
+  data() {
+    return {
+      companyImg: null,
+    };
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
+    ...mapGetters(["sidebar", "avatar", "device"]),
     setting: {
       get() {
-        return this.$store.state.settings.showSettings
+        return this.$store.state.settings.showSettings;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "showSettings",
+          value: val,
+        });
+      },
     },
     topNav: {
       get() {
-        return this.$store.state.settings.topNav
-      }
-    }
+        return this.$store.state.settings.topNav;
+      },
+    },
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
+    },
+    getOwnInfo() {
+      ownerServer.getOrganInfo().then((res) => {
+        if (res.code === 200 && res.data) {
+          this.companyImg = res.data.picture;
+          console.log(companyImg);
+          this.isEdit = true;
+        }
+      });
     },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+      this.$confirm("确定注销并退出系统吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            location.href = "/index";
+          });
         })
-      }).catch(() => {});
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -116,18 +162,18 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -164,10 +210,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/src/router/index.js b/src/router/index.js
index a25650b..af60a5c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -260,3 +260,8 @@ export default new Router({
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
 });
+
+export function resetRouter() {
+  const newRouter = createRouter()
+  Router.matcher = newRouter.matcher // 重制 router
+}
diff --git a/src/store/modules/companyImg.js b/src/store/modules/companyImg.js
new file mode 100644
index 0000000..9f1f1f0
--- /dev/null
+++ b/src/store/modules/companyImg.js
@@ -0,0 +1,19 @@
+const state = {
+  companyImg:localStorage.getItem("logo"),
+  isLogo:false
+}
+
+const mutations = {
+  SET_LOGO(state,img){
+    state.companyImg = img
+  },
+  SET_IS_LOGO(state,isLogo) {
+    state.isLogo = isLogo;
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+}
diff --git a/src/views/system/FactoryInformation/index.vue b/src/views/system/FactoryInformation/index.vue
new file mode 100644
index 0000000..26110ca
--- /dev/null
+++ b/src/views/system/FactoryInformation/index.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="app-container">
+    <el-card header="工厂信息维护" shadow="never" style="min-height:600px">
+      <div style="width: 98%;margin:0 auto">
+        <el-form ref="contractForm" :model="contractForm" :rules="contractRules" label-width="110px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item prop="organName" label="工厂名称:" label-width="165px">
+                <el-input v-model="contractForm.organName" :disabled="isEdit" maxlength="20" style="width: 350pxpx" placeholder="请录入工厂名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="organJurPerson" label="法定代表人:">
+                <el-input v-model="contractForm.organJurPerson" style="width: 350pxpx" maxlength="10" placeholder="请录入法人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="organPhone" label="工厂联系方式:" label-width="165px">
+                <el-input v-model="contractForm.organPhone" style="width: 350pxpx" maxlength="15" placeholder="请录入工厂联系方式" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="userName" label="用户名:" >
+                <el-input v-model="contractForm.userName" style="width: 350pxpx" maxlength="30" placeholder="请录入用户名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="taxNumber" label="统一社会信用代码:" label-width="165px">
+                <el-input v-model="contractForm.taxNumber" :disabled="isEdit" style="width: 350pxpx" maxlength="20" placeholder="请录入统一社会信用代码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  label="工厂顶图:" label-width="165px">
+                  <el-upload
+                    class="inline-block"
+                    action="/prod-api/common/uploadMinio"
+                    list-type="picture-card"
+                    :headers="headers"
+                    :auto-upload="false"
+                    :on-success="handlerSuccess"
+                    :on-change="changeLogo"
+                    :on-remove="showLogo"
+                    accept="jpeg,jpg,png"
+                    name="file"
+                    ref="upload"
+                    :limit="1"
+                  >
+                    <img
+                      v-show="isShow"
+                      width="100%"
+                      :src="this.contractForm.picture"
+                    />
+                    <!-- <i slot="default" class="el-icon-plus"></i> -->
+                  </el-upload>
+                  <span style="display:inline-block;position: relative;top: 60px;left:20px"><el-button plain @click="uploadImg" >上传</el-button></span>
+                  <div style="color: red">注 ：您最多只能上传一张图片,图片尺寸为1000px*40px,并且图片大小不能超过2M</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          <el-row>
+            <el-col :span="24" style="text-align:center;">
+              <el-button type="primary" @click="confirm"> 保 存 </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import * as ownerServer from '@/api/ownerContract'
+  import { getToken } from "@/utils/auth";
+  export default {
+    data() {
+      return {
+        headers: {
+        Authorization: "Bearer " + getToken()
+        },
+        isShow:true,
+        contractForm: {
+          id: '',
+          organName: '',
+          contControlId: 'HT001',
+          address: '',
+          postCode: '',
+          jurPerson: '',
+          agentPerson: '',
+          telFax: '',
+          bankName: '',
+          bankNo: '',
+          taxNumber: ''
+        },
+        isEdit: false,
+        contractRules: {
+          organName: [{ required: true, message: '请录入工厂名称', trigger: 'blur' }],
+          organJurPerson: [{ required: true, message: '请录入法定代表人', trigger: 'blur' }],
+          organPhone: [{ required: true, message: '请录入工厂联系方式', trigger: 'blur' }],
+          userName: [{ required: true, message: '请录入用户名', trigger: 'blur' }],
+        },
+        fileFormats:["jpep","png","jpg"],
+
+      }
+    },
+    created() {
+      this.getOwnInfo()
+    },
+    methods: {
+      changeLogo(file){
+        const isLt2M = file.size / 1024 / 1024 < 2;
+        let suffixFile=file.name.substring(file.name.lastIndexOf("\.")+1);
+        if (!this.fileFormats.includes(suffixFile)){
+          this.$refs.upload.clearFiles();
+          this.$message.error('上传图片格式只能是.jpg,.jpeg,.png');
+        }else if(!isLt2M){
+          this.$refs.upload.clearFiles();
+          this.$message.error('上传头像图片大小不能超过 2MB!');
+        }else{
+          let vue=this;
+          let url = window.URL || window.webkitURL;
+          let img = new Image();
+          img.src = url.createObjectURL(file.raw);
+          img.onload=function () {
+            if(!(this.width==1000&&this.height==40)){
+              vue.$refs.upload.clearFiles();
+              vue.$message.error('图片尺寸必须是1000*40的图片');
+            }else{
+              vue.isShow=false;
+            }
+          }
+        }
+      },
+      showLogo(){
+        this.isShow=true;
+      },
+      handlerSuccess(companyImg) {
+        console.log(companyImg);
+        this.contractForm.picture = companyImg.fileName;
+      },
+      uploadImg() {
+        if (this.$refs.upload.uploadFiles.length>0){
+          this.$refs.upload.submit()
+        }else{
+          this.$message.error('请先选择图片');
+        }
+      },
+      beforeLogoUpload(file) {
+        // console.log(file);
+        // const isJPG = file.type === 'image/jpeg';
+        // const isLt2M = file.size / 1024 / 1024 < 2;
+        //
+        // if (!isJPG) {
+        //   this.$message.error('上传头像图片只能是 JPG 格式!');
+        // }
+        // if (!isLt2M) {
+        //   this.$message.error('上传头像图片大小不能超过 2MB!');
+        // }
+        // return isJPG && isLt2M;
+      },
+      getOwnInfo() {
+          ownerServer.getOrganInfo().then(res => {
+            if (res.code === 200 && res.data) {
+              this.contractForm = res.data;
+              this.$store.commit("companyImg/SET_LOGO",this.$store.getters.sysBaseUrl + '/reportImg/' + this.contractForm.picture);
+              this.$store.commit("companyImg/SET_IS_LOGO",true);
+              this.isEdit = true;
+            }
+          })
+      },
+      confirm() {
+        this.$refs.contractForm.validate(valid => {
+          if (valid) {
+            this.contractForm.contControlId = 'HT001'
+            if (!this.isEdit) {
+              ownerServer.modifyOwnerContBaseById(this.contractForm).then(result => {
+                if (result.code === 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: result.message,
+                    type: 'success'
+                  })
+                  this.getOwnInfo()
+                } else {
+                  this.$notify({
+                    title: '失败',
+                    message: result.message,
+                    type: 'error'
+                  })
+                }
+              })
+            } else {
+              ownerServer.modifyOwnerContBaseById(this.contractForm).then(result => {
+                console.log(this.contractForm);
+                if (result.code === 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: result.msg,
+                    type: 'success'
+                  })
+                } else {
+                  this.$notify({
+                    title: '失败',
+                    message: result.msg,
+                    type: 'error'
+                  })
+                }
+              })
+            }
+          } else {
+            this.$message.error('请录入完整信息')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  ::v-deep .el-card .el-card__header {
+    padding: 15px 20px;
+    background: #F3F2F2;
+  }
+  .inline-block {
+    display: inline-block;
+    /*border: 1px solid black;*/
+  }
+
+  /*::v-deep .el-upload{*/
+  /*width: 500px;*/
+  /*}*/
+</style>