From 693aac283aace14dbc4847ac4ef3053943d89a8a Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 03 二月 2021 10:54:41 +0800
Subject: [PATCH] 调整界面布局
---
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 2910623..f6cf19e 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -181,10 +181,17 @@
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 @@
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 450d736..8a3f1c0 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
--
Gitblit v1.8.0