From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 15:31:43 +0800
Subject: [PATCH] Merge branch '级联' into main-dev
---
web_src/src/components/PushVideoList.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 866c808..5ca7194 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -76,7 +76,7 @@
<el-table-column label="鎿嶄綔" min-width="360" fixed="right">
<template slot-scope="scope">
<el-button size="medium" icon="el-icon-video-play"
- v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status"
+ v-if="scope.row.pushIng === true"
@click="playPush(scope.row)" type="text">鎾斁
</el-button>
<el-divider direction="vertical"></el-divider>
@@ -171,7 +171,7 @@
this.getDeviceListLoading = true;
this.$axios({
method: 'get',
- url: `/api/push/list`,
+ url: `./api/push/list`,
params: {
page: that.currentPage,
count: that.count,
@@ -180,8 +180,11 @@
mediaServerId: that.mediaServerId,
}
}).then(function (res) {
- that.total = res.data.total;
- that.pushList = res.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.pushList = res.data.data.list;
+ }
+
that.getDeviceListLoading = false;
}).catch(function (error) {
console.error(error);
@@ -194,7 +197,7 @@
this.getListLoading = true;
this.$axios({
method: 'get',
- url: '/api/push/getPlayUrl',
+ url: './api/push/getPlayUrl',
params: {
app: row.app,
stream: row.stream,
@@ -220,13 +223,13 @@
let that = this;
that.$axios({
method: "post",
- url: "/api/push/stop",
+ url: "./api/push/stop",
params: {
app: row.app,
streamId: row.stream
}
}).then((res) => {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.initData()
}
}).catch(function (error) {
@@ -244,10 +247,10 @@
let that = this;
that.$axios({
method: "delete",
- url: "/api/push/remove_form_gb",
+ url: "./api/push/remove_form_gb",
data: row
}).then((res) => {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.initData()
}
}).catch(function (error) {
@@ -271,7 +274,7 @@
let that = this;
that.$axios({
method: "delete",
- url: "/api/push/batchStop",
+ url: "./api/push/batchStop",
data: {
gbStreams: this.multipleSelection
}
--
Gitblit v1.8.0