From 5c63d4bbaf28166e107b388240e9cbc2d85fbcc1 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期五, 28 二月 2025 11:41:43 +0800
Subject: [PATCH] 图表样式优化
---
zhitan-vue/src/views/powerquality/power/index.vue | 29 ---------
zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue | 30 ---------
zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue | 12 +--
zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue | 29 ---------
zhitan-vue/src/views/poweranalysis/perPassu/index.vue | 2
zhitan-vue/src/views/powerquality/load/index.vue | 12 +++
zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue | 11 +++
zhitan-vue/src/views/deepanalysis/deepAnalysis.vue | 8 +-
zhitan-vue/src/views/poweranalysis/pariPassu/index.vue | 2
9 files changed, 31 insertions(+), 104 deletions(-)
diff --git a/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue b/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
index c04cb0b..bb5525d 100644
--- a/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
+++ b/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
@@ -85,6 +85,7 @@
:chartData="{
title: item.accumulationLabel,
chartType: 'bar',
+ barWidth: '10',
xAxis: item.accumulationKeyList,
series: [
{
@@ -275,34 +276,5 @@
width: 100%;
margin-top: 12px;
padding-bottom: 24px;
-}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
}
</style>
diff --git a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
index 1c82358..99b33ce 100644
--- a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
+++ b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
@@ -263,33 +263,4 @@
width: 100%;
height: 100% !important;
}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
-}
</style>
diff --git a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
index 2686774..d471ba5 100644
--- a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
+++ b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
@@ -44,10 +44,10 @@
</el-form>
</div>
<div class="display-buttons">
- <div class="display-btn" @click="activeKey = 1" :class="{ 'active-display-btn': activeKey === 1 }">
+ <div class="display-btn" @click="switchBtnType(1)" :class="{ 'active-display-btn': activeKey === 1 }">
鍥惧舰
</div>
- <div class="display-btn" @click="activeKey = 2" :class="{ 'active-display-btn': activeKey === 2 }">
+ <div class="display-btn" @click="switchBtnType(2)" :class="{ 'active-display-btn': activeKey === 2 }">
鏁版嵁
</div>
</div>
@@ -132,6 +132,13 @@
queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:00:00")
getElectricityMeter({ modelId: queryParams.value.nodeId })
}
+
+function switchBtnType(e) {
+ activeKey.value = e
+ if (e === 1) {
+ getList()
+ }
+}
const LineChartRef = ref()
function getList() {
loading.value = true
diff --git a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
index c4b13c4..13b56e8 100644
--- a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
+++ b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
@@ -297,11 +297,11 @@
.card-list {
display: flex;
justify-content: space-between;
- padding: 18px;
+ padding-top: 12px;
.card-list-item {
width: 24%;
- height: 167px;
+ height: 160px;
background: #223386;
border-radius: 5px 5px 5px 5px;
border: 1px solid #4868b7;
@@ -364,11 +364,11 @@
.card-list {
display: flex;
justify-content: space-between;
- padding: 18px;
+ padding-top: 12px;
.card-list-item {
width: 24%;
- height: 167px;
+ height: 160px;
background: #fff;
border-radius: 5px 5px 5px 5px;
border: 1px solid #e8e8e8;
diff --git a/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue b/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
index 7b72456..a1221a9 100644
--- a/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
@@ -228,7 +228,7 @@
color: ["#2979ff", "#19be6b", "#ff9900", "#fa3534"],
grid: {
top: "45",
- left: "7%",
+ left: "4%",
right: "5%",
bottom: "10",
containLabel: true,
diff --git a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
index 5e601e6..b37d75a 100644
--- a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
@@ -227,7 +227,7 @@
color: ["#2979ff", "#19be6b", "#ff9900", "#fa3534"],
grid: {
top: "45",
- left: "7%",
+ left: "4%",
right: "5%",
bottom: "10",
containLabel: true,
diff --git a/zhitan-vue/src/views/powerquality/load/index.vue b/zhitan-vue/src/views/powerquality/load/index.vue
index a386abe..108cbf6 100644
--- a/zhitan-vue/src/views/powerquality/load/index.vue
+++ b/zhitan-vue/src/views/powerquality/load/index.vue
@@ -57,10 +57,10 @@
</el-form>
</div>
<div class="display-buttons">
- <div class="display-btn" @click="activeKey = 1" :class="{ 'active-display-btn': activeKey === 1 }">
+ <div class="display-btn" @click="switchBtnType(1)" :class="{ 'active-display-btn': activeKey === 1 }">
鍥惧舰
</div>
- <div class="display-btn" @click="activeKey = 2" :class="{ 'active-display-btn': activeKey === 2 }">
+ <div class="display-btn" @click="switchBtnType(2)" :class="{ 'active-display-btn': activeKey === 2 }">
鏁版嵁
</div>
</div>
@@ -168,6 +168,14 @@
queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
getElectricityMeter({ nodeId: queryParams.value.nodeId })
}
+
+function switchBtnType(e) {
+ activeKey.value = e
+ if (e === 1) {
+ getList()
+ }
+}
+
const LineChartRef = ref()
function getList() {
loading.value = true
diff --git a/zhitan-vue/src/views/powerquality/power/index.vue b/zhitan-vue/src/views/powerquality/power/index.vue
index 37d5bba..b4d22d7 100644
--- a/zhitan-vue/src/views/powerquality/power/index.vue
+++ b/zhitan-vue/src/views/powerquality/power/index.vue
@@ -299,33 +299,4 @@
width: 100%;
height: 100% !important;
}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
-}
</style>
diff --git a/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue b/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
index 23b7d46..36a9aa2 100644
--- a/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
+++ b/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
@@ -231,7 +231,6 @@
padding: 0 10px;
.title {
- font-size: 14px;
color: rgba(255, 255, 255, 0.8);
font-family: OPPOSans, OPPOSans;
font-weight: 500;
@@ -327,9 +326,9 @@
}
&-li {
- width: 240px;
- margin-right: 10px;
- margin-top: 16px;
+ width: 18%;
+ min-width: 190px;
+ margin: 1%;
border-radius: 5px;
border: 1px solid #ebebeb;
margin-bottom: 5px;
@@ -339,7 +338,6 @@
padding: 0 10px;
.title {
- font-size: 14px;
color: #676767;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
@@ -351,11 +349,10 @@
}
.num {
- font-size: 22px;
+ font-size: 24px;
color: #3271eb;
font-family: OPPOSans, OPPOSans;
font-weight: 800;
- font-size: 32px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -368,6 +365,7 @@
text-align: left;
font-style: normal;
text-transform: none;
+ font-size: 14px;
}
}
--
Gitblit v1.9.3