From 771d5e9ab73a45f7b67f534b477b82cbbd7c1910 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期日, 09 八月 2020 16:43:33 +0800
Subject: [PATCH] 添加应用窗口iframe上层遮罩,窗口整体响应点击置顶事件
---
src/pages/cameraVideo/index/Video.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 57c0c17..789a470 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">
@@ -186,6 +186,7 @@
},
watch: {
"TreeDataPool.videoArr": function (newArry) {
+ console.log('newArry',newArry)
const cameras = this.filterNodes(newArry);
this.getActiveIndex();
this.$refs.taskview.showTasks(cameras);
@@ -554,20 +555,18 @@
.monitoring-right {
width: 100%;
height: 100%;
- float: right;
+ min-width: 1243px;
+ //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%;
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 {
@@ -611,9 +610,9 @@
// @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%;
background-color: #fff;
float: left;
--
Gitblit v1.8.0