From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/channelList.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index b06ce25..ebb4318 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -154,7 +154,7 @@
getDeviceChannelList: function () {
let that = this;
- this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
+ this.$axios.get(`/api/device/query/devices/${this.$route.params.deviceId}/channels`, {
params: {
page: that.currentPage,
count: that.count,
@@ -188,7 +188,7 @@
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/' + deviceId + '/' + channelId
+ url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
console.log(res.data)
let streamId = res.data.streamId;
@@ -216,7 +216,7 @@
var that = this;
this.$axios({
method: 'post',
- url: '/api/play/' + itemData.streamId + '/stop'
+ url: '/api/play/stop/' + itemData.streamId
}).then(function (res) {
console.log(JSON.stringify(res));
that.initData();
@@ -251,7 +251,7 @@
showSubchannels: function (channelId) {
let that = this;
- this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
+ this.$axios.get(`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`, {
params: {
page: that.currentPage,
count: that.count,
@@ -282,7 +282,7 @@
console.log(row)
this.$axios({
method: 'post',
- url: `/api/channel/update/${this.deviceId}`,
+ url: `/api/device/query/channel/update/${this.deviceId}`,
params: row
}).then(function (res) {
console.log(JSON.stringify(res));
--
Gitblit v1.8.0