From e8b189cd90120abf0a211ac80229dce68227d0b1 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 6 Sep 2023 19:08:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/project.ts | 6 + .../下月计划施工的危大工程.png | Bin 0 -> 1246 bytes .../危大工程施工部位.png | Bin 0 -> 1289 bytes .../images/dangerousEngineeringImg/图片.png | Bin 0 -> 389 bytes .../dangerousEngineeringImg/在施危大工程.png | Bin 0 -> 2400 bytes .../本月危大工程导致隐患数量.png | Bin 0 -> 1615 bytes .../本月危大工程排查覆盖率.png | Bin 0 -> 2455 bytes .../dangerousEngineeringImg/本月检查总数.png | Bin 0 -> 1382 bytes src/assets/images/leftTab/危大工程台账.png | Bin 0 -> 754 bytes src/components/AMap/AMap.ts | 3 +- src/components/AMap/AMap.vue | 8 +- .../components/transformInfo.vue | 4 +- src/views/goverment/approve/company/index.vue | 2 +- src/views/login/CompanyLogon/basic-form.ts | 5 + .../components/engineerAdd.vue | 274 ++++++++ .../components/engineerDetails.vue | 590 ++++++++++++++++++ .../project/dangerousEngineering/index.scss | 50 ++ .../project/dangerousEngineering/index.vue | 261 ++++++++ .../components/transformInfo.vue | 4 +- 19 files changed, 1201 insertions(+), 6 deletions(-) create mode 100644 src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png create mode 100644 src/assets/images/dangerousEngineeringImg/危大工程施工部位.png create mode 100644 src/assets/images/dangerousEngineeringImg/图片.png create mode 100644 src/assets/images/dangerousEngineeringImg/在施危大工程.png create mode 100644 src/assets/images/dangerousEngineeringImg/本月危大工程导致隐患数量.png create mode 100644 src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png create mode 100644 src/assets/images/dangerousEngineeringImg/本月检查总数.png create mode 100644 src/assets/images/leftTab/危大工程台账.png create mode 100644 src/views/project/dangerousEngineering/components/engineerAdd.vue create mode 100644 src/views/project/dangerousEngineering/components/engineerDetails.vue create mode 100644 src/views/project/dangerousEngineering/index.scss create mode 100644 src/views/project/dangerousEngineering/index.vue diff --git a/src/api/modules/project.ts b/src/api/modules/project.ts index f551b53..fa495d5 100644 --- a/src/api/modules/project.ts +++ b/src/api/modules/project.ts @@ -707,3 +707,9 @@ export const monthlyReportDetails = (params: any) => { export const engineerMainDetails = (params: any) => { return http.post(BASEURL + `/project/engineering/queryAndMainById`, params); }; + +// 危大工程 +// 危大工程台账 +export const dangerousEngineerPage = (params: any) => { + return http.post(BASEURL + `/project/dangerousEngineering/page`, params); +}; diff --git a/src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png b/src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd3ddc2cc8c8302b949bcc285922ecebfcce11c GIT binary patch literal 1246 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=kyTfnRul}PPa!5o#fqk>P z#&rFftcrhMLUoX=)>EorUEsYe zDVf#TZj;K+2frf<4oF+tzK#8KfbW{{UKQ6lwNGUgcRn`pV4U*I!REmN^SZ24Z~ykf85kK52NuavFq0#kkT?7UwY-}m@L)i%y&eY=cvF*w9lBqWAxFwlyS5Y_47 z5_4nazWgCL^}F$*C(8VB{=WlOCVZH>?pFFUi*{3cq}>YUkt5ma<8^UK_G*!in3- zR~^;}o!kH4azml_vUM+11^@h5$o~EPwFR%TwwRs1tR8p4=9bH(|MxdUyj(Ot;tjLa zlxu~t9J@;XoVsXp{Eyo4iK~kqA9l3*`C;~PU;y3utz~X_BlT&vqX0+U0!#Bi3*Ul? z2O`YQdPaGQtve9I74`ek&S^ud==#;d$3VP8Rr zl*>p?A(wLaS{9TFZj!+zVc^&lIA@pn$E|RE62_dKb7jgyhpn2rR=H~liL(# zHG`5HJn-HwJ1PS-0*O2elfC7e-8B7{uXkO{pQ=5J3(sep=RRFzi3o4uoi{IQntT?J zSWhUWhH>zmd6{@5i6gcjLMkoB7rVZ496?#rYn?f1SZTQDz(|9wGe zikL-__=(h4+d4lTojE6e&Z4@%&cPoppZ2|VobT+?)>e}@hc{*v7*$_1uiYa2>~;Oa ujI1R;-?ORivU(eB!4~q2ZR!o98pg@hz1+KYtYZfjM+}~>elF{r5}E+%13SzB literal 0 HcmV?d00001 diff --git a/src/assets/images/dangerousEngineeringImg/危大工程施工部位.png b/src/assets/images/dangerousEngineeringImg/危大工程施工部位.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8e58c58eaa526899feae097a21d8ec9700ce8b GIT binary patch literal 1289 zcmV+k1@`)hP)D-LpnaA#Jl1qb`dGj2~48)(8WU%?h%dz{TCxTHj6d9Mr1@K@GN4tF^$$`7|{oF zn<9FMNHB;5`;ns7-~*Ny7ykbme4^LdKqN#VuotAnGjLI2GZvA9rwB?5>+~_dg#^=d z@eTnADlm!LXGjYtF(#3(kjP^MB5aB<*o2(8jvhMLLO_B=@GN@2LW2^QLPc@N2z~@T zG|yEboWRDrGp%#oMIeHt2=CSmzC)8hX(ChvUxzjw#XII0|Bt{ETtNWB2pl4s3S2_~ z!U${wL~uckqyVT3?CW1ybJ0eBc5YR=&}UE^vDl$w58UUemuIed&(~C10DXZwxJ6=C zv3Sni!=-2)(H~WT4V_zAVD&oK?$zWS(Mp8K3{U5Bwf6B<5%uPeY7X|T$=aacdRkdq zLULlOPO!R@oM{l)i1urnUV9yiXjc*S`gg)UxgE#l^=dj$?n|f%OzFYhn*Hh^b|v%S z?6v17&z@ggRYEg@>$he><(V`k-ZzX6poE^l(-NslDViP**+KnU)U3KnnP%TmYM9Ke zUX*nEj+GW9dwyZHx`}0<+Lw>z%QYRNvEO)0x;K0e8Z^n+@#hvd9XctZ+mIeYV|A`c zN8p1novafnaNTY#y!UNs#091|F#zP>$P%cyI{64br<7-x!N|KhjT8}NEo>nQc~>VY zu-&Fx@E}NYeNlR|6efmj1pkh3a+}AbEby-g%d} zwb7Mvb?gEs;NF^{lxAP?&l~&^oPv96<7Wy2r{Uh(U{7tVPA)0;)&{ey3eSo`yiqvao7B?GU80f_UY!5;{M#v^S?lb!Bqr{8-}ZRORrM>{cpIB6uImlig$#i z^za3Da2h&Pk#t~-2h$(_3T$7}r)T{`idMmmg=9pD_X#dw$3?Rjn8e+fiJRe~AdxR( zv#>Ax0_8R`{7i7uP~--CV9?5AuwmS$3uI&LNWsMh4Q>6pyJnVYA50Sf?pzJ3MOkY>{Oq=Rw7BAFF{y2wci7 z@sz~%E!(DcWgl1>k+m6-up?wLnM@{=$()%#4Fw~*S>-#J00000NkvXXu0mjfh-ye2 literal 0 HcmV?d00001 diff --git a/src/assets/images/dangerousEngineeringImg/图片.png b/src/assets/images/dangerousEngineeringImg/图片.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a5609b9fbab74870ce99f2ea0cb032fa851985 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#Qk(@Ik;M!QVyYm_=ozH)0Vv2= z9OUlAuE)Cdsy)LvRs$Mh1mO)Q}oEByx~9@?Cm(7qIC52V^d zi(VpMTH8rsr6^FKJ%s8ZZP5mjFAj1@ymo#XP9Qq^;U%fvmw6=DruGLpLvguFQXhaI zIlDW%^WEW_H*bcs2q7|Gc#tN9SH;JScp2jJ%C*JGix44m%jP1God>{___~4w7q8?d z4G0MhLPQAqCN#ul(xNc=^M&0dh=}>Z_5u(Uo8mGH%?c12p$Ys#p*kbp((ZIbd=4Ul zP`}`loM~QbD1;`k4pu5)QyQWp?U$%SB?Tc7s);z{P~gxx6gXrK1rC`*fkS2tVoJ6^ zsU+-V3A7nN?UZn`9=cKlSVo|-@M&)lP^k)2rPUmkA%?_G;Q7K;hC%}ZcqPdDxTfUMzT7no68-X2R=~2&55z30=vvb7*yRXCXB*L+Axy!BD1h=-yuw6Aj=o}VNc|ynX zsp+;&QazTU*|4T^^P~m-X<>WDLj5`%uqXCeg~ZENI_CHUikDn_%;MhJv7tsFO;Tii za#{yXLXABF|4KR zUyD1Izy{kB%Huoi7MJiSau^xUN)CTQ;?^~XB zYyjvb22kW}quPC?+c*m1s(28LlE6fEVCy*=;sOWQq=GySiZ$3jfU%0CivbvF2-TE%tJzW=l~FlK=( zhZE4OMj`>y&yJu>_M<6 z(F&oShb~YGSGF==*jXXeE)18S>kpEB`ATkj0lJ{;OW+e$ZEJbh#T7r-Hk?M(j`{8L*yEHweq7J+=O;w0TDI(82s6HGDcn71bm7M&PO$YUtk%qc zUKv^ULDOzk?1{?<{RioR1(xAgAJj6sj&DMYK#OL7{?vF0LZ(+gq(cJei@-KgEdQw8 z5BehTRBhaVn6a}rrtH&pLtg~WoyIZ|U4)px*OEWopXCqw(#Sdd`jhH{7#BGQihTaQ zwcwZj)oYq{yZiKfDU3%n0rZXkbc zaq=?6h+z`gp@al4#$`c{0r7*C+`J60naO`*hZryr0uyPf9!Q!H*W)1aK$r+dh_yiV zg+(bv;)Q@R3wjzAN}i2!MXG@j*iEx`vN?DK+Anicy1Fzu3lTA}0=FW>&Nqej1!-?K zs^z|hBG@B5hCHui9kji%4qG$~MGbbCE9@2lanWyERJC}h!j%=M)?yrR`y(Y(&93PKMM1uFS(k#g&L zP9y?1pH7f&Ny#RlH%})J4PGf|TQ-7@N8bf*nuN4FT@09BfZkz1Oo&k~OZQnF_vH$-Z})`z~-}X#{^)Dhb;MZiteQ49G)$c6u*}$V8y; zfMaiZT=s&0y87(&UJ#8JLG(tzrVOuy4PDY$$ke~FBvc>2>jjYrT!qR?keLv*_|Xju8nic zm5xvDVv{m~<~p`K2EvnHn@C&OL>f&yUoe+iCvpc+;>GF7wr=R4*KddgR!Y;fbHbi* z04LM#U?ltEmE3e5A|mo|r8AKmLV>PdU7GqaL`dX4ITNZ&6oLyyfa?{S{24?{Yy$4> zg5`=3Px&`tDi?>x@5E|EqcL*aaS*c&v?;3YrK`EABE*E)4H-4uGg}N|Y8)U>OB_P% zjUeG~O-L5w_Ry$UkI9`c>|_xzBTUCLji+%rK^!XA7mX%Z6WdpXup4oG8rPQ!5~G+o SXJh980000{LYK~#7F?VVk0 z6jc<*|8sZSZa>)V8f|SObP*E452C?{MvcIW57N*ImM5bn`le}l@{yJ|9}pjWGV$Y8 z474Pg_|X9R;*&}UgqSE)Fo95-7HCWB?#^Y-ls4PlX?JJmo|)U`{*rCC)7^gj_Ut`p z&YhWSVFf0-hMIE%eUSD}z{)tAGBCgbCMD!KA;qu&PNj#tM^|`kDUR4o&a%I9zP%HM zvRIb&bQs22ryRuCy!Bm#T0t(WtY|}=t`xZYC z{4Gvp8{Kq48^M&MVv640I*r9z2=-f+m4hOfh8rEwLU5&JS?<3H*mq_tdTf&>J0Fn? zuB0r>UYo$R{h#CVj*s#8)&Yzk9YHxrt`0jNkqfS*EF1r11owWsyyWZYk-y45kH+<= z%eF`bS6Y@${cy2l+uiTamwlcNJ0Fn=uC!Yg6zUsCS++$c*iW}iB*j;N_sdjk|1P6|7e>T2NS;GF7b5lj&gG_e&^_f-4h{n{s5p%Tur zjYTj=A>aPR+o*r(aWuaEB%0rU8LHvhg|^1JPf93+65F~D^*$(iIi|lnk9*(!1C=O` z;4r3vxZo(;lnSPkRbq@8dG6wM_r?WB*{19)Be&o122V{%$3@&Y^zGu*eX?geS_V6n z)x(8QQ)>3iRb^){DT`p0Wmz%B$3@&Z{yT0R{TUok6gTy%OVUaNbChL;cpVo(lDVL1 zEmdWk62aX4)tdDWd2CCA6IEqfV8QOWY|N)owI18QWW1&Ot;gO1C#sIn44mZX01|Ez z&R$%{PkosBaek;s^*qm#;7We4^S{kG2`>nN1&1{=Ktn?My;l$>D*iWfIRj<_3(j7+ zg|$ld!We=QSn%wbf3a4X4LJT1fdx|%m^;1pB+q=dd@F3+mir`;hV8PkpIwj%|X8j^2B*d^t4|h*GchAD0 z6k21hZDB2=oD{vzr%4!8F_E?5E_vn(Ceu>NK^T|ruZ+4yNcgByyFe}9PWr8BNP%h!QXzKN@p-c>Nz_RcT4CRo{JO6AB;$WM{ zqN&zO&m_^cz+T&;CDGhPrF4pFr86-;fAgsG!MWkrDW}Zc=vHFh+y_z1ZzoFP{D=Sm N002ovPDHLkV1l|O1I_>d literal 0 HcmV?d00001 diff --git a/src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png b/src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png new file mode 100644 index 0000000000000000000000000000000000000000..e613d982c6a543344e4183ed5a8ba376f8240bb3 GIT binary patch literal 2455 zcmV;I3263-P)&FX3?gKP-4{cGPwUV5As{90TU!YBI1)9Xn zp|OD+>^y;$Cx~)tT$`NEEU8$wMDCJYE}hsvK$a|$BK6mDc6MfV5zY|wQ7{KBH3x|N zfXe{kz{xoc)fh4E&w&SGuvZ4izYEBIw5QeIV$ zm3|xXGXK58kE^`T9KUf^+{lSmd}(~^*=W5iDya>A5#r9H(CUbVPXhki<#f+Y7P|w@ zA!)NNjE#Cvv|#poce$0!K_jHX&K~to+p$8QB8>!Ly+NTv+kT3ExK$D7~~{&E9;>ay#!Cutw> zO;Q>b%FAOf0^ufjg~dIJ7hQ`x4sJj0!%;M!be3LubLVJ*wR!N}xrw+Q3i0$g_*|Yv zZtDUZ7`5Oi3cxG4=CjICpNmZqctr*BH?hGAKL=mvyw=0Q!FwGRe4U0(XJJ^hLljfQ zKEB+kx4{R9+T^C4oOafserUj*sdZV>SaoI>4x|_)-Eg2?N^X_(goECF>k1t9RM=0w z`_@1fBOH?Ah#Fq@IiiCG5UYrD76mxPwK$ZN#Pc18Ro`+^b(P?xkDp zrLDpP9x1GT|7g)llJ!3FPQ3vX0D4ksW0+WR+Na%2Mg-^`;C?5l?p^W6}7uY6S z!pTl>1w|I0%HT$U5c@yE!Lf_Ja)}hQyi0-60x$IqZn%_&v@|E)Cu8bo5 zdEm}N2_=@#bnvkpSnrv4q%L?thRTF~Qa6aVjn2RDKIhNMh%Cp*u~z$fO7JSRt3b7U z<;L1JF#<6a96X;dWG;ALImRZ9UU+DrscKkc;S-YUbJc2>I8S50~*9QMFh>rEqwiNM5uBT@ifpjG;K zd9UaSBdMU}Yu1vfX#Ps6kp7gX(NH-ApTy9ok3RL2ssdS$O`pr1pKZfY9Lm#i@t;3C zJYon(Y7w9PU27++#k~}Jo{Dyy;2jJ0cuE8w)8;SkWYLQ(v{~>jE}Tg49t-R%5jcS? zda-<8_wbI84pC2BPt1Z}afQQZWAyT50k)q6Xcm>1*E$>Pw9zh`hijw%PR4`dq~~jh zjx0|jb3{yWi)rZi!a-|4tp;jHT#!1yjT8T#*!V%b*+4DrDG0J=P3FOIjF4TU0W=Ej zpS}Z62%JQ;)CM$$RJ>cp6Q&WzUpCr6)a3AfGG(OWvQ1s2$_+Kr_q~ohvbLwkRu6fW zVzTuL69T6rCjS>Hb;H|+x?yZ>afIp*TJ2@pSUqh()(!TJnjV~*n)FOBG6Zi(-Efrq zqtXv|lcg1igFZ7Vzx;G2S~1mPxMh0l6|%F+F0u=@kXp$#4d31Sf`9hjn>P?w>HB*@ z*8XWVFY`>p2xDcBZvM4Qfik;f64nG0i0jR`ZtAWnd#(2Z3-oMEmz|!iOJ?_3ZSSs| z*xhZrsc6=x(u0ihtYu)JAm7CYf$uGb(gnJPK!iC__b z`6CS}6(l*e_56e>uI2T* z+B9Ix-7156%0e^`AHV>6z3IE?>&{!OL;PI$w(5Eol`Gt}3q!^WD7bErWA`N63X6U9!Y9bf8`a z@H)DN{a$9LX1dlY)F!YA`r+Ot_^TBQVdnB8-uVW6)5ttIhc1~d0sK2$r3^DsC;nGT zbM2B@pO}3LjIO~f?4w7a{kLG(E}8XtWzF^0?|H6U9e5Sku}emU9|Tv~b^94S@;|?3 VIA+RnA-(_r002ovPDHLkV1j6oxE}xj literal 0 HcmV?d00001 diff --git a/src/assets/images/dangerousEngineeringImg/本月检查总数.png b/src/assets/images/dangerousEngineeringImg/本月检查总数.png new file mode 100644 index 0000000000000000000000000000000000000000..82d69028f59204a8b0ae3fa7201e147eef6cdcdc GIT binary patch literal 1382 zcmV-s1)2JZP)h zBvKL6V!?x86bdm|vRFe+Ds`>hq}keZW3nM_+#Tn8`=@V{x0|LrUtUbUA3XAQ<}u9s z?d&%*--dkxh_@*O5TJ4@3X5+72^2<;FZj_f62ba&vAarbC-{XA{h|?EodB#(Nc!c6;B^HHCWZwQ zQ+1gZ{v#TY4RXIwDx_Zq3&)b2IP-bc`d6QM9sIypzXYW9`Z*3#^kuWTli}tAiAtB+ zUWMWDXwVV@mn|Vs3YY~bXF?1?PKC6m*pVx--mFrGy+khx5l2$T_FGa6ISnwk%U*OA zxf1PJSWzZ8GI8vXeph0JcZgXI+L-_mbsV}V3C5ADV{I6inm~u{k?aV@m8^D+*3&Hec1XP|F`lN|{&1J)Xu+~=!6(2keCStD=v@fORxNWQ149?j!r0_x z=LP}|_v#yb8XD^x!B1AYUu1%rJe*A3pJ3=1a4u2wn! z?@bsTAA!`=1Z3tiFsrwjOg?vkiKEsHt@_xcx7l}Byw-E8oVhUrgBJ$i>QoAtr3r3) z2-@2o^Ax>k1dopY2E&)m>Crn6%C7ZBG|cLWPV(eN2Y!Ri$sS@@FfqOh z-ud8*aOS1&;M?c>ob$DYuYytN(I?-Brn)9*X=sLbAMb&+hHrw4a@|bN&%j#47r|a~ zk>lq-fwhJWhCzAwQOD7E{QReI>d$W$)qBZ3cs8Q1J-t-(rS>tbm}G2r+_S&6VtfSe z+xm7XrlLsq#8s?od|pN81*$1pN=0Zbw~zS?g5|ATjKegTd?^+DBZ?nLhY z5t3EJsY|Ef;LnkY_3K40Lbgn+BzZl_MT}2!Zcs9^@6mUh$?2nCqU%a7LK1_STW~gw z7#2(n3nqs1!NhPrm>A9n6T|snVmKdMfb+o%+BXg7gDbRe63zz$=Yt(MAAAeW2NT2j zU}88QObq9PiQ#M-F)WxE7EBBaCI$s3fT1ESL8$~VBq&gEsg(Eu7!p)Yo|LwIGX@L^ zb++h}@$Pt9hlze*3?q8u-2;jIZ@635oBB^07(=M*mK2Ba%n^*H1>_5u+R5c)1fAl! zRV_+X;Q@XLcA77HwQZR*Qp{{wqAP3hAvebfW94AgZ!a^G{y zMLeIz)%kT-Fq_SVbuB;sVQG}6-?pr`iebS`)yJKo=p1Bs<+89_I6tN@R^!7={7APZ o6mHOz_|di-V)5?&iVKAQ03~Kz{n~;+n*aa+07*qoM6N<$g4;ZYjsO4v literal 0 HcmV?d00001 diff --git a/src/assets/images/leftTab/危大工程台账.png b/src/assets/images/leftTab/危大工程台账.png new file mode 100644 index 0000000000000000000000000000000000000000..eefbd44ca41281bd3602743694f49eee3cdc60d5 GIT binary patch literal 754 zcmV*=i09Ooj7n(^TDyb%n7le+;TO{EFH`6eF zq^M`FJAe=)1i!NupNBEw&Wi^Alu$#!rxsi>9FxWD?;H`-E)3J5Bkmu(nG1Au7!fkr zGZs52#cI??y97wPx?~F4CUqA-#aN^zQ8|1!=ffmyvH$N%f>khpHlaMSmsx~+)x`UL z-}3m%!AV~i+9pMSESq%Ww2zP3s4!J%c>NIyJCz6Jf9cV>;myM5v!MRXhYdE<#9 zi--w}OkP5=AL;1QBIMs8r=*Z}>{h;+6NGNNnz)A(GQ-0mo3@2wKd+-p%cO{yjfky5 zNNl;wA2(>v-c)ZFh0KJ0D%8=XMcA&yXHMGFh2|~+ZNvVJ`YD-ySQy1&t1;ZYB|7KJ?=|U@q10T*V zeIL5890V>pv@$U{K{zapv8iclp;-e1s8WJIbD#Ih zzpc66665yb7nGJAwY%M;NX{;`BC|WaE_{2NFn%mU2@ix=hn^hNrzj!K#G9&pNEopA zqq0+njP`K``6X4lf}~28Y}UG(=N#JVRO9(e33)Q)>r5Ya>u290S~v}tz>-4kYxC0n kK@rY_K2D+^KvN^Q@v;Y7A07*qoM6N<$g75f8s{jB1 literal 0 HcmV?d00001 diff --git a/src/components/AMap/AMap.ts b/src/components/AMap/AMap.ts index 1691c42..d77ee96 100644 --- a/src/components/AMap/AMap.ts +++ b/src/components/AMap/AMap.ts @@ -7,13 +7,14 @@ import { AMAP_MAP_KEY } from "@/config/config"; // see: https://lbs.amap.com/api/jsapi-v2/guide/abc/prepare window._AMapSecurityConfig = { securityJsCode: "df19aa4c9f83a52f7ef66843449f438e" // 密钥 + // securityJsCode: "6caf6429e4b98cf7f39db9bf7014a78b" // 密钥 }; const amap = (async function (Loader, AMAP_MAP_KEY) { return Loader.load({ key: AMAP_MAP_KEY, version: "2.0", - plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"] + plugins: ["AMap.AutoComplete", "AMap.PlaceSearch", "AMap.Geocoder"] }); })(AMapLoader, AMAP_MAP_KEY); diff --git a/src/components/AMap/AMap.vue b/src/components/AMap/AMap.vue index 5c0c32e..021ad2b 100644 --- a/src/components/AMap/AMap.vue +++ b/src/components/AMap/AMap.vue @@ -13,7 +13,11 @@

坐标拾取

- +
@@ -98,7 +102,7 @@ const open = async () => { }); // 联想输入与 POI 搜索 - autocomplete.value = new AMap.AutoComplete({ extensions: "all", input: "map-input" }); + autocomplete.value = new AMap.AutoComplete({ input: "map-input" }); search.value = new AMap.PlaceSearch({ map: map.value, extensions: "base" }); autocomplete.value?.on("select", (e: any) => { map.value?.clearMap(); diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index faa2d51..e6b435a 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -18,7 +18,9 @@ 检查情况： {{ - basicData?.state == 1 + basicData?.state == 0 + ? "待检查" + : basicData?.state == 1 ? "执法中" : basicData?.state == 2 ? "待整改" diff --git a/src/views/goverment/approve/company/index.vue b/src/views/goverment/approve/company/index.vue index e5315ad..e91ecfe 100644 --- a/src/views/goverment/approve/company/index.vue +++ b/src/views/goverment/approve/company/index.vue @@ -120,7 +120,7 @@
- + diff --git a/src/views/login/CompanyLogon/basic-form.ts b/src/views/login/CompanyLogon/basic-form.ts index 67efbc2..09e90e3 100644 --- a/src/views/login/CompanyLogon/basic-form.ts +++ b/src/views/login/CompanyLogon/basic-form.ts @@ -65,6 +65,11 @@ export const rules = reactive({ required: true, message: "请输入统一社会信用码", trigger: "blur" + }, + { + pattern: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/, + message: "格式错误", + trigger: "blur" } // { // type: "number", diff --git a/src/views/project/dangerousEngineering/components/engineerAdd.vue b/src/views/project/dangerousEngineering/components/engineerAdd.vue new file mode 100644 index 0000000..6a16d9f --- /dev/null +++ b/src/views/project/dangerousEngineering/components/engineerAdd.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/src/views/project/dangerousEngineering/components/engineerDetails.vue b/src/views/project/dangerousEngineering/components/engineerDetails.vue new file mode 100644 index 0000000..d7e5904 --- /dev/null +++ b/src/views/project/dangerousEngineering/components/engineerDetails.vue @@ -0,0 +1,590 @@ + + + + + diff --git a/src/views/project/dangerousEngineering/index.scss b/src/views/project/dangerousEngineering/index.scss new file mode 100644 index 0000000..7cc623d --- /dev/null +++ b/src/views/project/dangerousEngineering/index.scss @@ -0,0 +1,50 @@ +.type-select { + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-gap: 20px; + // display: flex; + // justify-content: space-between; + // align-content: flex-start; + // flex-wrap: wrap; + margin-bottom: 20px; + .sta-item { + background-color: rgba(255, 255, 255, 0.9); + border-radius: 8px 8px 8px 8px; + padding: 24px 0; + &-content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + > img { + width: 44px; + height: 44px; + margin-bottom: 17px; + } + > span:nth-child(2) { + font-size: 36px; + font-family: OPPOSans-Heavy, OPPOSans; + font-weight: 800; + color: #2e3038; + margin-bottom: 8px; + } + > span:nth-child(3) { + font-size: 16px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; + color: #6b7275; + } + } + } +} +.table-box { + height: calc(100% - 205px); + :deep() { + .table { + height: 100%; + .table-main { + height: calc(100% - 82px); + } + } + } +} diff --git a/src/views/project/dangerousEngineering/index.vue b/src/views/project/dangerousEngineering/index.vue new file mode 100644 index 0000000..431bd94 --- /dev/null +++ b/src/views/project/dangerousEngineering/index.vue @@ -0,0 +1,261 @@ + + + + diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index 0e08096..029adb2 100644 --- a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -18,7 +18,9 @@ 检查情况： {{ - basicData?.state == 1 + basicData?.state == 0 + ? "待检查" + : basicData?.state == 1 ? "执法中" : basicData?.state == 2 ? "待整改"