From 16d7104f8bb00f2f7dcd518c1dd0f63d76072a98 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 18 九月 2020 10:22:52 +0800
Subject: [PATCH] 修复卡片窗口缩放bug
---
src/pages/cameraAccess/components/SeparateRules.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 358ad1a..d372181 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -106,7 +106,7 @@
:showRealPoll="cameraType === 'camera'"
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
- style="margin-left: 10px;margin-top:-10px"
+ style="margin-top:-10px"
/>
</div>
</div>
@@ -253,7 +253,8 @@
};
},
mounted() {
- this.mockAsync()
+ this.mockAsync();
+ this.PollData.statistics();
},
methods: {
@@ -525,16 +526,14 @@
.swiper-box {
height: 100%;
float: left;
- width: 48%;
+ width: 46%;
margin-top: -10px;
position: relative;
}
.swiper-container {
position: initial;
min-width: 472px;
- width: 80%;
-
- // height: 124px;
+ width: 86%;
}
.swiper-slide {
position: relative;
@@ -573,10 +572,6 @@
backdrop-filter: blur(1px) brightness(100%);
display: none;
}
-
- // @media screen and(max-width: 1280px) {
- // max-width: 110px;
- // }
@media screen and(max-width: 1440px) {
max-width: 110px;
}
@@ -618,8 +613,17 @@
}
.top-right {
float: right;
- width: 52%;
+ width: 54%;
height: 144px;
+ .card-box{
+ width: 54%!important;
+ }
+ .eCharts-box{
+ width: 45%;
+ canvas{
+ width: 98%!important;
+ }
+ }
}
.task-css {
text-align: left;
@@ -788,13 +792,6 @@
color: #3d68e1;
margin-left: 10px;
font-size: 14px;
- }
- .task-tip {
- font-family: PingFangSC-Regular;
- font-size: 12px;
- color: #cccccc;
- margin-top: 10%;
- margin-left: 38%;
}
.marker {
--
Gitblit v1.8.0