From 6e828623078eee42df47cf3b32896e8caa2ae2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Wed, 1 Sep 2021 09:08:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=E5=BE=AE=E8=B0=83=E5=8F=8A=E4=BB=A3=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 +++- public/favicon.back.ico | Bin 0 -> 67646 bytes public/favicon.ico | Bin 67646 -> 9967 bytes src/military/fetch.js | 5 ++++- src/military/notice/api.js | 2 +- src/modules/tpm/NewHeader.js | 4 +++- 6 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 public/favicon.back.ico mode change 100755 => 100644 public/favicon.ico diff --git a/package-lock.json b/package-lock.json index cc716566..84bb726c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19205,13 +19205,15 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true + "dev": true, + "optional": true }, "is-glob": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, + "optional": true, "requires": { "is-extglob": "^2.1.1" } diff --git a/public/favicon.back.ico b/public/favicon.back.ico new file mode 100755 index 0000000000000000000000000000000000000000..29b4c3af1297226b6299c44641bd21eecf1dae15 GIT binary patch literal 67646 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 literal 67646 zcmeI52Ygh;7KdjOARr~EG!Y440mTCNPRL9jpqHXuL*EGXDO zMfCaXs87@ws-P5UDyTs~K~$nxA|>;_GrM=W*|gncv%A^s2n8Y(h)^Ixfd~a66o^nDLV*Yc zDj)^M&fXS%^@L68+SJVzu=N$M$!)G$rCPI{-fuA4XX87c-HAYM^TjdL`TkVLy z@w19YlrU`Z@(ue{y)K`q3x}+UI<4>WT1|Q`Yj#r7()be-Gp}cRi2SwS-7xW%b!y7| ztmq!Mu0OVA|COzqB`<4!TA$@rPU^l?&06$*KFT!fwM?DbXL(i1y0lSZ=IxXoneygFJnd0V~y$xr$24aR{p`mIo{u3Qz}wCA$Mw5c2Q9eP5y%n{UiVB@5v z?N08syiWV;*Er6-`qN-kuhh?cJp($Qx>)^t$eL&u&P~DQLa@22VM69a+Pbhox6D=b zyMD5h?JwCHCT31Nx!1B-Xkngz{-D)L#l5YXU$&x7T#uzgIX*||#QvF5X2)TlM>X%e zLTRl9`{OA$jdK2gzqD-Z|IN0W=d9s*FLVAu?jKA&I#EUoo>k}UD^|wz9lOENdBo?X zZnHN9fVsNi!7YmCx1>I^8g%_+J9W&l>dfyE^1oB(^_-u=b*)-oxhe{|=uPnfzviN$ zYgE#$>l|keSXmW%)}y{>z|WToPSpP)=)TB>^A6f|K-y<(tHFuFB@oYH%F zzBW*JJ5y=;Hewp?%8C)a?%yI_1AvbxZEO21KU{-?mEtqW@lPk;UjZ{)E3!uB1{ zSu5?LehX=*@L38xGK%dQc(FHfqzk|8srUJuJD0Y!;rce@&x1bg*%CN^CD-2xjh^7# zQp(-u3vFC9%%u)X&hZW`g3XM8Zt}0Fj|9kLiRrk_QM0U2I zE}s-uW&n=o)<@P*cj1*k*?#Al`>l=qZ?5D2aLns|P+Yw!^G9%aA3SD(%k82|peqin_uf* zSlf8^0(iPI{O1kZss!vp>LxtUoH{QntlSE6T=?)H^bmb^fbBOh+%FsZ+0fv3e*ff} z9J!8sLAp0zp9~c3q|Wfv@I0T*Ua$j3MChvuW%4K-D+$9H(9FFFJtx5^SuR zjCH)m-n#I-Yd=-TU6P^DQy0TWS^lb1q#XZZTm(IH(L*C^cl=m&9$B)n7q+<>W1v7Yg5CEN~8xVW&s|d~W(>#=D z(x7YRYWzsYH%%_w-{Y$?z(=a0&tIajDZ~~KKV#5zKF|LZ+jcoT`3ioY*Vtbp$EcIv zd;!61UumBWT_!}Gw?z4SZiBIe!X~Ut`7=se#}eM31K!VL)3n1^TC>lX4bky8d{&8i z)fRsY^-4iLZKmvy8i$v#ttIMT^n;(EMVm&6rL+4AlMmuWLS4x21orm{&Ln8FdeI_&$*J3zcVKqrHaB7vrtJFAovD$aKAV zt?>=v3%w8;?+R4A>Gw04ql=Nbs-hBeTT7{&yARJf4DVl4 zr*npq`Tep=#0yaL46y}n#_uV9>@uYvvgT99ASZ&US4|o}=NpCntC;JoMIG;gPk$-v zI)*~|=)NzZ(@7#9%Q{IvM8;I7U%ptDZ5RFm!>hy>*%qIqF9{n#Y@ld(p%=8-R+jY) zg|bCPO00&nfBHfx->;Q#aFrM+flH6fz;1=&H^woJHN6M<6 z!7djW_d9&v2_8`2@69O@t$e*nVg{_8H*2__y}LC=f0je zFC{t=UTuy|@Ie{W)8Fm(xjc9~L-buq=6c+OD#4D#6A^cF40L_L-*knizhk^1@e(Dd zS>9U`N3SzJEc9bz>iVX?>l*Cx7#rPMGyY>m9A@5zmvK(~i=qd>=p4bzpL77HXXv}p z63aPfhgQQjX?4pMU30`H-DUVDJ%Rj8ejgxz^-Y^~i#xXJ%A8j(?a~FddcZv!Obh z$YIas1}q=fW10Ac>Y|61`a=d#&MM-pjz1awa{WfF!1V$!-eSYtj=y`KYqH^kr{I;A zyZ+W{?3ejv!F3Zi895-jfakpLkNO6y3>hEc>+8ew)da@9!Ak9}TWxGCVg>rrXa6iE zJ&vGLZmQn?BQ@fSTy^ti-3VM)6o@lNz%yNeE)ZK8oA4BPpxnl} zG4@(VzpKaQ*~Eb7T|R+o$fM^=gFkqDN_!f#yzVpg&^J1Y{yfEwtq=Quaqpw>PXm6{ zv~TnBL5DDibHnbtU$uNs$^2Zf)A%{tja;Qqod#c)C~i<>2Yr8l#4Qcqm@9I>4So3s zA24_80@ppc!#3*wi9WdQ3$5c!w7cRZr!Ng9$(vwOnw|YCZ_GE4J!MPvH53|0(&oXY z`p((!OPzaBXL*0X=ka$i?ml_)8g-^$j*bqWDP1Fs864dH<{bU0+C@Zw1RTpVROIzle=ARQ%#)IoD&S zkuUoaH%Py#L>))M1M==hQGH6@zj+7jo1xFtn0J3wLy^^t?T3Kd5r5(D;(=Z8K<_0# zYjwK^4~UPMdLM%fda9WE7S)!3oP(y@8FMw2`S?&xG9Go!zsP%qUqI7*@j0|(CzwxS ztXEI4A2E5Wx)mP|*uU-KvSR#{?Czyp0n4&XC#lW*eOZzSGb!H03wcU36!fau9< zQZ_jPG1ucJPziPsLLes{`g3bW-*d4PKTiLKHV8Y&sbmWOo9^sh`cnKP=4tz8|TVU;P* zWvQ!JgT$UhFE{+q*nJQB8*|U{;DPVqfv#8JTeRB);%{bs32g-__EqX9|nA`rzk-0g?8YhMsC&}pl8=>H{_*fQTJNs@Y}2D-)aZ)e{xx1U09j$ zz%t%Ux_<9L4e7KT+>9p{-D)HzP-ykNJp&b&9R)EV!IPwPgRj|v4jfIM0x z?{iCRQ>Y}dp%d1a@!A;hG2=D-t#1iG(65TE=DhEXy(fPD69tE|!nn9{sq-t;`8eTa zD~XO}OjsSdFAM?v55kKB>N3|O@+njjeO7dK3$U~6>|E$Mm-+ZuJ3T$?ymY@4d!akm zFDMS9GCqHV{{ImE!OEivHPZ~=$FN>W+!7%_XSt%y>saMy9%M{5&SqyxTX_6ovK5yvs19K=Iu1G zJawV`*La`?df???$N=oV{rJT%5+7NpB=MiV zxLZ4*Q?YY2&~!i7y#v2YWE;c&ERL-O_k*E?y;T=@R_vE!E!}k^Ysv}j!9d0X0bdV; zG5>qbiMN+{%TP)5X&LV|2gfXnZejE*w!nD&8BxTL7?K-bYrQu_58Q$b2&7-gJ=fD| zc*)lC@HfxMJo>=(#^xUvMwsW(CGhn=^wXuZPlf<1L?H zv&neB4m4U5uJ}v4Xy0<$+Rz%ub{n-;A&X_6s2zIXhd}TEdgp$1;+u*!K)r>hOs|tT zD(E77C52(Pe3`+IVn^E~v2%fakWsN?3( z`XTS8V)sT%e2OHAZ;`dR>7%J&moK)(6Hg!Wxs-d4QsY!hKdj+pD(r`UFnft7mF=>8`v zD*nt1yo(>8hUh`hB=fT1RtpRtg9m)_57Y0n>G$JUQ>SW4*E;d6kH7O`_p((N9aur} z|C7Goo3<;7S1KrpJ;*!D!UOk#sW=We(omK^S1S>7VELV3$+*< zbVRn_iA<1h9LaV!{XLP`vihve@Ay|a`39ZXJn(?{eGXSJ{Bvmch(^4ZV1G|QctF2$ zuhP@HD?OvuE`M=&1>Rxv>}g&6beOxv_dyzhgv3l=mclf95_amDM}BA;wexfc=y7`+9=? zGsLRelYY3j(zE+jHTX_V_#;2|77ujGK{m_-|Hk@(j*8iGdokr|U*`NJeis|?gAl{Y zuYO0`w;LO0G(Mi{660h~`lYc7{f@rxT^C#*2KT>&4R*c7*U-EcachXI|DISoVbU z1#F<2&}n5D;h#%;eiGb~^WEX`VA%6QdU^HGnCRnoil-vak;qQ50J>oL{}w~~HzAo_a<`a8J=GBp*< z*MqY+cDs-Gp8LpiqNg72eLR~b+5-CfJZqxJnm)+di9yEy2z7X# z@#qQsDw&tCC+1?rHy4AfznMP&Q@QT*cDa$3n29gBI&HHzH=z5XTd}8a3?lyGlYbV! z>~Zow-pqoqpVhA#@_rJy7vPikvCrA*AME|K#Q!4GD(T0s3Ml6Ghe>}!&nANZKf&Mu zY>zkS_w~d_v*-tpelK%zj|`BxxKyyuKYj`}ex-f>wC<1S+fG(`{wO;n0o@lH3)-KB z-L)^!`18zlGOk1Zs2LvX_#5Bs8xJ^;`6ICH{|pFhs$JL=E8Uiy)(o9{`7k@ zgbgU~T8-&1Yq24FJQMm};x1bw7k7nk-)GDsv4wN4trQCJgfi};KQ@C8b`&PB{dJsY ze95z#6x#Qn8yQ94eqgXQFTbt@M0p?aU4d%yZ2`|@{Jk@hn?jczVU54UtvuZOIGrAxcn?py z7nGNE5by_7#SZ*$0Xn?Em@RLvgRfqhv`t4#%$a9$jr-3HbK5T$yYE(gf4t)T08bKx zOkQGd=&Ldw><+F6yusF+Yv8A+@$i`MM0hq<{2=haCE#EFVmOPp_nmVXX$fCq_eo5; zXY)fYFEW6!U^Os%)f;TRxdxxloHH}?&+|*;vHQgKPeS$|3|sjx@v5U5DOpz})YDYv z1YI(qBfr0TgKu%yAphq!`Iv9<6|lw<{T}=ilfnK_SmH151f?gRQXcxg#hc;}A}*j3 zxII=Jw%(kloEIM7p&bSKeoX&Q>K>;3AHCmwtRB<6T=ablfBBWMI{pCp2HaQPU|iHS z=#s^(vr|RlO+1rJ|93zRgjam0*am5dYmBcy1pPgpIC$peTWRvmG<5e3U|Xu#0C;E( zWB=L(t+VE`|676oFJUJCndeKoLO*l~@0kzsByYLMi@!$J2ta->EUJGOcMkk_B1=wY z%hzt12V*;l@&7krg@0P&^ThU7lew+(nq*x(nXd)6)4_0aaX1%o{x9@NXZR=|DP;Wv zw(7{r%&@^fEnyq>-kBzz>4Qh}wYfYUkadFOJt6Sx0}t#k0^=h6L-5fZGRI`SziZKe zH8`B_@lH#e6CU_Wd`HqCJ)y0Vxs7m0_yc6EsAw>}8~jW3eMfA-*Te>tcq4n#YhESZ zyDMYBq#@uRg70bjI3F$XYqKwpDbI4>j*qo(vjt>+DA!jxAT|K8hRq9%{d2~CorMih zzT^GV5s$DG^DD8U@IgKFcuD35B=&ctyz}At-DqP2$XZ%yiEo!%9gvo= z1>9Si`Mn^%)8!40CA~)8&jdrU2OA^L-!Fj-_=quJEs-VmWZvyJF(64dfWMFHaQP^o zz4h7qa-GDhPw&yy%5%9RXA zOW23K*Izg~6yrL|f&nKpM<8Q4-W`nNSK`LKwg=#u_X?B&ya#Rkq|>_JTW;`AOZXY= zuOXh(A@8hKq$Kl1;vYphh$0U^aYE==w68%Z3MTCjLCH z93VzsN5KoS&brXwm+`p&u4PT%#KlJ5&l`%a552hkB47ymDa$Uv=i3fGcowV+d%y4x zc;J5IMs4vA&%(zb$*c$Q-&6-Y&MC0Pi>8g&*v^Kz=8(;2y3yX&&#S$Tw>Bvm>4F z2&VUH1UBhl^sAp`!9U3PwdnY<;NFbyb2!RFtghdH32;I3{T=!C96CP+8{u?#VGz79 z7wlKF?PEL0wiP~@gg$7?JL5I6DI9yAx<$UvRS8+p5t+>Q*-EvR`yr!KrgdL{ez}Zs zXI)LKhMqelz|@F5PR5SJhDTv9)P^5g!VgJcKbmbi`!hH;3LVlR^=n;!#eVJhb^aLn zmImM6>3K2o;9>eMNFn)pUb!5a#hCiky zjRx-?#NnU8Tyrh`%m_y)zlRkx z8=*ji0uc&CC=j7QgaQ!?ctZi~oH9-Ec}vfU&6`)zIWcl1HQpT0aAY-6T#_sQw9Zn| z*)$?nXDhiXOR1Q{R-?4ekW;x<-uWAQbVkq|h|{TgE{HRC9X%8;h1yd7yj0+5O3^t- zGwh{kcZJMxoi8sHbhvM#738C>T06+6(kiQ#u6(RjOUY+A3BYaK=%hlNRSS3CRSTgK z6>elbK=M4BPe_{E4He0^Qt_$gfKZuR2dTIWd%lB;%`*8o&QsS672_m>%4<}JXvY1Bx!&>uV_Gu?YvOfGtX)F z{pzr@xk4OCj$CJR+7Oy%k>!wES$+RpCae8l#)70^32O=ktf!9EAJ}LbT0uo zPaXog@}@fpLG$Eu-FYD&$=x2)T_hjxtd1+6YUSh1 -1) { actionUrl = 'http://117.50.100.12:8008'; // actionUrl='http://192.168.31.74:8081'; //万佳后台 -} else if (window.location.href.indexOf('117.50.100.12') > -1 ||window.location.href.indexOf('forgeweb.osredm') > -1) { +} else if (window.location.href.indexOf('117.50.100.12') > -1 ) { actionUrl = "http://117.50.100.12:8008"; //测试环境 axios.defaults.withCredentials = true; +} else if (window.location.href.indexOf('noticeweb.osredm') > -1) { + actionUrl = "https://taskapi.osredm.com"; //测试环境 + axios.defaults.withCredentials = true; } else if (window.location.href.indexOf('forge.osredm') > -1) { actionUrl = "https://info.osredm.com"; //生产环境 axios.defaults.withCredentials = true; diff --git a/src/military/notice/api.js b/src/military/notice/api.js index b397f779..3bc02b78 100644 --- a/src/military/notice/api.js +++ b/src/military/notice/api.js @@ -27,7 +27,7 @@ export async function getNoticeDetail(id) { method: 'get', params:{flag:1} }); - if (res.message === 'success') { + if (res.data) { return res.data; } else { notification.open({ diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 9f57b0db..9d1d5320 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -580,7 +580,9 @@ class NewHeader extends Component { return true } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) { return true - } else if (url.indexOf('notice') > -1 && match.path.indexOf('notice') > -1) { + } else if (url.indexOf('.com/notice') > -1 && match.path.indexOf('/notice') > -1) { + return true + } else if (url.indexOf('/task') > -1 && match.path.indexOf('/task') > -1) { return true } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) { return true