From 847d39af8b11a4c1f22e52ab3eb6bdcb82c8dc1a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Mar 2021 09:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/page/index/logo.vue | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index e8d8ae6..23e56f3 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -384,12 +384,41 @@
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) => {
+ console.log(result)
+ axios({
+ method: "post",
+ url: `/api/blade-jfpts/rvideo/rVoid`,
+ timeout: 600000,
+ params: {
+ sourcePath: result.data.data.flv,
+ jid: that.form.id,
+ },
+ }).then((resdata) => {});
+ });
+ });
if (
response.data.data[0].waringType == "紧急求救" &&
response.data.data[0].alarmId == userId
) {
response.data.data[0].waringType = "一键求助";
- that.form = response.data.data[0];
+
that.peopleList = [
{ label: that.form.oneContacts, value: that.form.onePhone },
{ label: that.form.twoContacts, value: that.form.twoPhone },
@@ -399,34 +428,6 @@
that.peoplePhone = that.form.onePhone;
that.dialogTableVisible = true;
// Recorder.getPermiRecorderssion().then(() => {});
-
- 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/rVoid`,
- timeout: 600000,
- params: {
- sourcePath: result.data.data.flv,
- jid: that.form.id,
- },
- }).then((resdata) => {});
- });
- });
that.ofX = null;
that.ofY = null;
--
Gitblit v1.9.3