From 0de753aec2498e607ae2f479782e5845373ff797 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 07 九月 2020 12:05:33 +0800
Subject: [PATCH] 系统运行信息样式调整及数据调试
---
src/pages/cameraAccess/components/SystemInfo.vue | 4 ++--
src/components/subComponents/SystemInfo.vue | 4 +++-
src/pages/cameraAccess/index/App.vue | 2 +-
src/components/subComponents/eChartsBar.vue | 2 +-
src/pages/cameraAccess/components/SeparateRules.vue | 17 +++++++++++++----
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/components/subComponents/SystemInfo.vue b/src/components/subComponents/SystemInfo.vue
index e9786ed..0c1c821 100644
--- a/src/components/subComponents/SystemInfo.vue
+++ b/src/components/subComponents/SystemInfo.vue
@@ -125,8 +125,10 @@
initCpuCharts() {
this.$forceUpdate();
}
+ },
+ mounted(){
+ console.log('PollData.RealTimeValidCount',this.PollData.RealTimeValidCount)
}
-
}
</script>
<style lang="scss">
diff --git a/src/components/subComponents/eChartsBar.vue b/src/components/subComponents/eChartsBar.vue
index ebfc650..2659395 100644
--- a/src/components/subComponents/eChartsBar.vue
+++ b/src/components/subComponents/eChartsBar.vue
@@ -73,7 +73,7 @@
},
grid: {
top: 10,
- right: 30,
+ right: 40,
bottom: 20,
left: 40,
},
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 1faa16f..cd82320 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>
@@ -526,14 +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%;
+ width: 86%;
// height: 124px;
}
@@ -619,8 +619,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;
diff --git a/src/pages/cameraAccess/components/SystemInfo.vue b/src/pages/cameraAccess/components/SystemInfo.vue
index 6fdbcfd..dba1e44 100644
--- a/src/pages/cameraAccess/components/SystemInfo.vue
+++ b/src/pages/cameraAccess/components/SystemInfo.vue
@@ -1,6 +1,6 @@
<template>
<div :class="showClass">
- <div class="card-box" :style="`width:${borderWidth}`">
+ <div class="card-box" >
<ul>
<li style="max-width:30px;" v-if="ShowLocalVedio">
<div class="total-box">
@@ -130,7 +130,7 @@
}
},
mounted(){
- console.log(this.PollData.barCharts)
+ console.log('PollData.RealTimeValidCount',this.PollData.RealTimeValidCount)
debugger;
}
}
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index b83a14a..e10d808 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -77,7 +77,7 @@
box-sizing: border-box;
overflow-y: hidden;
height: 100%;
- min-width: 1433px;
+ min-width: 1680px;
}
.resize-save {
position: absolute;
--
Gitblit v1.8.0