From 402b9b0a731ad3e1ec5b40a692955db9e7a87167 Mon Sep 17 00:00:00 2001 From: wangyunfei888 <1224056307@qq.com> Date: Fri, 26 Dec 2025 17:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=B6=8B=E5=8A=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HistoryTrend.js | 37 ++++++++++--------- .../HistoryTrend.less | 28 +++++++++----- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.js b/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.js index acaac97..8ec77fa 100644 --- a/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.js +++ b/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.js @@ -159,9 +159,8 @@ const HistoryTrend = () => { }, legend: { data: ['液位 (%)'], - right: 20, + left: 'center', top: 10, - icon: 'circle', textStyle: { color: '#4e5856' }, }, grid: { left: 40, right: 20, top: 50, bottom: 30 }, @@ -184,11 +183,11 @@ const HistoryTrend = () => { { name: '液位 (%)', type: 'line', - smooth: true, symbol: 'circle', - symbolSize: 8, - lineStyle: { width: 3 }, - itemStyle: { color: '#2d9e9d' }, + symbolSize: 6, + lineStyle: { width: 1 }, + itemStyle: { color: "#fff", borderColor: '#2d9e9d', borderWidth: 1 }, + lineStyle: { color: '#2d9e9d' }, areaStyle: { color: areaGradient }, data: liquidLevelSeries, }, @@ -207,10 +206,12 @@ const HistoryTrend = () => { axisPointer: { type: 'cross', link: [{ xAxisIndex: 'all' }] }, }, legend: { - data: ['温度 (℃)', '压力 (MPa)'], - right: 20, + data: [ + '温度 (℃)', + '压力 (MPa)', + ], + left: 'center', top: 10, - icon: 'circle', textStyle: { color: '#4e5856' }, }, grid: { left: 50, right: 50, top: 50, bottom: 30 }, @@ -249,21 +250,21 @@ const HistoryTrend = () => { { name: '温度 (℃)', type: 'line', - smooth: true, + // smooth: true, symbol: 'circle', - symbolSize: 7, - lineStyle: { width: 3, color: '#2a7b8d' }, - itemStyle: { color: '#2a7b8d' }, + symbolSize: 6, + itemStyle: { color: '#fff', borderColor: "#2a7b8d", borderWidth: 1 }, + lineStyle: { width: 2, color: '#2a7b8d' }, data: temperatureSeries, }, { name: '压力 (MPa)', type: 'line', - smooth: true, - symbol: 'diamond', - symbolSize: 7, - lineStyle: { width: 3, color: '#c2b453' }, - itemStyle: { color: '#c2b453' }, + // smooth: true, + symbol: 'circle', + symbolSize: 6, + lineStyle: { width: 2, color: '#c2b453' }, + itemStyle: { color: '#fff', borderColor: "#c2b453", borderWidth: 1 }, yAxisIndex: 1, data: pressureSeries, }, diff --git a/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.less b/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.less index 3964c1f..a79730b 100644 --- a/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.less +++ b/src/pages/business_basic/components/second_datamodel_components/HistoryTrend.less @@ -12,18 +12,18 @@ padding: 20px; display: flex; flex-direction: column; - box-shadow: 0 4px 20px rgba(21, 32, 66, 0.04); + box-shadow: 0 4px 20px rgba(21, 32, 66, 0.04) } .rightPanel { flex: 1; - background: #fff; - border-radius: 12px; - padding: 15px 20px; - box-shadow: 0 4px 20px rgba(21, 32, 66, 0.04); + // background: #fff; + // border-radius: 12px; + // padding: 15px 20px; + // box-shadow: 0 4px 20px rgba(21, 32, 66, 0.04); display: flex; flex-direction: column; - gap: 16px; + // gap: 16px; } .blockHeader { @@ -142,11 +142,11 @@ } .trendCard { - background: #fff; - border-radius: 10px; - border: 1px solid #e0eeea; + // background: #fff; + // border-radius: 10px; + // border: 1px solid #e0eeea; padding: 12px 12px 16px; - box-shadow: 0 6px 16px rgba(12, 49, 41, 0.06); + // box-shadow: 0 6px 16px rgba(12, 49, 41, 0.06); display: flex; flex-direction: column; gap: 12px; @@ -164,6 +164,14 @@ gap: 8px; } + .titleIcon { + width: 2px; + height: 16px; + border-radius: 2px; + background: rgba(0, 102, 101, 1); + display: inline-block; + } + .rangeSelect { width: 120px;