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 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) 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