From f52be3039975b41f24f8df02b71b60911aa7c63a Mon Sep 17 00:00:00 2001
From: walkTtalk <irwenjing@gmail.com>
Date: 星期六, 26 二月 2022 00:01:35 +0800
Subject: [PATCH] Fix issue #347: 修改前端启动报错
---
web_src/src/components/DeviceList.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 7644a96..0dab746 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -18,6 +18,13 @@
</el-table-column>
<el-table-column prop="deviceId" label="璁惧缂栧彿" width="180" align="center">
</el-table-column>
+ <el-table-column label="鍦板潃" width="180" align="center">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="manufacturer" label="鍘傚" align="center">
</el-table-column>
<el-table-column label="娴佷紶杈撴ā寮�" align="center" width="120">
@@ -47,20 +54,14 @@
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="140">
</el-table-column>
- <el-table-column label="鍦板潃" width="180" align="center">
- <template slot-scope="scope">
- <div slot="reference" class="name-wrapper">
- <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
- </div>
- </template>
- </el-table-column>
+
<el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " v-if="scope.row.online!=0" icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
<el-button-group>
<el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">閫氶亾</el-button>
<el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">瀹氫綅</el-button>
- <el-button size="mini" icon="el-icon-delete" type="primary" @click="edit(scope.row)">缂栬緫</el-button>
+ <el-button size="mini" icon="el-icon-edit" type="primary" @click="edit(scope.row)">缂栬緫</el-button>
<el-button size="mini" icon="el-icon-delete" type="danger" v-if="scope.row.online==0" @click="deleteDevice(scope.row)">鍒犻櫎</el-button>
</el-button-group>
</template>
@@ -195,16 +196,16 @@
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
}).then(function(res) {
console.log("鍒锋柊璁惧缁撴灉锛�"+JSON.stringify(res));
- if (!res.data.deviceId) {
+ if (res.data.code !==0) {
that.$message({
showClose: true,
- message: res.data,
+ message: res.data.msg,
type: 'error'
});
}else{
that.$message({
showClose: true,
- message: '璇锋眰鎴愬姛',
+ message: res.data.msg,
type: 'success'
});
}
@@ -212,8 +213,13 @@
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
}).catch(function(e) {
console.error(e)
+ that.$message({
+ showClose: true,
+ message: e,
+ type: 'error'
+ });
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
- });;
+ });
},
//閫氱煡璁惧涓婁紶濯掍綋娴�
sendDevicePush: function(itemData) {
--
Gitblit v1.8.0