From 059a5a678ab21738c3fecb9e2bd1e2dc47220a4f Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 15:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
web_src/src/components/videoList.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue
index 50767cc..46b4aac 100644
--- a/web_src/src/components/videoList.vue
+++ b/web_src/src/components/videoList.vue
@@ -21,7 +21,7 @@
<el-table-column label="鍦板潃" width="180" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium">{{ scope.row.host.address }}</el-tag>
+ <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
</div>
</template>
</el-table-column>
@@ -140,8 +140,9 @@
} )
.then(function (res) {
console.log(res);
+ console.log(res.data.list);
that.total = res.data.total;
- that.deviceList = res.data.data;
+ that.deviceList = res.data.list;
that.getDeviceListLoading = false;
})
.catch(function (error) {
@@ -181,6 +182,7 @@
type: 'success'
});
}
+ that.initData()
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
}).catch(function(e) {
console.error(e)
--
Gitblit v1.8.0