Commit b2f7584ee4a335bfe7a135fe7d1f590f34f59cf5

Authored by ww
1 parent 85155e04

fix: device location device detail sensor device can not open gateway device

@@ -57,7 +57,14 @@ @@ -57,7 +57,14 @@
57 v-show="!isNull" 57 v-show="!isNull"
58 /> 58 />
59 </BasicModal> 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 </div> 68 </div>
62 </template> 69 </template>
63 <script lang="ts"> 70 <script lang="ts">
@@ -139,6 +146,8 @@ @@ -139,6 +146,8 @@
139 const isNull = ref(true); 146 const isNull = ref(true);
140 const { toPromise } = useScript({ src: BAI_DU_MAP_URL }); 147 const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
141 const [registerDetailDrawer, { openDrawer }] = useDrawer(); 148 const [registerDetailDrawer, { openDrawer }] = useDrawer();
  149 + const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
  150 + const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
142 const [registerModal, { openModal }] = useModal(); 151 const [registerModal, { openModal }] = useModal();
143 const BMapInstance = ref<Nullable<any>>(null); 152 const BMapInstance = ref<Nullable<any>>(null);
144 153
@@ -167,7 +176,7 @@ @@ -167,7 +176,7 @@
167 async function createMarket(data: DeviceInfo[]) { 176 async function createMarket(data: DeviceInfo[]) {
168 const BMap = (window as any).BMap; 177 const BMap = (window as any).BMap;
169 if (!BMap) return; 178 if (!BMap) return;
170 - unref(BMapInstance).clearOverlays(); 179 + unref(BMapInstance)?.clearOverlays();
171 const markerList: MarkerList[] = []; 180 const markerList: MarkerList[] = [];
172 data.forEach((item) => { 181 data.forEach((item) => {
173 const { 182 const {
@@ -242,6 +251,8 @@ @@ -242,6 +251,8 @@
242 }; 251 };
243 const { name, organizationDTO, deviceState, deviceProfile, deviceType } = record; 252 const { name, organizationDTO, deviceState, deviceProfile, deviceType } = record;
244 const { address, longitude, latitude } = record.deviceInfo; 253 const { address, longitude, latitude } = record.deviceInfo;
  254 +
  255 + console.log(record);
245 // 创建信息窗口对象 256 // 创建信息窗口对象
246 const res = await getDeviceActiveTime(entityId); 257 const res = await getDeviceActiveTime(entityId);
247 258
@@ -454,6 +465,14 @@ @@ -454,6 +465,14 @@
454 (window as any).openHistoryModal = null; 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 return { 476 return {
458 wrapRef, 477 wrapRef,
459 registerTable, 478 registerTable,
@@ -467,6 +486,10 @@ @@ -467,6 +486,10 @@
467 spinning, 486 spinning,
468 timePeriodRegister, 487 timePeriodRegister,
469 handleCancelModal, 488 handleCancelModal,
  489 + registerTbDetailDrawer,
  490 + registerGatewayDetailDrawer,
  491 + handleOpenTbDeviceDetail,
  492 + handleOpenGatewayDetail,
470 }; 493 };
471 }, 494 },
472 }); 495 });