From f3a863102a0ecf38748740b668d139478addf36e Mon Sep 17 00:00:00 2001 From: xuhaoyun Date: Fri, 30 Jun 2023 10:18:01 +0800 Subject: [PATCH] 0630 --- src/api/safetyIndex/index.js | 22 ++-- src/assets/realtimeWarning/消息.png | Bin 1525 -> 848 bytes src/components/offLineMap/index.vue | 22 ++-- src/views/companyCanban/fanggopngji.vue | 10 +- src/views/enterpriseRank/index.vue | 38 +++--- src/views/factorResources/index.vue | 1 + src/views/realtimeWarning/index.vue | 158 +++++++++++++++++++++++- src/views/safetyIndex/cheliang.vue | 10 +- src/views/safetyIndex/paiming.vue | 2 +- src/views/safetyIndex/shuju.vue | 8 +- src/views/safetyIndex/yuangong.vue | 6 +- 11 files changed, 211 insertions(+), 66 deletions(-) diff --git a/src/api/safetyIndex/index.js b/src/api/safetyIndex/index.js index 779a529..3d028ab 100644 --- a/src/api/safetyIndex/index.js +++ b/src/api/safetyIndex/index.js @@ -49,21 +49,21 @@ export function flowDetail(params) { }) } //企业今日进园区 -export function vehicleIn(params) { +export function vehicleIn(data) { return request({ - url: '/safety/index/vehicle/in', + url: '/safety/tbParkVehicleRecord/list', method: 'post', - params - }) -} -//企业今日出园区 -export function vehicleOut(params) { - return request({ - url: '/safety/index/vehicle/out', - method: 'post', - params + data }) } +// //企业今日出园区 +// export function vehicleOut(params) { +// return request({ +// url: '/safety/index/vehicle/out', +// method: 'post', +// params +// }) +// } //企业车辆使用方式 export function vehicleUserType(params) { return request({ diff --git a/src/assets/realtimeWarning/消息.png b/src/assets/realtimeWarning/消息.png index 284a2a35f3c1b58d503eba2489a8dafc620c3339..f7f76efcf3ed6fbd402a9bc017518b62af1f0464 100644 GIT binary patch literal 848 zcmV-W1F!svP)Px#1ZP1_K>z@;j|==^1poj7`bk7VR5(w4R6TE8MHD?V^WMBKKW}Uk6kACVhYAHz zKocp&_B6Eo0fgv~_yJKGs7R9{G$0`*4HS?%MVbg23M8ZyM6%@2#K=b8-MsIa;oMml zD2j9Cqn({O_w4<&3b$@);4yKeu{|gpT-2EH6SYP$DzwuYVnq@n+B5)5k5e0P^&gLH z<|#B!NFkOQO>R)82FqoFEHS{Op{&N}*Fvcd2!kixqn{k=dO|ZgTz)aA@aYFB_K-#q ztr93A3pLPFNAZ^vjjXsDh5Gh@mm;M37tpIELYQ#U_8NQbIt__LL`ro5)z(iaE`0^) z9DXQ}S3g9^S?=n$zDBwABQi6KK6|y+IF@>}8ht~dCV}0&4XAyL?E~cHhuFIG9b?&z zxUljHkrYUa zyBJqDapaz|TeOZ{u}&e)KVr^@Xik3P`AfdMDk7G}x7EMD0{%G+eey|Zoc8OESav3O zM?6HxD~A4Vynmg^n{b4y=#x98!WTDKKols34BF%vLy2PJ8mju2wbwb;EI&rGdWKXr za9D8ovcT#GShiD4^K*))H=84bD@OlyjdD)wAj8H%lQ~Hv?aihGIpm5@CqmnQbL5v4 zu^yvym=cG??wrxjH%pFi#ivUsbi#cJIroJlpAehX6_W0p(a*Ou`v#k{E750nbSiwy z75Qt&Vq-|ryA+${`^0DyV=nD{?s5Hy-Kssx&M~qP8+L#hd-Q1!=Q^~f zPq8}wJ)Y%G-h?AuOx%8Z*8WHP6k^W17}35Mm}-yAwInzEfAkVlzKW2u+{v48geyLH a+y4h=q+4HRmTdU|0000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR919-spN1ONa40RR919smFU0Lno(1pojAUr9tkR7efQR?lx6MHK$_hj;C@ z9Vc;9HC2ls0tqDt4wO3wZk#Fbe{krnYA@8pxNrb91qo54fD$QD zk~&W9c)h#B_l>>lUB}6_Pa1o6=6&y*H}mGb0bY{6vN9 z-n}aE_ICAq9=x?xA)>89V}218Lj`G>P-O2B|KwnzyW4m0W?^sA`IUdy+Y^?}HG_xz zE-&KlT{~AMFNn{Pig1f$BD%ie;PBMJYczN?bkG|WILq7#4OSZlfAOo^GT41;>_WD= zh|BGYHubX4GM8u=Uy6Y-?>B*dhM`gUEk zMUUCt-maWGjh940q%(bdbw=tsK0U0V-B?19HQ{=7-jh1o?bmHnUt_MZPo$!)1$;+POmvx?>l(Or!RJ~{jvhx?x+^t&*aZCRl>?P#vTNu8-MCfN8)4oQX@WcG4#4Rxq1 zjIgpH$!(Uggj)13wEc0lNoloP!Q}!dA41VMJj(NUgyyPV;r72V*A3Wef zCNC3PBvh&_xefP6jxA~Fe;EdDN~4U<{_hy1eKMC*iY47-91_*MiJgcr4B$$n;^! z`D)Pp+q16{E`;SRfAoQ6ShC8d1kq&>O|A`NglB3!ojrH+pb|uKK9_Q^xL$d=R8`Rn zVy>pjKt;63^3!(e={%`03yE`M#R4>tFCw43=)bhBiwJYrrNp_C{ws?pPt5f%Bb!rw bF`xefhO&m%D;O9+00000NkvXXu0mjf$6UX0 diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue index 97944d0..559da43 100644 --- a/src/components/offLineMap/index.vue +++ b/src/components/offLineMap/index.vue @@ -19,7 +19,8 @@ export default { villageList: [], villageSumList: [], flag: true, - companyList: [] + companyList: [], + label1: {} } }, mounted() { @@ -180,9 +181,10 @@ export default { label.setStyle({ backgroundColor: ' rgba(0, 0, 0, 0)', border: '0', color: '#0060ce', fontSize: '16px' }) map.addOverlay(label); marker.addEventListener("click", function () { + map.removeOverlay(that.label1); topMapOne({ companyId: item.companyId, companyName: item.companyName }).then(res => { - var label = new BMap.Label(); - label.setStyle({ + that.label1 = new BMap.Label(); + that.label1.setStyle({ color: 'blue', borderRadius: '5px', borderColor: '#ccc', @@ -192,10 +194,10 @@ export default { transform: 'translateX(-50%) translateY(calc(-100% - 10px))' }); - label.setPosition(new BMap.Point(item.longitude, item.latitude)); - label.setOffset(new BMap.Size(130, -10)) - label.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' }) - label.setContent(` + that.label1.setPosition(new BMap.Point(item.longitude, item.latitude)); + that.label1.setOffset(new BMap.Size(130, -10)) + that.label1.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' }) + that.label1.setContent(`

