From d656ff9cf8c97a01c0cc990d935e4b42b314be22 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 06 八月 2020 18:21:50 +0800
Subject: [PATCH] 摄像机信息区域/时间规则,系统维护,实时监控,算力管理样式调整
---
src/pages/analysisPower/index/App.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index 75d30fc..3318358 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -16,7 +16,7 @@
</div>
</div>
- <div class="bottom">
+ <div class="bottom" :style="{'height':strethTable?'calc(100% - 30px)':'calc(100% - 220px)'}">
<div style="width: 100%;height: 10px;background-color: #E9EBF2;"></div>
<div class="content">
<div class="toolBar">
@@ -55,6 +55,7 @@
<el-table
:header-cell-style="{background:'#F8F8F8', color: '#222222'}"
+ height="93%"
:data="PollData.CameraList"
border
>
@@ -487,7 +488,7 @@
<style lang="scss">
.s-poll-setting {
width: 100%;
-
+ height: 100%;
font-size: 14px;
position: relative;
.top {
@@ -501,6 +502,8 @@
width: 80%;
height: 82%;
float: left;
+ padding-left: 38px;
+ box-sizing: border-box;
// @media screen and (min-width: 1280px) and (max-width: 1440px) {
// width: 75%;
// }
@@ -539,7 +542,7 @@
.bottom {
//width: calc(100% + 76px);
//height: 100%;
- // height: calc(100% - 220px);
+ //height: calc(100% - 220px);
//position: absolute;
// top: 220px;
//left: -38px;
@@ -555,7 +558,7 @@
padding: 20px 38px 38px 38px;
box-sizing: border-box;
width: 100%;
-
+ height: 100%;
.toolBar {
width: 100%;
height: 42px;
--
Gitblit v1.8.0