Commit b2f7584ee4a335bfe7a135fe7d1f590f34f59cf5
1 parent
85155e04
fix: device location device detail sensor device can not open gateway device
Showing
1 changed file
with
25 additions
and
2 deletions
... | ... | @@ -57,7 +57,14 @@ |
57 | 57 | v-show="!isNull" |
58 | 58 | /> |
59 | 59 | </BasicModal> |
60 | - <DeviceDetailDrawer @register="registerDetailDrawer" /> | |
60 | + <DeviceDetailDrawer | |
61 | + @register="registerDetailDrawer" | |
62 | + @open-tb-device-detail="handleOpenTbDeviceDetail" | |
63 | + @open-gateway-device-detail="handleOpenGatewayDetail" | |
64 | + /> | |
65 | + <DeviceDetailDrawer @register="registerTbDetailDrawer" /> | |
66 | + | |
67 | + <DeviceDetailDrawer @register="registerGatewayDetailDrawer" /> | |
61 | 68 | </div> |
62 | 69 | </template> |
63 | 70 | <script lang="ts"> |
... | ... | @@ -139,6 +146,8 @@ |
139 | 146 | const isNull = ref(true); |
140 | 147 | const { toPromise } = useScript({ src: BAI_DU_MAP_URL }); |
141 | 148 | const [registerDetailDrawer, { openDrawer }] = useDrawer(); |
149 | + const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer(); | |
150 | + const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer(); | |
142 | 151 | const [registerModal, { openModal }] = useModal(); |
143 | 152 | const BMapInstance = ref<Nullable<any>>(null); |
144 | 153 | |
... | ... | @@ -167,7 +176,7 @@ |
167 | 176 | async function createMarket(data: DeviceInfo[]) { |
168 | 177 | const BMap = (window as any).BMap; |
169 | 178 | if (!BMap) return; |
170 | - unref(BMapInstance).clearOverlays(); | |
179 | + unref(BMapInstance)?.clearOverlays(); | |
171 | 180 | const markerList: MarkerList[] = []; |
172 | 181 | data.forEach((item) => { |
173 | 182 | const { |
... | ... | @@ -242,6 +251,8 @@ |
242 | 251 | }; |
243 | 252 | const { name, organizationDTO, deviceState, deviceProfile, deviceType } = record; |
244 | 253 | const { address, longitude, latitude } = record.deviceInfo; |
254 | + | |
255 | + console.log(record); | |
245 | 256 | // 创建信息窗口对象 |
246 | 257 | const res = await getDeviceActiveTime(entityId); |
247 | 258 | |
... | ... | @@ -454,6 +465,14 @@ |
454 | 465 | (window as any).openHistoryModal = null; |
455 | 466 | }); |
456 | 467 | |
468 | + const handleOpenTbDeviceDetail = (data: { id: string; tbDeviceId: string }) => { | |
469 | + openTbDeviceDrawer(true, data); | |
470 | + }; | |
471 | + | |
472 | + const handleOpenGatewayDetail = (data: { id: string; tbDeviceId: string }) => { | |
473 | + openGatewayDetailDrawer(true, data); | |
474 | + }; | |
475 | + | |
457 | 476 | return { |
458 | 477 | wrapRef, |
459 | 478 | registerTable, |
... | ... | @@ -467,6 +486,10 @@ |
467 | 486 | spinning, |
468 | 487 | timePeriodRegister, |
469 | 488 | handleCancelModal, |
489 | + registerTbDetailDrawer, | |
490 | + registerGatewayDetailDrawer, | |
491 | + handleOpenTbDeviceDetail, | |
492 | + handleOpenGatewayDetail, | |
470 | 493 | }; |
471 | 494 | }, |
472 | 495 | }); | ... | ... |