From bb3721b514c504682b57129c36a5e205f8f50400 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Jun 2021 17:17:52 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/searchL/Widget.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 356343d..779b71f 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -233,15 +233,16 @@
clickHand: function clickHand(data) {
var pickedObjects = this.map.scene.drillPick(data.position) || 0;
// console.log(pickedObjects);
- if (pickedObjects.length != 0 && pickedObjects.id != undefined) {
+ if (pickedObjects.length != 0) {
var data = pickedObjects[0].primitive.id.onceData[1];
if (pickedObjects[0].primitive.id.onceData[0] == 1) {//全景
var address = data.panAddress;
- var dom = $('.header'),
+ var dom = $('.jimu-widget-searchTabaPopup').find('.header'),
str = `${data.name}--全景`;
dom.empty();
dom.append(str);
+ // console.log(data)
dom = $('#poput-m-t-quanjing');
str = `<iframe id="poput-m-t-quanjing-iframe" src="${address}" frameborder="0"></iframe>`;
@@ -251,10 +252,11 @@
$('.jimu-widget-searchTabaPopup').find('.p-main').eq(0).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
}
if (pickedObjects[0].primitive.id.onceData[0] == 2) {//监控
- var dom = $('.header'),
+ var dom = $('.jimu-widget-searchTabaPopup').find('.header'),
str = `${data.name}--实时视频`;
dom.empty();
dom.append(str);
+ // console.log(data)
if (data.flv) {
dom = $('#poput-m-t-video');
str = `
--
Gitblit v1.9.3