From d46de638dc5daa162a16c60a3edfbf1918bddab2 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 22 Apr 2024 17:54:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=89=BF=E8=AF=BA=E4=B9=A6=E6=97=A5=E6=9C=9F=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promise_book_issued/components/list.vue | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/views/security_commitment/promise_book_issued/components/list.vue b/src/views/security_commitment/promise_book_issued/components/list.vue index 60ce412..030b385 100644 --- a/src/views/security_commitment/promise_book_issued/components/list.vue +++ b/src/views/security_commitment/promise_book_issued/components/list.vue @@ -59,6 +59,20 @@ + + + + + + + { this.listLoading = false From 06c706db1ab7b82d0fb0577831c8aacb3a7dea16 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Apr 2024 14:36:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/index.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 194373d..c27605f 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -2047,9 +2047,6 @@ export default { } // 人员定位关闭实时获取定位websocket 并关闭人员对比定时器（曹妃甸使用） if (this.gangkouActive === '00004' && urlType === 'peoplePosition') { - // if (this.fwebsocket) { - // this.fwebsocket.close() - // } if (this.timer) { clearInterval(this.timer) } From bb34a54e57aeb20082436ce748c2fbd2a1cf0eec Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 24 Apr 2024 14:08:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=89=BF=E8=AF=BA=E4=B9=A6=E6=97=A5=E6=9C=9F=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promise_book_issued/components/list.vue | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/views/security_commitment/promise_book_issued/components/list.vue b/src/views/security_commitment/promise_book_issued/components/list.vue index 60ce412..030b385 100644 --- a/src/views/security_commitment/promise_book_issued/components/list.vue +++ b/src/views/security_commitment/promise_book_issued/components/list.vue @@ -59,6 +59,20 @@ + + + + + + + { this.listLoading = false From a1ca1970345db5642439180728c35b5e6da919db Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 24 Apr 2024 15:42:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=B6=E8=A2=AB=E6=A3=80=E6=9F=A5=E4=BA=BA=E7=AD=BE=E5=AD=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/safetyenvironmental/archive/components/info.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 6b970f6..e0e828d 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -258,7 +258,6 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} From 44656cfe9c9c3d5dc68ecdf79df8bb04800f38b1 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 24 Apr 2024 17:20:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=9C=B0=E5=9B=BE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/renyuan.vue | 42 +++++++++++++++++++--- src/views/map/dialog/peoplePositionYGS.vue | 27 +++++++++++--- 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue index c66875b..3a1e6e9 100644 --- a/src/views/map/components/renyuan.vue +++ b/src/views/map/components/renyuan.vue @@ -1,6 +1,6 @@ @@ -69,14 +88,14 @@ export default { methods: { getData() { requestFN( - '/map/getPersonByCardNo', + '/map/getLastProp', { CARDNO: this.id, corpId: this.corpId } ).then((data) => { - this.info = data.info.required - this.otherInfo = data.otherInfo + this.info = data.userInfo + this.otherInfo = data.statusInfo }).catch((e) => { }) } From c1125a06c7ce8e6410659224250403ac712779cf Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 24 Apr 2024 18:49:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E6=A0=87=202=E3=80=81=E4=B8=80?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=94=99=E5=88=AB=E5=AD=97=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=203=E3=80=81=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=98=BE=E7=A4=BA=E6=9D=A1=E6=95=B0=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/map/renyuan/ico1.png | Bin 0 -> 1483 bytes src/assets/map/renyuan/ico2.png | Bin 0 -> 1527 bytes src/assets/map/renyuan/ico3.png | Bin 0 -> 1845 bytes src/assets/map/renyuan/ico4.png | Bin 0 -> 1575 bytes src/assets/map/renyuan/ico5.png | Bin 0 -> 1553 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/map/renyuan/ico1.png create mode 100644 src/assets/map/renyuan/ico2.png create mode 100644 src/assets/map/renyuan/ico3.png create mode 100644 src/assets/map/renyuan/ico4.png create mode 100644 src/assets/map/renyuan/ico5.png diff --git a/src/assets/map/renyuan/ico1.png b/src/assets/map/renyuan/ico1.png new file mode 100644 index 0000000000000000000000000000000000000000..191835eec83470e4c690efa33d31205fe6e4d7d7 GIT binary patch literal 1483 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 V8*T>4l`Y|4vB@wOKcZi@?q3)sK}!Gt literal 0 HcmV?d00001 diff --git a/src/assets/map/renyuan/ico3.png b/src/assets/map/renyuan/ico3.png new file mode 100644 index 0000000000000000000000000000000000000000..9370a0e59901eab30dc1552a04fa75c6b5df8dde GIT binary patch literal 1845 zcmaJ?X;2eq7|wuzB8Z}+por@tc##uA4hTXHBtkHTR8mAGBnt#cHYAILqj;ev1EQfE za#SrK>L|3Lq9eqp(Ne`qH6tLDRsjozRtq|{g3xXhv_Gsnv-^GDJJ0jJ&wG5cI)21@ zNBhP07!1ad8_E`-tGnf$X^VdS3H4Rz;)-xYNF*GOq>EJ$CRhr`K>$}SPJjfESelV~ z8w$W+ti5DH5hCJ+(V=w{hG)l1~8A5RzUz6=ZBRLeaQfYh9mm<_|jS$dx?ad&dg(RH4w4;Wc6+P$Oc61e)f`K5z-2b)MGKa}w`m(6hkYF-}3QlpQAIW`+Oa5Oj9u^cTI-DMC=AnrML%`;Cc~m_>9wz#ueJ@p8cJ&(U<^Dxy|Fv%o;t@k zQ28RjI55~{^UYsQ@|CsKE=x>?PXA~#GSNKmS(+<#>7V|N9XDph)(l72D00(U>b^B0 zDU`yIo(z|*c|RKVFWjFt7)NinYrUcC3+uUXXC%n(i66M9GBVh<_w<)R2m7kr)(wRU zMJqn5D+?IaCq1LuyNIdfF|+k?=7bsXu}0HP_ol!h+)7&Z(!A6lUQGA#p#r%}sA)k! z<6vZ7j6=!fa>j}D+|cZpQ7cKpY`YFYnRXI{PLdUf5|m6JBOb|Sk@5ka|Fz$oYcQ_3p+g-g{n9htdk6!qC` z+Whj`;!_=sbI79HM4j1niPh+vD}D7)+Z*dm&sE#CagrRXd4jLY!?@U>vkw>M=V;F6 zG*=!w&hZ=3SW#Z`v9ngD&Q6v(wtcq-LHIikjLom0=+>+r-65ZOZ$qk9B{CU%hmKX` zwwReAh*jUY&%O3;RhPf4N^yTEcvyZ)S6gECX})0}b3N#8p`>f)<-MCi*ON=C=d?{U znOQe?m9+p49(D)r&$dzecV4$L1eN?Q>>w;_+vJ_07@L36!}`_zdEL->>x|Z0g9Xmn z=edK0D-5Y_k2JX?-FVPw_}>??4fXte3#5HESNecw9*+A$uWi%xFE$<$9X#5pJ9qg2 zOIxam)O%-4t|_xEsB%(0X6~%K;kY8!&-QU{CBC@uiu>xz1?C4Wo}N*+{K1i(rQw0F zq5QT}k%#*}%>nV{{PWrnuinFUf$4?>rH$!Hh(5*`);pm$J(Fy#GdRD_6lM*Bk8F!K z6ooPF6?RS9oM>?CX*b&v$|1m$R_mW@@&1) jpkF(%^p@a{lNf7^o$b*@7q?4(v;4@ooCtP3Gj`9v5=-K! literal 0 HcmV?d00001 diff --git a/src/assets/map/renyuan/ico4.png b/src/assets/map/renyuan/ico4.png new file mode 100644 index 0000000000000000000000000000000000000000..42475ba89abf22f78e31f65714b37ffdd4fed8f4 GIT binary patch literal 1575 zcmaJ>eM}Q~7{2z(myE4OzIA#W5plG=UTL9MTIeTGwG2yz&TT?JuC&_TwY`HDLKJj? z3Y%_b45Ql=T^MXmMm7~kf=h(>H5c~>bAChxjfqBPbh@FS?24fK!+FWw?<3FizR&x- zZ*FU8Nm1Oq)Oi2^#OaH*MrK_cexoCqZ=UerK4wXwb!NJZbkG5d9|u%+(uzZRkEI$n z;ud?I?-VWv05HR4GSghp~0)covz|~KVDW}VzSk5uwiz%ARm$kWlR7MPFtX$$4yYOpaPzWD`WQIYXpX7 zAoKPDCX#f|b+6P((j?_1 zy^ux|?iL1RR=5Z|8K9Pj?VVMN`(3rTz0gm3pc#K;u9s*~=W5g<+zFWeQ%jPEAi299IGv%`7(PKx2Obt`pyzmvg^n^|84H5n~C;%ad2zN3laZ zhjyE->x=2+&d)xute#vDN&^z`?>5QbA9V*H@)yayCx*zRWmf{qtd^yz$PssW>}N z_4-8WNor?i+oSSLoZ1lCQJvCS(L^sQJrG%(1o}j#ZELS#^6rGL%aI8! zZsk;RXne_y?kg=l?9(w|Pnq(7cJt^PjZ!egZ|Vm^k2=Tpx)WLA>6HFj>(j}OxRB~c z9(R8{tkjWB);)Xg4_%8>x;aDtG)+jkXFwmu?O^w%pEUMwAF1z!iXN;il|%OinkJ&S zy_}=-Lz_U~QtrDfA7sqoZ0%s(6KBS?zEukizBY9BNNY{G&A#mHuWb{%(kdIJKx)Hd zWy8(-qxt={?Av86<((Pl*2jOk<|eC8uqy>>`3rpbMBQf|7+-{r@3AQxVpGqz^p>ZL z?9Bppfh*EQ<_9IfH^`7Px^b*Ix+-EAs;sFh1H>oT#S)eeHpVwZv|ly1t=iJO;AH;B z=(ut>aASX6QY!E7>r~n~xx#tT3$|ZSJ{&Rc&R;eCG_B20aNa(mU;XHhDql?T(S;*# zg2PYNeC`o+9h<%aE@wGA2OHNejW`EZht@y-@bI@q{KbihASW4ElaW031Ii=Aziz#* KM0-$OwfSEHTQK_o literal 0 HcmV?d00001 diff --git a/src/assets/map/renyuan/ico5.png b/src/assets/map/renyuan/ico5.png new file mode 100644 index 0000000000000000000000000000000000000000..ffe9c41e3d585cc7f4aa92dcacc213fe22d0b466 GIT binary patch literal 1553 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#8koDQqR!L z*u>ION5ROz&_dt9Lf_C>*U-$$#K6kPNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvxuvUUA!?`mmi>gwd`Wa4aL;pS*+ZlMI#n}WsfP`#!&_38s1qYsK)q{xN| z0aFl&2~WB}4m|Ov<^fZD5in`HZi!vOz`)e#>EaktaqGzR_>8_lnd9@HS00b}d09-i zIygqd>(C{$`cLUzorO=?mWl<e6RByY%0CKU=)FJiovE?0UQE`{yd>f3B^oKlgsl&U1SYoJ^?wz-_jq)*!cXRG&CyqWr}f}`(H z=!+(`!;jRJwU&GDlfUSCxNSqe)PA<#36?(BwIV`~`)oCS&@A>%DuRpuVO5Bpmd*Vc zdRt$pt>Es=YrVTcOzqT+Tc`IHFupsa9>LLExHb24#Le)9QA!tbe)y{9h`c*cRxvdt zShGL=6w_X(_!FlyKS(@NkMQoaZx9Vq@7wc5s`6!;WW36uf7O*4^PYqrt<#Tb>gIGk zEW0*1Xp?);gOhjiUvO66IrLm4LO1^^$NYtI+m3F%cTw)g^{9t))_i1|=b;jMuvT95 z+|R?7|Jb&-E-F3NQP+|#q+9F#wjud~?8M~kLerxh+ULJTKMPaU&|6(#_h{$o0`7AW z&$5$Si_0Ero!*hv%Kqec&h1^C-wIbH2Z~R(X7dHTiqAFEtGqg zZaFnq_i~zcYV?}Pmsk2qxl}!jvFew8lJH^a#*&o1?Mu#X+{AeDy=dlE$=1u2F(P^G zs!#9i*%b3FO>)=O9WA@+bl%MhJd}5{{07J8n00fcj2EyklX^C3QoD4(;`6St`TfqP xC0vTR_e}JT&$MXH`G06i?!3?Q-}EyuGXyN