From b23a2a35a14b010a3b97a1b61a02ec179dfab924 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 04 九月 2020 17:25:14 +0800
Subject: [PATCH] feat: sort camera tree
---
src/pages/analysisPower/index/App.vue | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index 3318358..9aef803 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -58,8 +58,9 @@
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="搴忓彿" type="index" align="center" width="60px"></el-table-column>
<el-table-column label="鎽勫儚鏈哄悕绉�" align="center" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span
@@ -69,7 +70,7 @@
</el-table-column>
<el-table-column label="鎽勫儚鏈哄湴鍧�" prop="addr" align="center" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="鎽勫儚鏈篒P" prop="ip" align="center" width="130px" sortable></el-table-column>
- <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="110px" sortable>
+ <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="120px" sortable>
<template slot-scope="scope">
<span>{{scope.row.run_type | cameraType}}</span>
</template>
@@ -117,7 +118,7 @@
title="绠楀姏璁剧疆"
:visible.sync="drawer"
direction="rtl"
- size="350px"
+ size="450px"
custom-class="e-drawer"
:before-close="closeDrawer"
>
@@ -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,38 +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;
- padding-left: 38px;
+ //float: left;
+ padding-left: 30px;
box-sizing: border-box;
- // @media screen and (min-width: 1280px) and (max-width: 1440px) {
- // width: 75%;
- // }
- // @media screen and (max-width: 1280px) {
- // width: 80%;
- // }
+
}
.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;
@@ -540,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;
@@ -555,7 +547,7 @@
}
}
.content {
- padding: 20px 38px 38px 38px;
+ padding: 20px 30px 30px;
box-sizing: border-box;
width: 100%;
height: 100%;
@@ -581,9 +573,16 @@
.e-drawer {
// margin-top: 150px;
-
font-family: PingFangSC-Medium;
font-size: 14px;
+ &:focus{
+ outline: none;
+ }
+ .el-dialog__close{
+ &:focus{
+ outline: none!important;
+ }
+ }
.dawer_details {
text-align: left;
margin-left: 70px;
@@ -602,9 +601,19 @@
margin-left: 20px;
}
}
-
+
.el-drawer__header {
+ border-bottom: 2px solid #eee;
+ padding-bottom: 10px;
+ font-size: 16px;
margin-bottom: 0px;
+ span{
+ border: none!important;
+ border-image-width: 0!important;
+ &:focus{
+ outline: none;
+ }
+ }
}
}
</style>
--
Gitblit v1.8.0