From 04309ca7e4d64d8cb46ec73f3b5e806fc91b03e3 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 09 九月 2020 13:56:43 +0800
Subject: [PATCH] 系统信息样式调整,左侧树头部Tab依据应用展示隐藏
---
src/components/subComponents/SystemInfo.vue | 5 +++--
src/pages/cameraAccess/components/LinkageRule.vue | 10 +++++++---
src/pages/cameraAccess/index/App.vue | 2 +-
src/components/LeftNav.vue | 4 +++-
src/pages/search/index/App.vue | 6 +++++-
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 2ef7e0d..8a1411e 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -623,8 +623,9 @@
border: none;
box-shadow: none;
.el-tabs__header {
+ display: none;
border-bottom: none;
- margin: 0 0 15px;
+ //margin: 0 0 15px;
}
.el-tabs__content {
padding: 0;
@@ -751,6 +752,7 @@
.search-input {
padding-top: 8px;
padding-bottom: 12px;
+ text-align: left;
.dev-tree-close {
width: 10%;
margin-left: 10px;
diff --git a/src/components/subComponents/SystemInfo.vue b/src/components/subComponents/SystemInfo.vue
index 0c1c821..cac0567 100644
--- a/src/components/subComponents/SystemInfo.vue
+++ b/src/components/subComponents/SystemInfo.vue
@@ -181,11 +181,12 @@
}
}
.eCharts-box {
- width: 28%;
+ width: 46%;
float: left;
box-sizing: border-box;
height: 100%;
- margin-left: 30px;
+ padding-left: 10px;
+ //margin-left: 10px;
// @media screen and (min-width: 1280px) and (max-width: 1440px) {
// width: 35%;
// }
diff --git a/src/pages/cameraAccess/components/LinkageRule.vue b/src/pages/cameraAccess/components/LinkageRule.vue
index c48517a..604283f 100644
--- a/src/pages/cameraAccess/components/LinkageRule.vue
+++ b/src/pages/cameraAccess/components/LinkageRule.vue
@@ -15,7 +15,7 @@
<div class="top-right">
<sysinfo
v-if="showSysInfo"
- style="margin-left: 10px;margin-top: -10px;"
+ style="margin-top: -10px;"
:ShowLocalVedio="this.TreeDataPool.treeActiveName !== 'camera'"
:showRealPoll="this.TreeDataPool.treeActiveName == 'camera'"
/>
@@ -106,7 +106,8 @@
import VideoRuleData from "@/Pool/VideoRuleData";
import polygonCanvas from "@/components/canvas";
import TimeSlider from "./TimeSlider";
-import Sysinfo from "./SystemInfo"
+//import Sysinfo from "./SystemInfo"
+import Sysinfo from "@/components/subComponents/SystemInfo";
import SceneRule from "./SceneRule";
import SlideScene from "./scene/SlideScene";
@@ -383,8 +384,11 @@
}
.top-right {
float: right;
- width: 52%;
+ width: 54%;
height: 144px;
+ .card-box{
+ width: 54%!important;
+ }
}
.task-css {
text-align: left;
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index 7aa5017..5c6ab1e 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -80,7 +80,7 @@
box-sizing: border-box;
overflow-y: hidden;
height: 100%;
- min-width: 1680px;
+ min-width: 1433px;
}
.resize-save {
position: absolute;
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index 238f4fd..5d69c6b 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -53,7 +53,11 @@
};
</script>
-<style lang="scss" scoped>
+<style lang="scss" >
+.left-tree-box .el-tabs--border-card .el-tabs__header{
+ display: block!important;
+ margin-bottom: 10px;
+}
.column {
overflow: hidden;
min-width: 1399px;
--
Gitblit v1.8.0