From 7aa8abc47c73378a6f9d39dd387984e5a59d133d Mon Sep 17 00:00:00 2001 From: HH <2454517719@qq.com> Date: Thu, 20 Jun 2024 16:50:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9C=B0=E5=9B=BE=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 +- src/api/map.ts | 31 +++++- src/assets/images/marks/icon-fj.png | Bin 0 -> 1293 bytes src/assets/images/marks/icon-sb.png | Bin 0 -> 1136 bytes src/components/global-register/map/Mars3D.vue | 98 ++++++++++-------- .../right-side/components/command.vue | 2 +- 6 files changed, 84 insertions(+), 49 deletions(-) create mode 100644 src/assets/images/marks/icon-fj.png create mode 100644 src/assets/images/marks/icon-sb.png diff --git a/.vscode/settings.json b/.vscode/settings.json index c112660..950b1d3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -43,7 +43,7 @@ "vite" ], "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "volar.tsPlugin": true, "typescript.tsdk": "node_modules/typescript/lib", diff --git a/src/api/map.ts b/src/api/map.ts index a949486..cb36a9b 100644 --- a/src/api/map.ts +++ b/src/api/map.ts @@ -7,7 +7,7 @@ export function emerShelterList(params) { return request({ url: `/screen/index/emerShelterList`, method: "GET", - params:params + params: params }); } /** @@ -26,7 +26,7 @@ export function emerRiskPoolList(params) { return request({ url: `/screen/index/emerRiskPoolList`, method: "GET", - params:params + params: params }); } /** @@ -45,7 +45,7 @@ export function emerWareHouseList(params) { return request({ url: `/screen/index/emerWareHouseList`, method: "GET", - params:params + params: params }); } /** @@ -57,11 +57,34 @@ export function emerWareHouseDetail(params) { method: "GET", }); } + + +/** + *地图信息：应急上报事件列表 + */ +export function emerEventList(params) { + return request({ + url: `/screen/index/emerEventList`, + method: "GET", + params: params + }); +} + +/** + *地图信息：户籍列表 + */ +export function domicileList(params) { + return request({ + url: `/screen/index/domicileList`, + method: "GET", + params: params + }); +} // 地图信息：整体信息 export function emerMapInfo(params) { return request({ url: `/screen/index/emerMapInfo`, method: "GET", - params:params + params: params }); } \ No newline at end of file diff --git a/src/assets/images/marks/icon-fj.png b/src/assets/images/marks/icon-fj.png new file mode 100644 index 0000000000000000000000000000000000000000..395637f910e04ea5f3b2046e0dc40acd9323a6c7 GIT binary patch literal 1293 zcmV+o1@iidP)Px($4Nv%R7gvmmU~cCbri?H=kBh+@)nk-WK&sYjA*85=3{Ic%PA*ol+rR%}#t++6IT%>lg82$|z{+1lV6*N?sI%gz-KDdhNLDS+3E9^kf4f!?lA( zR$kGCQ&mgw$fG=%lb!v_UizGg?sSM7=(GmNxu zYh!QHfRDBq`Warl(hZ%K5Er9EQAs0KCWc|F(TuD&BM=;*!PS3yFnd}+Kbw{|5jn;d zWlaIB$x#9Oa{B|!%}!jav%zMUaO`vkLW4E9dE0^Mlk}K1Rmm#GKkVBNU}+PPy~hP0 zz(}jJ&7KJM=S6r9pSxsLMAMVQar8_Fs?K+L_F^J+*s?AX+xD3;W3nFeX9s!qWWeU# z7FPsdBc*Lt0iV3D0{*(*gVMvTn3mwD_;UQm4v)yh@xGWj#UEdnx8t=Jf-!ZXUIny@ zcxRUj02z?_u9@Y6$nktypaSG=IYq9vWTgfTW~b5wZ>1R!ZP1~))rsf`UB48`cOt9E zqUeFyNXeVj2ugRTfD4zcI9uI?q(!6gZ@nGykNPTt;h|bwzhT4ZU@a=EI~4~O%vDn) z12PNyM39te^3_TrPs38hGN1aqdeY-A}d0_{BFgK20J=BC1s368?;Dx z+z)e~4*1{bD6h1l?8qILhJ@|3B;9n00cA{&8>>U!hEQlUt|&(ObahL}+-`xTU2+4` z=+(8Rd;-7c7Ml|9gH?$^2n*GWNWZS$iM?OS=a zrA0`PcjMaBBq{~(`w)$i;SNdtCWltk#-AuN)C``jA(H;$GE0y{YpVf6 zz2bdSMpSg_Ky=nnbsM(f=Ox`vVdl^8tqBosX(2rJ{TET{93Ox*EC67dv$UZKpy{rX z_tt{3wBlgw!Qr~j3ji=H@z#?}sJ`3Vf`VYGJbNf+&T!)HsJ%IdXA&EV!Mq9}CrFrF zbtvi&Zw$SPKo**@_~vLy(i{=M-~D_zcBePu@|phtP|xz@)+R6p00000NkvXXu0mjf DOPx(DoI2^R7gvumR)F*R~X0t&-A+B%uN7)Gtn)DIZ7QJ ze_Fc27d$XfWg5mWLfBe(?_VNTfG~A-b_osQQ>VP9*LxqpXYVa)=g9nxdhFN_Wc2iO zf~YTRz_V z93ed%&cFcW$PwG!n-3qt7#RWL@wDT*bx@m{K;`92Ks-4K^U|esmVhYfp->i}cFDpo z3{8VRG6J5Og0glk%!vspO4Zd6P_@1u%BD?=eO|tVF))xR14l_aemo0s_4F(<<`*xZ zhr>`dZ+4*8$_ez*=DTI@4B3!}f^Ds+^zqemA2y}h;ol$L@jDj@2B zxj8A!j~|29tg#35rJGWwNbBrm5Q(;eE3;rxtO(?M`EnGUI05s~BN*q-0j4QyVH?4j zGg6O_@rZKMt#&Zem7>{4t!)7?IG7ip)YJgQ#f1TpNDkoO!G#+1 z_k%p1bb+R(z@p`1v2^dRS_O62F7WHuFfLw{DZ+{sP`7OZRaMDoq~G*3bg@y9cu|AY zfddH!ykb!lObG;}p>gAeEToemx=C5TUYd%NtY5j3b|dPg9CzG<6{z)obov2l=rw%puW*GlFqLxZYr^j^3y`L<2u1#mD}Hg6ch zxx!9>nESk!FMpda!n^?Cm}qEd22m_?GOZITmY#V%o=<3ac { emerShelterList({}).then((res: any) => { res.data.forEach((item) => { // console.log(item, "item===>"); - addMark(item.lng, item.lat, "icon-bncs", 1, item.othrefugeid); + addMark(item.lng, item.lat, "icon-bncs", 1, item.othrefugeid, item); }); }); }; @@ -147,7 +149,7 @@ const getEmerRiskPoolList = () => { emerRiskPoolList({}).then((res: any) => { res.data.forEach((item) => { // console.log(item, "item===>"); - addMark(item.lon, item.lat, "icon-wl", 2, item.poolId); + addMark(item.lon, item.lat, "icon-wl", 2, item.poolId, item); }); }); }; @@ -156,7 +158,26 @@ const getEmerWareHouseList = () => { emerWareHouseList({}).then((res: any) => { res.data.forEach((item) => { // console.log(item, "item===>"); - addMark(item.lon, item.lat, "icon-hj", 3, item.houseId); + addMark(item.lon, item.lat, "icon-hj", 3, item.houseId, item); + }); + }); +}; +//地图信息：应急上报事件列表 +const getemerEventList = () => { + emerEventList({}).then((res: any) => { + res.data.forEach((item) => { + // console.log(item, "item===>"); + addMark(item.lon, item.lat, "icon-sb", 4, item.emerEventId, item); + }); + }); +}; + +//地图信息：户籍列表 +const getdomicileList = () => { + domicileList({}).then((res: any) => { + res.data.forEach((item) => { + // console.log(item, "item===>"); + addMark(item.lon, item.lat, "icon-fj", 5, item.emerEventId, item); }); }); }; @@ -179,6 +200,10 @@ const loadLayer = (insideJson: string, outJson: string) => { getEmerRiskPoolList(); // 应急仓库列表 getEmerWareHouseList(); + //应急上报事件列表 + getemerEventList(); + //户籍列表 + getdomicileList(); }; /** @@ -371,63 +396,54 @@ const datatext4 = ref("xxxxxxx地址"); * 加载点击区域 */ const loadAreaChild = (attrTemp: any) => { - // graphicLayer.value = new mars3d.layer.GraphicLayer(); - // map.addLayer(graphicLayer.value); graphicLayer.value.bindPopup((event: any) => { - // console.log(event, "event====>"); - + console.log(event.graphic, "event====>"); let attr = event.graphic.attr || {}; - // console.log(attr, "attr==>"); - console.log( - event.graphic.objectsToExclude?.id, - "event.graphic.objectsToExclude?.id===>" - ); let title = "点位"; + let item = event.graphic.objectsToExclude?.item switch (event.graphic.objectsToExclude?.type || -1) { case 1: title = "避难场所"; - emerShelterDetail({ - id: event.graphic.objectsToExclude?.id, - }).then((res: any) => { - attr["场所名称："] = res.data.name; - attr["占地面积："] = res.data.space; - attr["地址："] = res.data.address; + attr["场所名称："] = item.name; + attr["占地面积："] = item.space; + attr["地址："] = item.address; attr["跳转："] = ``; - }); - // getemerShelterDetail(id); break; case 2: - title = "风险池"; - emerRiskPoolDetail({ id: event.graphic.objectsToExclude?.id }).then( - (res: any) => { - attr["风险地址："] = res.data.address; - attr["风险类型："] = res.data.typeName; - attr["跳转："] = ``; - } - ); break; case 3: title = "应急仓库"; - emerWareHouseDetail({ id: event.graphic.objectsToExclude?.id }).then( - (res: any) => { - attr["地址："] = res.data.address; - attr["管理员："] = res.data.nameId; - attr["联系电话："] = res.data.telephone; - attr["跳转："] = ``; - } - ); + break; + case 4: + title = "应急上报事件"; + attr["上报标题："] = item.title; + attr["所属地区："] = item.areaName; + attr["上报地址："] = item.address; + break; + case 5: + title = "户籍信息"; + attr["上报标题："] = item.name; + attr["所属地区："] = item.areaName; break; default: @@ -438,11 +454,6 @@ const loadAreaChild = (attrTemp: any) => { attr["应急仓库："] = wholeNumber.value.emerWareHouseNum; break; } - // return mars3d.Util.getTemplateHtml({ - // title, - // template: "all", - // attr, - // }); return mars3d.Util.getTemplateHtml({ title, template: "all", @@ -489,10 +500,11 @@ const addMark = ( lat: number, imgName: string, type: number, - id: string + id: string, + item:object ) => { const graphic = new mars3d.graphic.BillboardEntity({ - objectsToExclude: { type, id }, + objectsToExclude: { type, id, item }, position: new mars3d.LngLatPoint(lng, lat), style: { image: getImageUrl(imgName), diff --git a/src/views/home-page/right-side/components/command.vue b/src/views/home-page/right-side/components/command.vue index d690640..bbe49e5 100644 --- a/src/views/home-page/right-side/components/command.vue +++ b/src/views/home-page/right-side/components/command.vue @@ -164,7 +164,7 @@ width="100" />