From 693aac283aace14dbc4847ac4ef3053943d89a8a Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: Wed, 3 Feb 2021 10:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/devicePosition.vue | 30 +++++++++++++++++------
 web_src/src/components/videoList.vue      | 11 ++++++---
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index 29106234..f6cf19e4 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -181,10 +181,17 @@ export default {
                 self.total = res.data.length;
                 self.mobilePositionList = res.data;
                 console.log(self.mobilePositionList);
-                // 防止出现表格错位
-                self.$nextTick(() => {
-                    self.showMarkPoints(self);
-                });
+                if (self.total == 0) {
+                    self.$message({
+                        showClose: true,
+						message: '未找到符合条件的移动位置信息',
+						type: 'error'
+					});
+                } else {
+                    self.$nextTick(() => {
+                        self.showMarkPoints(self);
+                    });
+                }
             })
             .catch(function (error) {
                 console.log(error);
@@ -201,10 +208,17 @@ export default {
                 self.total = res.data.length;
                 self.mobilePositionList.push(res.data);
                 console.log(self.mobilePositionList);
-                // 防止出现表格错位
-                self.$nextTick(() => {
-                    self.showMarkPoints(self);
-                });
+                if (self.total == 0) {
+                    self.$message({
+                        showClose: true,
+						message: '未找到符合条件的移动位置信息',
+						type: 'error'
+					});
+                } else {
+                    self.$nextTick(() => {
+                        self.showMarkPoints(self);
+                    });
+                }
             })
             .catch(function (error) {
                 console.log(error);
diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue
index 450d736f..8a3f1c0e 100644
--- a/web_src/src/components/videoList.vue
+++ b/web_src/src/components/videoList.vue
@@ -51,10 +51,13 @@
 
 					<el-table-column label="操作" width="360" 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" v-bind:disabled="scope.row.online==0"  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="showDevicePosition(scope.row)">移动位置</el-button>
-						</template>
+							<el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " 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-s-tools" v-bind:disabled="scope.row.online==0"  type="primary">控制</el-button>
+							</el-button-group>
+							</template>
 					</el-table-column>
 				</el-table>
 				<el-pagination