From ac2560630ca05402b9514d3585e4eeb8d1e951d2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 19 Mar 2021 16:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/realTimePolice/real.vue | 103 ++++++++++++++++++++++++++-------------------------
src/router/views/index.js | 2
src/views/home/home.vue | 4 +-
3 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index fa56087..d949670 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -143,7 +143,7 @@
{
path: '/realTimePolice',
component: Layout,
- redirect: '/realTimePolice/real',
+ redirect: '/realTimePolice/index',
children: [{
path: 'index',
name: '实时报警',
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index ffc31c3..4ff2a84 100644
--- a/src/views/home/home.vue
+++ b/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]
});
}
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index bbd14ea..389f306 100644
--- a/src/views/realTimePolice/real.vue
+++ b/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,57 +1265,53 @@
});
setInterval(() => {
- // 一键呼叫相关函数
- if (this.isActive == true) {
- this.isActive = false;
- newCallAxios
- .post(
- `/api_control`,
- {},
- {
- params: {
- param: { PktType: "GetAccessToken" },
- },
- }
- )
- .then((result) => {
- var formData = new FormData();
- var blob = this.recorder.getPCMBlob(); //获取pcm格式音频数据
- //此处获取到blob对象后需要设置fileName满足当前项目上传需求，其它项目可直接传把blob作为file塞入formData
- var newbolb = new Blob([blob], { type: "audio/pcm" });
- var fileOfBlob = new File(
- [newbolb],
- new Date().getTime() + ".pcm"
- );
- formData.append("file", fileOfBlob);
-
- // var dom = document.getElementById("real_audio");
- // dom.setAttribute("src", URL.createObjectURL(blob));
-
- // this.recorder.play();
-
- newCallAxios
- .post(`/api_control`, blob, {
+ Recorder.getPermission().then(() => {
+ this.recorder.start().then(() => {
+ // 开始录音
+ newCallAxios
+ .post(
+ `/api_control`,
+ {},
+ {
params: {
- param: {
- PktType: "Talk",
- accessToken: result.data.data.accessToken,
- // deviceCode: form.channelNumber,
- deviceCode: "001231663A45",
- },
+ param: { PktType: "GetAccessToken" },
},
- })
- .then((result) => {});
- });
- } else {
- this.isActive = true;
- Recorder.getPermission().then(() => {
- this.recorder.start().then(() => {
- // 开始录音
- });
+ }
+ )
+ .then((result) => {
+ var formData = new FormData();
+ var blob = this.recorder.getPCMBlob(); //获取pcm格式音频数据
+ //此处获取到blob对象后需要设置fileName满足当前项目上传需求，其它项目可直接传把blob作为file塞入formData
+ var newbolb = new Blob([blob], { type: "audio/pcm" });
+ var fileOfBlob = new File(
+ [newbolb],
+ new Date().getTime() + ".pcm"
+ );
+ formData.append("file", fileOfBlob);
+
+ // var dom = document.getElementById("real_audio");
+ // dom.setAttribute("src", URL.createObjectURL(blob));
+
+ // this.recorder.play();
+
+ newCallAxios
+ .post(`/api_control`, blob, {
+ params: {
+ param: {
+ PktType: "Talk",
+ accessToken: result.data.data.accessToken,
+ // deviceCode: form.channelNumber,
+ deviceCode: "001231663A45",
+ },
+ },
+ })
+ .then((result) => {});
+ });
});
- }
- }, 5000);
+ });
+
+ // 一键呼叫相关函数
+ }, 200000);
},
peopleOrPhone(e) {
this.peopleList.forEach((item) => {
--
Gitblit v1.9.3