From 16c749f28123b94ba7ac7eb6fedb68d434109d66 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Jun 2021 17:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/searchTabaPopup/Widget.js | 27 ++++++++-
widgets/searchL/Widget.js | 101 ++++++++++++++++++---------------
2 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 1f4ca0f..2e74726 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -99,7 +99,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]+$/;
@@ -225,58 +225,65 @@
},
// 注册鼠标左键单击事件
clickHand: function clickHand(data) {
- var pickedObjects = this.map.scene.drillPick(data.position);
- 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)
+ }
}
},
@@ -475,7 +482,7 @@
, cols: [[
{ field: 'tableId', width: 59, align: 'center', unresize: true, title: '序号' }
, { field: 'name', width: 90, align: 'center', unresize: true, title: '站点' }
- , { field: 'wetlandName', width: 95, align: 'center', unresize: true, title: '所属保护区' }
+ , { field: 'wetlandName_', width: 95, align: 'center', unresize: true, title: '所属保护区' }
, { field: 'remark', width: 95, align: 'center', unresize: true, title: '备注' }
, { fixed: 'right', align: 'center', unresize: true, title: '操作', toolbar: '#demoTable2' }
]],
diff --git a/widgets/searchTabaPopup/Widget.js b/widgets/searchTabaPopup/Widget.js
index af73839..a8a0e4f 100644
--- a/widgets/searchTabaPopup/Widget.js
+++ b/widgets/searchTabaPopup/Widget.js
@@ -155,10 +155,18 @@
}
seriesData.push(once);
}
- var ins = shui[0].valList;
+ try {
+ var ins = shui[1].valList;
+ }
+ catch (err) {
+ //在这里处理错误
+ // console.log(err)
+ }
for (var i in ins) {
xData.push(ins[i].startTime);
}
+ // console.log(seriesData)
+ // console.log(shui[0].valList)
that.getEchartsData(legendData, xData, seriesData, 1);//水文
var air = res.data.data.MONITOR_AIR//空气
@@ -179,7 +187,13 @@
}
seriesDataair.push(once);
}
- var ins = air[0].valList;
+ try {
+ var ins = air[0].valList;
+ }
+ catch (err) {
+ //在这里处理错误
+ // console.log(err)
+ }
for (var i in ins) {
xDataair.push(ins[i].startTime);
}
@@ -204,11 +218,18 @@
}
seriesDataqi.push(once);
}
- var ins = qi[0].valList;
+ try {
+ var ins = qi[0].valList;
+ }
+ catch (err) {
+ //在这里处理错误
+ // console.log(err)
+ }
for (var i in ins) {
xDataqi.push(ins[i].startTime);
}
// 渲染图表
+
that.getEchartsData(legendDataqi, xDataqi, seriesDataqi, 3);//气象
}
})
--
Gitblit v1.9.3