Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-19 1004c23b6dac69886e3c72d8b8b4b7527585aac4

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 src/views/alarm/alarm.vue

@@ -369,9 +369,6 @@
      },
      onLoad(page, params = {}) {
        this.loading = true;
        params = {
          alarmType:this.$route.query
        }
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;

 src/views/home/home.vue

@@ -46,8 +46,8 @@
      //主动报警（一键求助，电话报警）分页数据
      handleStartAlarm(data){
         this.$router.push({
          path: `/alarm/alarmPage`,
          query: data
          path: `/realTimePolice/index`,
          query: data[0]
        });
      }


 src/views/realTimePolice/real.vue

@@ -796,6 +796,13 @@
      let values = {
        ...params,
      };

      console.log(this.$router.query, 111)

      params = {
        alarmType:this.$router.query.alarmType
      }
     
      if (releaseTimeRange) {
        values = {
          ...params,