${res.data.companyName}

企业看板
@@ -243,17 +245,17 @@ export default {
`); - map.addOverlay(label); + map.addOverlay(that.label1); let closebtn = document.querySelector('.closeBtn') let closeBtn1 = document.querySelector('.closeBtn1') closeBtn1.addEventListener('click', () => { - map.removeOverlay(label); + map.removeOverlay(that.label1); }) //console.log(btn, 'btn'); closebtn.addEventListener('click', () => { that.$emit('toArchives', item) - map.removeOverlay(label); + map.removeOverlay(that.label1); }) }) }); diff --git a/src/views/companyCanban/fanggopngji.vue b/src/views/companyCanban/fanggopngji.vue index e6f9616..b7593d1 100644 --- a/src/views/companyCanban/fanggopngji.vue +++ b/src/views/companyCanban/fanggopngji.vue @@ -32,7 +32,6 @@ -
@@ -52,14 +51,7 @@
{{ staffStatisticsList[3].levelIndexTwo }}
-
-
-
-
-
-
-
-
+
{{ staffStatisticsList[3].sumNumValue }}
diff --git a/src/views/enterpriseRank/index.vue b/src/views/enterpriseRank/index.vue index 40bb74d..2bc2d8d 100644 --- a/src/views/enterpriseRank/index.vue +++ b/src/views/enterpriseRank/index.vue @@ -28,21 +28,21 @@ - + - + - +