From aaf3198eb598932a788561d715bdf2a91330d259 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 13 八月 2020 14:53:19 +0800
Subject: [PATCH] 左侧树高度超出显示滚动条,鼠标移入应用小图标显示实时快照,样式调整
---
src/pages/cameraVideo/index/Video.vue | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 278fa15..8bc9049 100644
--- a/src/pages/cameraVideo/index/Video.vue
+++ b/src/pages/cameraVideo/index/Video.vue
@@ -1,5 +1,5 @@
<template>
- <div style="height: 100%;">
+ <div style="width:100%; height: 100%;">
<div class="monitoring-right" ref="videoRight">
<div class="monitoring-video" ref="monitorVideo">
<div class="monitoring-video-guid">
@@ -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
@@ -147,7 +147,6 @@
},
created() {
console.log("befor created")
- debugger
// this.TreeDataPool.clean();
// this.TreeDataPool.fetchTreeData();
// this.guid = sessionStorage.guid ? Number(sessionStorage.guid) : this.guid;
@@ -556,20 +555,18 @@
.monitoring-right {
width: 100%;
height: 100%;
- float: right;
+ min-width: 981px;
+ //float: right;
box-sizing: border-box;
padding: 10px;
background-color: #e9ebf2;
.monitoring-video {
width: 70.5%;
- //min-width: 800px;
min-width: 740px;
max-width: 1208px;
- height: 75%;
+ height: 71%;
float: left;
- padding: 0px, 10px 10px 10px;
box-sizing: border-box;
- border: 1px solid #e4e7ed;
// box-shadow: #e4e7ed 0px 0px 9px inset;
border-radius: 5px;
.activeItem {
@@ -613,10 +610,10 @@
// @media screen and (max-width: 1700px){
// }
- width: calc(29.5% - 10px);
+ //width: calc(29.5% - 10px);
+ width: calc(34% - 10px);
//width: auto;
- // width: 23%;
- height: 73%;
+ height: 70.5%;
background-color: #fff;
float: left;
margin: 0px 0px 0px 10px;
@@ -629,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;
--
Gitblit v1.8.0