Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

liuyg

2021-07-02 25ce610f6ecca7325e7a743dc032c4a76559c63d

 widgets/searchTabaPopup/Widget.js

@@ -46,6 +46,11 @@
               that.myChart2.clear();
               $('.myCHosetimeinput').val("");
               that.times = [1];

               var dom = $('#poput-m-t-video');
               dom.empty();
               dom = $('#poput-m-t-quanjing');
               dom.empty();
            })

            $('.jimu-widget-searchTabaPopup').find('#query').click(() => {
@@ -71,6 +76,7 @@
               window.defultEchartsTimes = [1];
            })

				
         },

         closeToolBox: function (item) {
@@ -81,7 +87,7 @@

         onOpen: function () {
            var that = this;
				


            // $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
            // $('.jimu-widget-searchTabaPopup').find('.p-main').eq(1).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
@@ -150,10 +156,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//空气
@@ -174,7 +188,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);
                  }
@@ -199,11 +219,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);//气象
               }
            })
@@ -218,7 +245,7 @@
               //    text: '折线图堆叠'
               // },
               animationDuration: 1000,
               color: ['#1AD4AD', '#5AB1EF', '#F96D85', '#FFBD87', '#0067A5','#CABDE7','#D87C82','#A0BEFF','#D9D0C7','#8DAD9C'],
               color: ['#1AD4AD', '#5AB1EF', '#F96D85', '#FFBD87', '#0067A5', '#CABDE7', '#D87C82', '#A0BEFF', '#D9D0C7', '#8DAD9C'],
               dataZoom: [{
                  type: 'slider'
               }, {