From 817ea18c62e32b2a3394ae1c245f79bc745c5ac2 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 10 八月 2020 17:42:26 +0800
Subject: [PATCH] 实时监控间距调整,统计查询查找此人界面调整
---
src/pages/search/index/Searching.vue | 33 +++++++++++++++++++--------------
src/pages/cameraVideo/index/Video.vue | 10 +++++-----
src/pages/desktop/index/mock/userData.json | 2 +-
src/pages/search/index/App.vue | 2 +-
4 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 51785be..8bc9049 100644
--- a/src/pages/cameraVideo/index/Video.vue
+++ b/src/pages/cameraVideo/index/Video.vue
@@ -29,7 +29,7 @@
</div>
<div
:class="guid === 1 ? 'video-main-box' : 'video-main-box-side'"
- style="width: 100%; height: calc(100% - 52px);"
+ style="width: 100%; height: calc(100% - 35px);"
v-if="visibilityState"
>
<video-item
@@ -564,7 +564,7 @@
width: 70.5%;
min-width: 740px;
max-width: 1208px;
- height: 75%;
+ height: 71%;
float: left;
box-sizing: border-box;
// box-shadow: #e4e7ed 0px 0px 9px inset;
@@ -613,7 +613,7 @@
//width: calc(29.5% - 10px);
width: calc(34% - 10px);
//width: auto;
- height: 73%;
+ height: 70.5%;
background-color: #fff;
float: left;
margin: 0px 0px 0px 10px;
@@ -626,11 +626,11 @@
.monitoring-photo {
width: 100%;
- height: calc(25% + 10px);
+ height: calc(25% + 32px);
background-color: #fff;
float: left;
padding: 10px;
- margin-top: -10px;
+ //margin-top: -10px;
box-sizing: border-box;
border: 1px solid #e4e7ed;
// box-shadow: #e4e7ed 0px 0px 9px inset;
diff --git a/src/pages/desktop/index/mock/userData.json b/src/pages/desktop/index/mock/userData.json
index 733ef60..7a02b33 100644
--- a/src/pages/desktop/index/mock/userData.json
+++ b/src/pages/desktop/index/mock/userData.json
@@ -23,7 +23,7 @@
"url": "/view/cameraVideo",
"title": "瀹炴椂鐩戞帶",
"width": 1328,
- "height": 670
+ "height": 690
},
{
"id": "9",
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index 28355b2..2ba5dfc 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -68,9 +68,9 @@
.column {
overflow: hidden;
min-width: 1399px;
+ height: 100%;
}
.column-left {
- height: 100vh;
background-color: #fff;
position: relative;
float: left;
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index abb77ac..7ecb916 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -120,16 +120,17 @@
<b class="clear-searching" @click="clearSearch">閲嶇疆</b>
</p>
</div>
- <div ref="mid" style="height:100%;overflow-y:auto;">
-
- <div id="searchMid" class="mid">
- <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
+ <div ref="mid" style="height:100%;">
+ <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
<upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
</div>
+ <div id="searchMid" class="mid" :style="{width: VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : '100%'}">
+
<div
class="right-section"
+
ref="scrollContain"
- :style="VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : 'width:100%'"
+
>
<Card
v-for="(item, index) in VideoPhotoData.cards"
@@ -142,8 +143,7 @@
@detailsClick="getDetails($event, index)"
@addToBase="toAdd"
></Card>
- </div>
- <div class="foot">
+ <div class="foot">
<el-pagination
:current-page="VideoPhotoData.page"
@current-change="changePages"
@@ -154,6 +154,8 @@
:total="VideoPhotoData.total"
></el-pagination>
</div>
+ </div>
+
</div>
</div>
@@ -713,7 +715,7 @@
.mid {
//width: 100%;
//height: 100%;
- padding: 10px;
+ padding: 5px;
overflow: auto;
position: relative;
.my-card {
@@ -816,7 +818,15 @@
}
</style>
<style lang="scss" scoped>
+.left-selection {
+ width: 300px;
+ height: 100%;
+ float: left;
+ margin-right: 15px;
+}
#searchMid {
+ height: 100%;
+ box-sizing: border-box;
.el-loading-mask {
.el-loading-spinner {
width: 100%;
@@ -826,12 +836,7 @@
}
}
}
- .left-selection {
- width: 300px;
- height: 100%;
- float: left;
- margin-right: 15px;
- }
+
.right-section {
//width: calc(100% - 315px);
height: 100%;
--
Gitblit v1.8.0