From 98a44e94ecc76abd72b9817648ca4b91469b936a Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 08 八月 2020 16:04:16 +0800
Subject: [PATCH] 添加退出登录,布局调整
---
src/pages/analysisPower/index/App.vue | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index ed19b56..8c4d0de 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,9 +55,10 @@
<el-table
:header-cell-style="{background:'#F8F8F8', color: '#222222'}"
- :data="PollData.CameraList"
height="93%"
+ :data="PollData.CameraList"
border
+ :cell-style="cellStyle"
>
<el-table-column label="搴忓彿" type="index" align="center" width="100px"></el-table-column>
<el-table-column label="鎽勫儚鏈哄悕绉�" align="center" show-overflow-tooltip sortable>
@@ -481,6 +482,11 @@
this.formData.polling++
}
// console.log("this.formData.polling:"+this.formData.polling)
+ },
+ cellStyle(obj){
+ if(obj.column.label=='鎽勫儚鏈哄悕绉�'||obj.column.label=='鎽勫儚鏈哄湴鍧�'){
+ return 'text-align:left;padding-left:8px;'
+ }
}
}
};
@@ -489,36 +495,30 @@
.s-poll-setting {
width: 100%;
height: 100%;
+ min-width: 1609px;
font-size: 14px;
position: relative;
.top {
width: 100%;
height: 190px;
- // border-bottom: 1px solid #ccc;
+ min-width: 1609px;
+ display: flex;
+
.progressBar {
width: 26%;
}
.percentBall {
- width: 80%;
+ width: 84%;
height: 82%;
- float: left;
- // @media screen and (min-width: 1280px) and (max-width: 1440px) {
- // width: 75%;
- // }
- // @media screen and (max-width: 1280px) {
- // width: 80%;
- // }
+ //float: left;
+ padding-left: 30px;
+ box-sizing: border-box;
+
}
.barGraph {
- width: 20%;
+ width: 16%;
height: 100%;
- float: right;
- // @media screen and (min-width: 1280px) and (max-width: 1440px) {
- // width: 25%;
- // }
- // @media screen and (max-width: 1280px) {
- // width: 20%;
- // }
+ //float: right;
#barSimple {
width: 100%;
height: 250px;
@@ -538,12 +538,6 @@
}
}
.bottom {
- width: calc(100% + 76px);
- height: 100%;
- // height: calc(100% - 220px);
- position: absolute;
- // top: 220px;
- left: -38px;
.tip {
display: inline-block;
font-family: PingFangSC-Medium;
@@ -553,7 +547,7 @@
}
}
.content {
- padding: 20px 38px 38px 38px;
+ padding: 20px 30px 30px;
box-sizing: border-box;
width: 100%;
height: 100%;
--
Gitblit v1.8.0