From 35773f015230a7d0a39d9109fd440782a34d4b95 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 15 Jun 2021 16:52:45 +0800
Subject: [PATCH] 细节
---
widgets/searchTabaPopup/Widget.js | 27 ++++++++++++++++++++++++---
widgets/searchL/Widget.js | 9 ++++++---
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index b549d7c..818a747 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -222,7 +222,7 @@
// 注册鼠标左键单击事件
clickHand: function clickHand(data) {
var pickedObjects = this.map.scene.drillPick(data.position);
- console.log(pickedObjects[0].primitive.id.onceData);
+ // 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;
@@ -238,7 +238,7 @@
$('.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) {//视频
+ if (pickedObjects[0].primitive.id.onceData[0] == 2) {//监控
var dom = $('.header'),
str = `${data.name}--实时视频`;
dom.empty();
@@ -274,6 +274,9 @@
}
$('.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)
}
},
@@ -472,7 +475,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