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

shuishen

2021-06-15 16c749f28123b94ba7ac7eb6fedb68d434109d66

 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);//气象
               }
            })