From d563527289927f2ac2f2f9ae25e0b59c5d532684 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期二, 12 一月 2021 13:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
web_src/src/components/videoList.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue
index 9e03696..01dae2c 100644
--- a/web_src/src/components/videoList.vue
+++ b/web_src/src/components/videoList.vue
@@ -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,7 +134,7 @@
this.getDeviceListLoading = true;
this.$axios.get(`/api/devices`,{
params: {
- page: that.currentPage - 1,
+ page: that.currentPage,
count: that.count
}
} )
@@ -182,6 +182,7 @@
type: 'success'
});
}
+ that.initData()
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
}).catch(function(e) {
console.error(e)
--
Gitblit v1.8.0