From ab74d1cff90cc563e0eca8deb8f154d84eb51908 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 九月 2022 20:51:21 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/DeviceList.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 1911d1d..beb3a99 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -56,11 +56,11 @@
@mouseover="getTooltipContent(scope.row.deviceId)">鍒锋柊
</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button type="text" size="medium" icon="el-icon-video-camera" v-bind:disabled="scope.row.online==0"
+ <el-button type="text" size="medium" icon="el-icon-video-camera"
@click="showChannelList(scope.row)">閫氶亾
</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button size="medium" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="text"
+ <el-button size="medium" icon="el-icon-location" type="text"
@click="showDevicePosition(scope.row)">瀹氫綅
</el-button>
<el-divider direction="vertical"></el-divider>
@@ -146,22 +146,23 @@
this.getDeviceList();
},
getDeviceList: function () {
- let that = this;
this.getDeviceListLoading = true;
this.$axios({
method: 'get',
url: `/api/device/query/devices`,
params: {
- page: that.currentPage,
- count: that.count
+ page: this.currentPage,
+ count: this.count
}
- }).then(function (res) {
- that.total = res.data.total;
- that.deviceList = res.data.list;
- that.getDeviceListLoading = false;
- }).catch(function (error) {
+ }).then( (res)=> {
+ if (res.data.code === 0) {
+ this.total = res.data.data.total;
+ this.deviceList = res.data.data.list;
+ }
+ this.getDeviceListLoading = false;
+ }).catch( (error)=> {
console.error(error);
- that.getDeviceListLoading = false;
+ this.getDeviceListLoading = false;
});
},
@@ -192,7 +193,7 @@
},
showChannelList: function (row) {
- this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
+ this.$router.push(`/channelList/${row.deviceId}/0`);
},
showDevicePosition: function (row) {
this.$router.push(`/map?deviceId=${row.deviceId}`);
--
Gitblit v1.8.0