From 97a7efab9f24f9c71a09b5fd381c4d247097c28d Mon Sep 17 00:00:00 2001 From: Free-sss <630042479@qq.com> Date: Mon, 1 Sep 2025 16:45:36 +0800 Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=E7=BB=9F=E4=B8=80=E5=B0=8F?= =?UTF-8?q?=E6=A0=87=E9=A2=98css=EF=BC=9A=20font-family:=20'CustomFont';?= =?UTF-8?q?=20=20=20=20=20font-style:=20italic;=20=20=20=20=20letter-spaci?= =?UTF-8?q?ng:=200.5px;=20=20=20=20=20color:=20#eee;=20=20=20=20=20text-sh?= =?UTF-8?q?adow:=201px=203px=2010px=20#000000;=20=20=20=20=20font-size:=20?= =?UTF-8?q?16px;=20=20=20=20=20=E5=A4=A7=E6=A0=87=E9=A2=98css=EF=BC=9Afont?= =?UTF-8?q?-family:=20'CustomFont';=20=20=20=20=20color:#eee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfinedSpace/AlarmNowList/config.ts | 5 -- .../FiniteSpatialDistribution/config.ts | 2 +- .../FiniteSpatialDistribution/index.vue | 27 +++--- .../ConfinedSpace/PieCircleCommen/config.ts | 5 -- .../ConfinedSpace/SmallBorder01Co/index.vue | 8 +- .../Charts/ConfinedSpace/videoCheck/config.ts | 5 -- .../AlarmListHaz/config.ts | 9 +- .../AlarmListHaz/index.vue | 9 +- .../AlarmListHazC/config.ts | 11 ++- .../AlarmListHazC/index.vue | 7 ++ .../LineDropdownHaz/index.vue | 24 ++--- .../LineGraph01Haz/index.vue | 57 ++++++------ .../MaxTrimHaz/config.ts | 4 +- .../MaxTrimHaz/index.vue | 7 +- .../PieCenterHaz/index.vue | 11 +-- .../SmallBorder/index.vue | 4 +- .../TopAlarmsHaz/config.ts | 40 ++++----- .../TopAlarmsHaz/index.vue | 19 ++-- .../yushiVideoHaz/index.vue | 88 +++++++------------ 19 files changed, 164 insertions(+), 178 deletions(-) diff --git a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts index 6884688..bf3a7e4 100644 --- a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts @@ -7,11 +7,6 @@ import { chartInitConfig } from '@/settings/designSetting' export const styleConfig = { titleText: '实时报警', titleOption: { - color: '#ffffff', - fontSize: '17px', - fontStyle: 'normal', - fontWeight: 'normal', - fontFamily: 'CustomFont', }, headerOption: { paddingLeft: 0, diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts index eaffaac..0d6476f 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts @@ -123,5 +123,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key: string = FiniteSpatialDistributionConfig.key public chartConfig = cloneDeep(FiniteSpatialDistributionConfig) public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 430, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 420, h: 280, zIndex: 1 } } \ No newline at end of file diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue index 9e5410d..4e56dd5 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue @@ -24,7 +24,7 @@ import { useChartDataFetch } from '@/hooks' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent, TitleComponent } from 'echarts/components' import dataJson from './data.json' -import { getPie3D } from './3dPie' +import { getPie3D } from './3dPie' import axiosInstance from '@/api/axios'; const props = defineProps({ @@ -55,12 +55,12 @@ const initializeChartData = () => { // 使用 dataJson 中的 source 数据初始化图表 if (dataJson && dataJson.source) { props.chartConfig.option.dataset = { ...dataJson } - + // 计算总数并更新标题 const totalValue = dataJson.source.reduce((total: number, item: any) => { return total + (item.value || 0) }, 0) - + // 更新图表标题中的总数 if (props.chartConfig.option.title && props.chartConfig.option.title[0]) { props.chartConfig.option.title[0].text = totalValue @@ -68,8 +68,8 @@ const initializeChartData = () => { const series = getPie3D(dataJson.source, 0.8); - props.chartConfig.option.series=series - + props.chartConfig.option.series = series + console.log('图表数据已初始化:', props.chartConfig.option.dataset) } } @@ -79,11 +79,11 @@ const updateChartData = (newData: any) => { // 确保数据被正确设置到图表配置中 props.chartConfig.option.dataset = newData - + const totalValue = newData.source.reduce((total: number, item: any) => { return total + (item.value || 0) }, 0) - + // 更新图表标题中的总数 if (props.chartConfig.option.title && props.chartConfig.option.title[0]) { props.chartConfig.option.title[0].text = totalValue @@ -158,13 +158,14 @@ onMounted(async () => { top: 0; height: 45px; line-height: 45px; - left: 80px; - font-size: 16px; - font-weight: bold; - color: #eee; - font-style: italic; - text-shadow: 0 0 10px #00E5FF; + left: 70px; white-space: nowrap; + font-family: 'CustomFont'; + font-style: italic; + letter-spacing: 0.5px; + color: #eee; + text-shadow: 1px 3px 10px #000000; + font-size: 16px; } diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts index 0c30084..aadabad 100644 --- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts @@ -45,11 +45,6 @@ const otherConfig = { }, titleText: '报警统计', titleOption: { - color: '#ffffff', - fontSize: '17px', - fontStyle: 'normal', - fontWeight: 'normal', - fontFamily: 'CustomFont', }, headerOption: { paddingLeft: 0, diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue index 83f9b7d..1488353 100644 --- a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue @@ -366,9 +366,11 @@ const handleSelectChange = (value: any) => { .title { font-family: 'CustomFont'; - letter-spacing: 1px; - color: #ffffff; - font-size: 17px; + font-style: italic; + letter-spacing: 0.5px; + color: #eee; + text-shadow: 1px 3px 10px #000000; + font-size: 16px; padding-left: 45px; } } diff --git a/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts index 7a8ecab..7afce1d 100644 --- a/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts @@ -29,11 +29,6 @@ export const option = { isOldStyle: true, titleText: '视频巡查', titleOption: { - color: '#ffffff', - fontSize: '17px', - fontStyle: 'normal', - fontWeight: 'normal', - fontFamily: 'CustomFont', }, headerOption: { paddingLeft: 0, diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/config.ts index 82a22b6..5e771f7 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/config.ts @@ -36,14 +36,13 @@ export const option = { itemHeight: 28, fontSize: 12, title: '近60分钟报警信息', - titleSize: 17, + titleSize: 16, titleColor: '#ffffff', - iconColor: '#00E5FF', fontWeight: 'normal', - fontStyle: 'normal', - paddingX: 40, + fontStyle: 'italic', + paddingX: 50, paddingY: -30, - letterSpacing: 1, + letterSpacing: 0.5, isShowButton: false } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/index.vue index 9f53c41..3d71c36 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHaz/index.vue @@ -104,7 +104,14 @@ const getStatusColor = (status: string) => { height: 35px; display: flex; align-items: center; - padding: 0 20px 0 20px; + padding: 2px 20px 0 20px; + + font-family: 'CustomFont'; + font-style: italic; + letter-spacing: 0.5px; + color: #eee; + text-shadow: 1px 3px 10px #000000; + font-size: 16px; } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts index 8ca1d9b..04f08d8 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts @@ -37,14 +37,13 @@ export const option = { itemHeight: 28, fontSize: 12, title: '近60分钟报警信息', - titleSize: 17, + titleSize: 16, titleColor: '#ffffff', - iconColor: '#00E5FF', fontWeight: 'normal', - fontStyle: 'normal', - paddingX: 40, - paddingY: -30, - letterSpacing: 1, + fontStyle: 'italic', + paddingX: 45, + paddingY: -25, + letterSpacing: 0.5, isShowButton: false } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/index.vue index 101efc2..69cf55e 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/index.vue @@ -179,6 +179,13 @@ onUnmounted(() => { display: flex; align-items: center; padding: 0 20px 0 20px; + + font-family: 'CustomFont'; + font-style: italic; + letter-spacing: 0.5px; + color: #eee; + text-shadow: 1px 3px 10px #000000; + font-size: 16px; } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue index d878ece..43930ec 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue @@ -371,18 +371,18 @@ onMounted(() => { } } -.header-title{ - position: absolute; - top: 0; - height: 45px; - line-height: 45px; - left: 80px; - font-size: 16px; - font-weight: bold; - color: #eee; - font-style: italic; - text-shadow: 0 0 10px #00E5FF; - white-space: nowrap; +.header-title { + position: absolute; + height: 45px; + line-height: 45px; + left: 80px; + white-space: nowrap; + font-family: 'CustomFont'; + font-style: italic; + letter-spacing: 0.5px; + color: #eee; + text-shadow: 1px 3px 10px #000000; + font-size: 16px; } // 新增风险级别下拉框样式 diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/index.vue index d51fa72..d81d0a4 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/index.vue @@ -1,17 +1,14 @@