Merge remote-tracking branch 'origin/master'

zengh

2021-03-19 ac2560630ca05402b9514d3585e4eeb8d1e951d2

Merge remote-tracking branch 'origin/master'

 src/router/views/index.js

@@ -143,7 +143,7 @@
    {
        path: '/realTimePolice',
        component: Layout,
        redirect: '/realTimePolice/real',
        redirect: '/realTimePolice/index',
        children: [{
            path: 'index',
            name: '实时报警',

 src/views/home/home.vue

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


 src/views/realTimePolice/real.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-03-17 15:21:33
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-03-19 11:53:17
 * @Last Modified time: 2021-03-19 15:21:40
 */
<template>
  <basic-container>
@@ -689,7 +689,7 @@

    this.recorder = new Recorder({
      sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
      sampleRate: 16000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
      sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
      numChannels: 1, // 声道，支持 1 或 2， 默认是1
      // compiling: false,(0.x版本中生效,1.x增加中)  // 是否边录边转换，默认是false
    });
@@ -805,6 +805,13 @@
      let values = {
        ...params,
      };

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

      params = {
        alarmType:this.$router.query.alarmType
      }
     
      if (releaseTimeRange) {
        values = {
          ...params,
@@ -1258,9 +1265,9 @@
      });

      setInterval(() => {
        // 一键呼叫相关函数
        if (this.isActive == true) {
          this.isActive = false;
        Recorder.getPermission().then(() => {
          this.recorder.start().then(() => {
            // 开始录音
          newCallAxios
            .post(
              `/api_control`,
@@ -1300,15 +1307,11 @@
                })
                .then((result) => {});
            });
        } else {
          this.isActive = true;
          Recorder.getPermission().then(() => {
            this.recorder.start().then(() => {
              // 开始录音
            });
          });
        }
      }, 5000);
        
        // 一键呼叫相关函数
      }, 200000);
    },
    peopleOrPhone(e) {
      this.peopleList.forEach((item) => {