From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 03 十一月 2021 17:35:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/components/subComponents/SystemInfo.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/components/subComponents/SystemInfo.vue b/src/components/subComponents/SystemInfo.vue
index 26f5206..813b467 100644
--- a/src/components/subComponents/SystemInfo.vue
+++ b/src/components/subComponents/SystemInfo.vue
@@ -1,6 +1,6 @@
<template>
<div :class="showClass">
- <div class="card-box" :style="`width:${borderWidth}`">
+ <div class="card-box" :style="`width:${borderWidth};min-width:456px`" >
<ul>
<li style="max-width:30px;" v-if="ShowLocalVedio">
<div class="total-box">
@@ -125,8 +125,10 @@
initCpuCharts() {
this.$forceUpdate();
}
+ },
+ mounted(){
+ console.log('PollData.RealTimeValidCount',this.PollData.RealTimeValidCount)
}
-
}
</script>
<style lang="scss">
@@ -179,17 +181,18 @@
}
}
.eCharts-box {
- width: 28%;
- float: right;
+ width: 46%;
+ float: left;
box-sizing: border-box;
height: 100%;
- margin-left: 5px;
- @media screen and (min-width: 1280px) and (max-width: 1440px) {
- width: 35%;
- }
- @media screen and (max-width: 1279px) {
- width: 30%;
- }
+ padding-left: 10px;
+ //margin-left: 10px;
+ // @media screen and (min-width: 1280px) and (max-width: 1440px) {
+ // width: 35%;
+ // }
+ // @media screen and (max-width: 1279px) {
+ // width: 30%;
+ // }
}
.chart-box {
float: left;
--
Gitblit v1.8.0