预警分析跳转bug修复，数据模式跳转添加

zengh

2021-04-13 d996d8466a2722f1548c814a7d47376de70be2a0

预警分析跳转bug修复，数据模式跳转添加

 src/views/alarmManagement/alarmAnalysis.vue

@@ -1,38 +1,38 @@
<template>
  <div class="big">
    <!-- 标题 -->
    <div class="alarm_title"><span>预警分析</span></div>
<!--    <div class="alarm_title"><span>预警分析</span></div>-->
    <!-- 时间按钮 -->
    <div class="timeSearchBtn">
      <el-button-group class="timeBtn">
        <el-button
         v-bind:class="activeClass == 1 ? 'btn-color' : ''" 
         v-bind:class="activeClass == 1 ? 'btn-color' : ''"
         size="small"
         @click="getData(1)">
         本周
         </el-button>

        <el-button 
        <el-button
        v-bind:class="activeClass == 2 ? 'btn-color' : ''"
        size="small" 
        size="small"
        @click="getData(2)">
        月初至今
        </el-button>

        <el-button 
        <el-button
        v-bind:class="activeClass == 3 ? 'btn-color' : ''"
        size="small" 
        size="small"
        @click="getData(3)">
        季度至今
        </el-button>
      </el-button-group>
      <el-date-picker 
      class="timeSearch" 
      size="small" 
      v-model="dateTime" 
      type="daterange" 
      <el-date-picker
      class="timeSearch"
      size="small"
      v-model="dateTime"
      type="daterange"
      @change="timeChange"
      range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> 
      range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
      </el-date-picker>
    </div>
    <!-- 监测点 -->
@@ -285,7 +285,7 @@
              color: '#3AA7F0'
            }
          ];
        }); 
        });
      },

      //主动报警（一键求助，电话报警）分页数据
@@ -366,7 +366,7 @@
                data: item.parcelData
              })
            }
            

            if (item.name == typesArray[2]) {
              data.push({
                name: item.name,
@@ -374,7 +374,7 @@
                data: item.healthcodeData
              })
            }
            

            if (item.name == typesArray[3]) {
              data.push({
                name: item.name,
@@ -466,7 +466,7 @@
          };

          myChart.setOption(option);
      

          //建议加上以下这一行代码，不加的效果图如下（当浏览器窗口缩小的时候）。超过了div的界限（红色边框）
          window.addEventListener('resize',function() {myChart.resize()});
        })
@@ -491,7 +491,6 @@
                },
                title:'一键求助',
                color:'#FF9836',
                target:'_blank',
                name:'日平均一键求助数',
                date:(res.data.data[0]/Math.round(day)).toFixed(2)
            },
@@ -564,7 +563,7 @@
          let myChart = echarts.init(document.getElementById('alarmTypeProEcharts'));
          myChart.on('click', function (params) {
              var data = [];
              

              if(params.name=='一键求助'){
                data.push({
                  startTime:startDate,
@@ -600,7 +599,7 @@
                });
                window.parent.handleStartAnimalHeat(data);
              }
              

          })
          var colors = ['#FF9836', '#3fa1ff', '#F34A4A', '#8058A5'];
          let option = {
@@ -644,11 +643,11 @@
              ]
          };
          myChart.setOption(option);
    

          //建议加上以下这一行代码，不加的效果图如下（当浏览器窗口缩小的时候）。超过了div的界限（红色边框）
          window.addEventListener('resize',function() {myChart.resize()});
        })
          

      },


@@ -671,7 +670,6 @@
                },
                title:'一键求助',
                color:'#FF9836',
                target:'_blank',
                name:res.data.data[0],
                date:(res.data.data[0]/count*100).toFixed(2)+'%'
            },
@@ -774,7 +772,7 @@
              ]
          };
          myChart.setOption(option);
    

          //建议加上以下这一行代码，不加的效果图如下（当浏览器窗口缩小的时候）。超过了div的界限（红色边框）
          window.addEventListener('resize',function() {myChart.resize()});
      },
@@ -907,7 +905,6 @@
                  },
                  title:'小于5分钟',
                  color:'green',
                  target:'_blank',
                  name:data[0]==0? 0:data[0]+"次",
              },
              {
@@ -1076,12 +1073,12 @@
                  name:'时段',
                  type: 'category',
                  boundaryGap: true,
                  axisLine: {  
                  axisLine: {
                      lineStyle:{
                        type:'dashed'
                      }
                  },
                  axisTick: { 
                  axisTick: {
                    show:false
                  },
                  data: ['0-2', '2-4', '4-6', '6-8', '8-10', '10-12', '12-14','14-16','16-18','18-20','20-22','22-24']
@@ -1205,7 +1202,7 @@


      //本日
      showToDay(Nowdate){   
      showToDay(Nowdate){
        var M=Number(Nowdate.getMonth())+1;
        if(M<10){
          M="0"+M;
@@ -1214,12 +1211,12 @@
        if(day<10){
          day = "0"+day;
        }
        return Nowdate.getFullYear()+"-"+M+"-"+day;   
        return Nowdate.getFullYear()+"-"+M+"-"+day;
      },

      //本周第一天
      showWeekFirstDay(Nowdate){   
        var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);   
      showWeekFirstDay(Nowdate){
        var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
        var M=Number(WeekFirstDay.getMonth())+1;
        if(M<10){
          M="0"+M;
@@ -1232,13 +1229,13 @@
      },

      //本月第一天
      showMonthFirstDay(Nowdate){   
        var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);   
      showMonthFirstDay(Nowdate){
        var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
        var M=Number(MonthFirstDay.getMonth())+1;
        if(M<10){
          M="0"+M;
        } 
        return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();   
        }
        return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
      },

      //本季度的第一天
@@ -1271,11 +1268,11 @@
    },

  }
    
  


</script>
<style lang="scss">
  

  @import '@/styles/alarmAnalysis/alarmAnalysis.scss'

</style>
</style>

 src/views/supervisoryConsole/data.vue

@@ -22,7 +22,7 @@
            <div class="info-active-top">
              <div class="active-list">
                <div>
                  <span class="dashboard_alarm ng-binding">预警</span>
                  <span @click.stop="StartEquipment({dxtype:2})" class="dashboard_alarm ng-binding">预警</span>
                </div>
                <div>
                  <span class="ng-binding">{{ yj }}</span>
@@ -31,7 +31,7 @@
              </div>
              <div class="active-list">
                <div>
                  <span class="dashboard_malfunction ng-binding">故障</span>
                  <span @click.stop="StartEquipment({dxtype:3})" class="dashboard_malfunction ng-binding">故障</span>
                </div>
                <div>
                  <span class="ng-binding">{{ gz }}</span>
@@ -42,7 +42,7 @@
            <div class="info-active-bottom">
              <div class="active-list">
                <div>
                  <span class="dashboard_normal ng-binding">正常</span>
                  <span @click.stop="StartEquipment({dxtype:1})" class="dashboard_normal ng-binding">正常</span>
                </div>
                <div>
                  <span class="ng-binding">{{ zx }}</span>
@@ -51,7 +51,7 @@
              </div>
              <div class="active-list">
                <div>
                  <span class="dashboard_inactive ng-binding">掉线</span>
                  <span @click.stop="StartEquipment({dxtype:0})" class="dashboard_inactive ng-binding">掉线</span>
                </div>
                <div>
                  <span class="ng-binding">{{ dx }}</span>