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

liuyg

2021-07-02 25ce610f6ecca7325e7a743dc032c4a76559c63d

 widgets/searchTabaPopup/Widget.js

@@ -31,14 +31,32 @@
            // 暴露在外的接
            var that = this;
            $('.cloce').click(() => {
               $('.jimu-widget-searchTabaPopup').css({ 'display': 'none' })
               if (window.$myVideoFlvplayer) {
                  var flvPlayer = window.$myVideoFlvplayer;
                  flvPlayer.pause();
                  flvPlayer.unload();
                  flvPlayer.detachMediaElement();
                  flvPlayer.destroy();
                  flvPlayer = null;
                  window.$myVideoFlvplayer = false
               }
               $('.jimu-widget-searchTabaPopup').css({ 'display': 'none' });
               that.myChart.clear();
               that.myChart1.clear();
               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(() => {
               if (that.times[0] != 1) {
                  // console.log(that.times);
                  var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val()
                  console.log(stcd);
               if (that.times[0] != 1 || window.defultEchartsTimes[0] != 1) {
                  that.times = window.defultEchartsTimes;
                  var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val();
                  that.getOurData(that.times, stcd);
               } else {
                  layui.use(function () { //亦可加载特定模块：layui.use(['layer', 'laydate', function(){
@@ -55,8 +73,10 @@
            $('.jimu-widget-searchTabaPopup').find('#empty').click(() => {
               $('.myCHosetimeinput').val("");
               that.times = [1];
               window.defultEchartsTimes = [1];
            })

				
         },

         closeToolBox: function (item) {
@@ -67,6 +87,8 @@

         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' });
            this.creMyEcharts();
@@ -83,7 +105,6 @@
                     let begintime = value.substring(0, 19),
                        endtime = value.substring(22);
                     that.times = [begintime, endtime];
                     // console.log(that.times)
                  }
               });
               // laydate.render({
@@ -107,7 +128,7 @@
            this.myChart2 = echarts.init(dom);
         },
         getOurData: function (time, stcd) {
            console.log(time)
            // console.log(time,stcd,55555555555555)
            var that = this
               , url = `http://171.34.76.171:8880/pyh-station/monitorData/queryStationHistoryMonitorData?stcd=${stcd}&startTime=${time[0]}&endTime=${time[1]}`,
               token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJlY2hpc2FuIiwic3ViIjoiYWRtaW4iLCJpYXQiOjE2MjMyNDQxNDQsImV4cCI6MTYyNTgzNjE0NH0.wjtMw7hv8IYGxFKI9b1vo2ozMXD1pE0-02HinfPl-r8l0TYVg1YvMBxW_VzzFKoY1jeC6XByQQT-aC_mAvBnWA';
@@ -135,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//空气
@@ -159,12 +188,16 @@
                     }
                     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);
                  }
                  // console.log(shui);
                  // console.log(seriesData);
                  // 渲染图表
                  that.getEchartsData(legendDataair, xDataair, seriesDataair, 2);//空气

@@ -186,13 +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);
                  }
                  // console.log(shui);
                  // console.log(seriesData);
                  // 渲染图表

                  that.getEchartsData(legendDataqi, xDataqi, seriesDataqi, 3);//气象
               }
            })
@@ -201,13 +239,13 @@
            var that = this;

            var option;
            // console.log(this.myChart);

            option = {
               // title: {
               //    text: '折线图堆叠'
               // },
               animationDuration: 1000,
               color: ['#1AD4AD', '#5AB1EF', '#F96D85', '#FFBD87', '#0067A5', '#CABDE7', '#D87C82', '#A0BEFF', '#D9D0C7', '#8DAD9C'],
               dataZoom: [{
                  type: 'slider'
               }, {