liuyg
2021-06-15 35773f015230a7d0a39d9109fd440782a34d4b95
细节
2 files modified
36 ■■■■ changed files
widgets/searchL/Widget.js 9 ●●●●● patch | view | raw | blame | history
widgets/searchTabaPopup/Widget.js 27 ●●●● patch | view | raw | blame | history
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' }
                            ]],
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);//气象
                    }
                })