南昌市物联网技防平台-前端
Administrator
2021-03-29 240b0c28f56fac59cdfb03a93b98a37f257eb5f8
Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
2 files modified
23 ■■■■ changed files
src/page/index/logo.vue 19 ●●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue 4 ●●● patch | view | raw | blame | history
src/page/index/logo.vue
@@ -401,7 +401,7 @@
                    `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${that.form.channelNumber}`
                  )
                  .then((result) => {
                    console.log(result)
                    console.log(result);
                    axios({
                      method: "post",
                      url: `/api/blade-jfpts/rvideo/rVoid`,
@@ -418,7 +418,7 @@
              response.data.data[0].alarmId == userId
            ) {
              response.data.data[0].waringType = "一键求助";
              that.peopleList = [
                { label: that.form.oneContacts, value: that.form.onePhone },
                { label: that.form.twoContacts, value: that.form.twoPhone },
@@ -427,7 +427,10 @@
              that.peopleName = that.form.oneContacts;
              that.peoplePhone = that.form.onePhone;
              that.dialogTableVisible = true;
              Recorder.getPermiRecorderssion().then(() => {});
              console.log(Recorder)
              if (Recorder) Recorder.getPermiRecorderssion().then(() => {});
              that.ofX = null;
              that.ofY = null;
@@ -755,6 +758,7 @@
        .then((result) => {
          var formData = new FormData();
          var blob = that.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");
@@ -836,18 +840,13 @@
          //开启心跳传送
          window.websockPing = setInterval(function () {
            window.socket.send("ping");
          },10000);
        }else{
          }, 10000);
        } else {
          console.log("WebSocket连接没有建立成功!!");
          //执行重连
          this.websocketStart();
        }
      }, 3000);
    },
  },
};
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-26 11:05:55
 * @Last Modified time: 2021-03-26 14:56:01
 */
<template>
  <basic-container>
@@ -1299,6 +1299,8 @@
        )
        .then((result) => {
          var formData = new FormData();
          // that.recorder.downloadWAV("新文件");
          var blob = that.recorder.getPCMBlob(); //获取pcm格式音频数据
          //此处获取到blob对象后需要设置fileName满足当前项目上传需求,其它项目可直接传把blob作为file塞入formData
          var newbolb = new Blob([blob], { type: "audio/pcm" });