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/DeviceList.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 8a3f1c0..21e02aa 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -136,7 +136,7 @@
getDeviceList: function() {
let that = this;
this.getDeviceListLoading = true;
- this.$axios.get(`/api/devices`,{
+ this.$axios.get(`/api/device/query/devices`,{
params: {
page: that.currentPage,
count: that.count
@@ -167,13 +167,12 @@
//gb28181骞冲彴瀵规帴
//鍒锋柊璁惧淇℃伅
refDevice: function(itemData) {
- ///api/devices/{deviceId}/sync
console.log("鍒锋柊瀵瑰簲璁惧:" + itemData.deviceId);
var that = this;
that.$refs[itemData.deviceId + 'refbtn' ].loading = true;
this.$axios({
method: 'post',
- url: '/api/devices/' + itemData.deviceId + '/sync'
+ url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
}).then(function(res) {
console.log("鍒锋柊璁惧缁撴灉锛�"+JSON.stringify(res));
if (!res.data.deviceId) {
@@ -217,7 +216,7 @@
let that = this;
this.$axios({
method: 'get',
- url: '/api/devices/' + row.deviceId + '/transport/' + row.streamMode
+ url: '/api/device/query/transport' + row.deviceId + '/' + row.streamMode
}).then(function(res) {
}).catch(function(e) {
--
Gitblit v1.8.0