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

Administrator

2021-03-21 60e5202efdc7a91315d2620f505de1b7111cc7b7

 src/page/index/logo.vue

@@ -376,7 +376,6 @@

          if (response.data.data.length > 0) {
            that.deviceId = response.data.data[0].id;
            console.log(userId, response.data.data[0].alarmId);
            if (
              response.data.data[0].waringType == "紧急求救" &&
              response.data.data[0].alarmId == userId
@@ -682,7 +681,6 @@
      that.recorder.start().then(
        () => {
          // 开始录音
          console.log(111);
        },
        (error) => {
          // 出错了