Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-22 92d5a2511ed8c40cfffc960d7c3556db2e09a485

 src/page/index/logo.vue

@@ -385,31 +385,7 @@
          if (response.data.data.length > 0) {
            that.deviceId = response.data.data[0].id;
            that.form = response.data.data[0];
            newAxios
              .post(
                "/api_control",
                {},
                {
                  params: {
                    param: JSON.stringify({ PktType: "GetAccessToken" }),
                  },
                }
              )
              .then((res) => {
                newAxios
                  .get(
                    `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${that.form.channelNumber}`
                  )
                  .then((result) => {
                    axios({
                      method: "post",
                      url: `/api/blade-jfpts/rvideo/rVoids`,
                      params: {
                        url: result.data.data.flv,
                      },
                    }).then((resdata) => {});
                  });
              });

            if (
              response.data.data[0].waringType == "紧急求救" &&
              response.data.data[0].alarmId == userId
@@ -711,7 +687,6 @@

    aKeyToCall() {
      this.isActive = true;

      var that = this;
      if (this.recorder == null) {
        this.recorder = new Recorder({
@@ -737,7 +712,6 @@
    // 序列号后期待修改
    aKeyStopCall() {
      this.isActive = false;

      var newCallAxios = axios.create({
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
@@ -745,6 +719,7 @@
          "Content-Type": "application/json;",
        },
      });

      var that = this;

      newCallAxios
@@ -759,12 +734,31 @@
        )
        .then((result) => {
          var formData = new FormData();
          var blob = that.recorder.getPCMBlob(); //获取pcm格式音频数据
          // that.recorder.downloadWAV("新文件");

          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");
          formData.append("file", fileOfBlob);

          var wavBlob = that.recorder.getWAVBlob();

          var wavformData = new FormData();
          var wavform = new File([wavBlob], new Date().getTime() + ".wav");
          wavformData.append("file", wavform);

          axios({
            method: "post",
            url: "/api/blade-jfpts/xlfeedback/xlfeedback/put-objecty",
            data: wavformData,
            params: {
              jid: that.form.id,
            },
          }).then((resdata) => {
            console.log(resdata);
          });

          newCallAxios
            .post(`/api_control`, blob, {
              params: {
@@ -866,8 +860,38 @@
    },

    onDialogTableVisible() {
      var that = this;
      Recorder.getPermission().then(() => {});
      this.videoConversationReal = true;
      var userId = JSON.parse(
        window.localStorage.getItem("物联网安保云服务平台-userInfo")
      ).content.user_id;
      newAxios
        .post(
          "/api_control",
          {},
          {
            params: {
              param: JSON.stringify({ PktType: "GetAccessToken" }),
            },
          }
        )
        .then((res) => {
          newAxios
            .get(
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${that.form.channelNumber}`
            )
            .then((result) => {
              axios({
                method: "post",
                url: `/api/blade-jfpts/rvideo/rVoids`,
                params: {
                  url: result.data.data.flv,
                  uid: userId,
                },
              }).then((resdata) => {});
            });
        });
    },
  },
};