From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/cameraVideo/index/Video.vue | 99 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 13 deletions(-)
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 278fa15..bffa55d 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,15 +626,91 @@
.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;
border-radius: 5px;
}
+
}
+.titlebar{
+ height: 10px!important;
+ background: #fff!important;
+ .button{
+ position: absolute;
+ font-size: 25px!important;
+ right: 10px;
+ top: 10px;
+ z-index: 3;
+ }
+}
+.addToBase {
+ width: 98%;
+ height: 430px;
+ position: relative;
+ .topLabel {
+ margin-top: 20px;
+ height: 40px;
+ border-bottom: 1px solid #eee;
+ font-family: PingFangSC-Medium;
+ font-size: 20px;
+ font-weight: 600;
+ line-height: 1rem;
+ color: #222222;
+ text-align: left;
+ margin-left: 15px;
+ }
+ .items {
+ width: 100%;
+ height: auto;
+ max-height: 35%;
+ overflow-y: auto;
+ margin: 20px 0px;
+ .lable {
+ width: 15%;
+ margin-top: 10px;
+ float: left;
+ //font-family: PingFangSC-Medium;
+ font-size: 14px;
+ font-weight: 600;
+ }
+ .baseList {
+ width: 85%;
+ height: 100%;
+ float: left;
+
+ // display: flex;
+ // justify-content: flex-start;
+ .base {
+ //flex-wrap: wrap;
+ width: calc(33% - 10px);
+ padding: 0px 5px;
+ line-height: 30px;
+ float: left;
+ text-align: left;
+ font-size: 12px !important;
+ .el-checkbox {
+ width: 100%;
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ .el-checkbox__label {
+ display: inline !important;
+ }
+ }
+ }
+ }
+ }
+ .buttons {
+ position: absolute;
+ right: 0px;
+ bottom: 15px;
+ }
+ }
</style>
--
Gitblit v1.8.0