From 823010d45d5e9dc983c883fb8bacaaf75c846370 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 15 Jun 2021 17:11:09 +0800
Subject: [PATCH] bug
---
widgets/searchL/Widget.js | 103 ++++++++++++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 818a747..e1abfe1 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -98,7 +98,7 @@
})
$("#local_data").keyup(function (e) {
- console.log(e);
+ // console.log(e);
that.getInputData();
if (e.keyCode == 13 && typeof that.searchDatas == 'string') {
var han = /^[\u4e00-\u9fa5]+$/;
@@ -221,62 +221,65 @@
},
// 注册鼠标左键单击事件
clickHand: function clickHand(data) {
- var pickedObjects = this.map.scene.drillPick(data.position);
- // console.log(pickedObjects[0].primitive.id.onceData);
- var data = pickedObjects[0].primitive.id.onceData[1];
- if (pickedObjects[0].primitive.id.onceData[0] == 1) {//全景
- var address = data.panAddress;
- var dom = $('.header'),
- str = `${data.name}--全景`;
- dom.empty();
- dom.append(str);
+ var pickedObjects = this.map.scene.drillPick(data.position) || 0;
+ // console.log(pickedObjects);
+ if (pickedObjects.length != 0) {
+ var data = pickedObjects[0].primitive.id.onceData[1];
- dom = $('#poput-m-t-quanjing');
- str = `<iframe id="poput-m-t-quanjing-iframe" src="${address}" frameborder="0"></iframe>`;
- dom.empty();
- dom.append(str);
- $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
- $('.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'),
- str = `${data.name}--实时视频`;
- dom.empty();
- dom.append(str);
- if (data.flv) {
- dom = $('#poput-m-t-video');
- str = `
+ if (pickedObjects[0].primitive.id.onceData[0] == 1) {//全景
+ var address = data.panAddress;
+ var dom = $('.header'),
+ str = `${data.name}--全景`;
+ dom.empty();
+ dom.append(str);
+
+ dom = $('#poput-m-t-quanjing');
+ str = `<iframe id="poput-m-t-quanjing-iframe" src="${address}" frameborder="0"></iframe>`;
+ dom.empty();
+ dom.append(str);
+ $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
+ $('.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'),
+ str = `${data.name}--实时视频`;
+ dom.empty();
+ dom.append(str);
+ if (data.flv) {
+ dom = $('#poput-m-t-video');
+ str = `
<video id="poput-m-t-video-video" ></video>
`;
- dom.empty();
- dom.append(str);
- if (flvjs.isSupported()) {
- var videoElement = document.getElementById('poput-m-t-video-video');
- var flvPlayer = flvjs.createPlayer({
- type: 'flv',
- url: data.flv
- });
- flvPlayer.attachMediaElement(videoElement);
- flvPlayer.load();
- flvPlayer.play();
- }
- window.$myVideoFlvplayer = flvPlayer;
- // var time = setTimeout(() => {
+ dom.empty();
+ dom.append(str);
+ if (flvjs.isSupported()) {
+ var videoElement = document.getElementById('poput-m-t-video-video');
+ var flvPlayer = flvjs.createPlayer({
+ type: 'flv',
+ url: data.flv
+ });
+ flvPlayer.attachMediaElement(videoElement);
+ flvPlayer.load();
+ flvPlayer.play();
+ }
+ window.$myVideoFlvplayer = flvPlayer;
+ // var time = setTimeout(() => {
- // }, 2000);
- } else {
- var dom = $('#poput-m-t-video'),
- str = `
+ // }, 2000);
+ } else {
+ var dom = $('#poput-m-t-video'),
+ str = `
<div id="poput-m-t-video-none" >·暂无视频</div>
`;
- dom.empty();
- dom.append(str);
+ dom.empty();
+ dom.append(str);
+ }
+ $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
+ $('.jimu-widget-searchTabaPopup').find('.p-main').eq(0).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
}
- $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
- $('.jimu-widget-searchTabaPopup').find('.p-main').eq(0).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
- }
- if (pickedObjects[0].primitive.id.onceData[0] == 3) {//监测
- console.log('监测',data)
+ if (pickedObjects[0].primitive.id.onceData[0] == 3) {//监测
+ console.log('监测', data)
+ }
}
},
--
Gitblit v1.9.3