From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0
---
web_src/src/components/videoList.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue
index 50767cc..01dae2c 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>
@@ -52,7 +52,7 @@
<el-table-column label="鎿嶄綔" width="240" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊閫氶亾</el-button>
- <el-button size="mini" icon="el-icon-s-open" type="primary" @click="showChannelList(scope.row)">鏌ョ湅閫氶亾</el-button>
+ <el-button size="mini" icon="el-icon-s-open" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">鏌ョ湅閫氶亾</el-button>
</template>
</el-table-column>
</el-table>
@@ -134,14 +134,15 @@
this.getDeviceListLoading = true;
this.$axios.get(`/api/devices`,{
params: {
- page: that.currentPage - 1,
+ page: that.currentPage,
count: that.count
}
} )
.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