From f9e910ed8843276f3172812b6089f589f8fe6244 Mon Sep 17 00:00:00 2001 From: Free-sss <630042479@qq.com> Date: Mon, 8 Sep 2025 17:53:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(charts):=20=E8=B0=83=E6=95=B4=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=BB=84=E4=BB=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E5=B0=BA?= =?UTF-8?q?=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了多个图表组件的宽度和高度属性 - 优化了部分组件的样式，如移除背景色 --- .../Charts/ConfinedSpace/AlarmNowList/config.ts | 2 +- .../FiniteSpatialDistribution/config.ts | 2 +- .../Charts/ConfinedSpace/PieCircleCommen/config.ts | 2 +- .../Charts/ConfinedSpace/videoCheck/config.ts | 2 +- .../HazardousChemicalsSpace/AlarmListHazC/config.ts | 2 +- .../LineDropdownHaz/config.ts | 4 ++-- .../LineDropdownHaz/index.vue | 12 ++++++++---- .../HazardousChemicalsSpace/LineGraph01Haz/config.ts | 2 +- .../HazardousChemicalsSpace/PieCenterHaz/config.ts | 2 +- .../HazardousChemicalsSpace/TopAlarmsHaz/config.ts | 2 +- .../HazardousChemicalsSpace/yushiVideoHaz/config.ts | 2 +- .../Charts/MyComponents/LineDropdown/config.ts | 2 +- .../Charts/MyComponents/LineDropdown/index.vue | 12 ++++++++---- .../Charts/MyComponents/LineGraph01/config.ts | 2 +- .../Charts/MyComponents/ParkingScene/config.ts | 3 ++- .../Charts/MyComponents/PieCenter/config.ts | 2 +- .../Charts/MyComponents/SceneDistribution/config.ts | 3 ++- .../Charts/MyComponents/TopAlarms/config.ts | 2 +- .../Charts/MyComponents/WorkshopScene/config.ts | 3 +++ 19 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts index abeccc1..1a7442e 100644 --- a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts @@ -20,5 +20,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = AlarmNowListConfig.key public chartConfig = cloneDeep(AlarmNowListConfig) public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts index 5a39c76..7a6c5bc 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts @@ -127,5 +127,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: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } \ No newline at end of file diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts index dfc0056..0d24ec5 100644 --- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts @@ -131,7 +131,7 @@ export default class Config extends PublicConfigClass implements CreateComponent public key: string = PieCircleCommenConfig.key public chartConfig = cloneDeep(PieCircleCommenConfig) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } // 图表配置项 public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts index 963823d..f88b845 100644 --- a/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts @@ -43,5 +43,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = videoCheckConfig.key public chartConfig = cloneDeep(videoCheckConfig) public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 430, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts index 4456d07..b122d57 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/AlarmListHazC/config.ts @@ -46,6 +46,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = AlarmListHazCConfig.key public chartConfig = AlarmListHazCConfig public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.ts index b8f15ab..a72e7c1 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.ts @@ -39,7 +39,7 @@ const otherConfig = { export const option = { ...otherConfig, - backgroundColor: 'rgba(13, 16, 22, 1)', + // backgroundColor: 'rgba(13, 16, 22, 1)', grid: { left: '8%', right: '8%', @@ -143,5 +143,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key: string = LineDropdownConfig.key public chartConfig = cloneDeep(LineDropdownConfig) public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } \ No newline at end of file diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue index 973511f..a1c5863 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue @@ -169,9 +169,9 @@ onMounted(() => { @@ -336,6 +339,7 @@ onMounted(() => { position: relative; width: 90%; margin: 10px auto 0; + flex-shrink: 0; :deep(.custom-select) { z-index: 999; diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/config.ts index f5d01c0..9a08f5b 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/LineGraph01Haz/config.ts @@ -140,6 +140,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public mockData = dataJson // 图表配置项 public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/config.ts index 948fa08..93a288f 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/config.ts @@ -237,5 +237,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key: string = PieCenterConfig.key public chartConfig = cloneDeep(PieCenterConfig) public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } \ No newline at end of file diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts index f3849b8..b55a217 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts @@ -46,5 +46,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = TopAlarmsConfig.key public chartConfig = TopAlarmsConfig public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/yushiVideoHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/yushiVideoHaz/config.ts index cec7e9d..e1ddc3c 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/yushiVideoHaz/config.ts +++ b/src/packages/components/Charts/HazardousChemicalsSpace/yushiVideoHaz/config.ts @@ -34,5 +34,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = yushiVideoConfig.key public chartConfig = cloneDeep(yushiVideoConfig) public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/MyComponents/LineDropdown/config.ts b/src/packages/components/Charts/MyComponents/LineDropdown/config.ts index 12ac919..a72e7c1 100644 --- a/src/packages/components/Charts/MyComponents/LineDropdown/config.ts +++ b/src/packages/components/Charts/MyComponents/LineDropdown/config.ts @@ -39,7 +39,7 @@ const otherConfig = { export const option = { ...otherConfig, - backgroundColor: 'rgba(13, 16, 22, 1)', + // backgroundColor: 'rgba(13, 16, 22, 1)', grid: { left: '8%', right: '8%', diff --git a/src/packages/components/Charts/MyComponents/LineDropdown/index.vue b/src/packages/components/Charts/MyComponents/LineDropdown/index.vue index 973511f..a1c5863 100644 --- a/src/packages/components/Charts/MyComponents/LineDropdown/index.vue +++ b/src/packages/components/Charts/MyComponents/LineDropdown/index.vue @@ -169,9 +169,9 @@ onMounted(() => { @@ -336,6 +339,7 @@ onMounted(() => { position: relative; width: 90%; margin: 10px auto 0; + flex-shrink: 0; :deep(.custom-select) { z-index: 999; diff --git a/src/packages/components/Charts/MyComponents/LineGraph01/config.ts b/src/packages/components/Charts/MyComponents/LineGraph01/config.ts index f5d01c0..9a08f5b 100644 --- a/src/packages/components/Charts/MyComponents/LineGraph01/config.ts +++ b/src/packages/components/Charts/MyComponents/LineGraph01/config.ts @@ -140,6 +140,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public mockData = dataJson // 图表配置项 public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/MyComponents/ParkingScene/config.ts b/src/packages/components/Charts/MyComponents/ParkingScene/config.ts index c4bd2cd..7d37771 100644 --- a/src/packages/components/Charts/MyComponents/ParkingScene/config.ts +++ b/src/packages/components/Charts/MyComponents/ParkingScene/config.ts @@ -3,7 +3,7 @@ import { CreateComponentType } from '@/packages/index.d' import { ParkingSceneConfig } from './index' import dataJson from './data.json' import { cloneDeep } from 'lodash' - +import { chartInitConfig } from '@/settings/designSetting' export const option = { sceneCode: "", componentIndexKey: "", @@ -25,4 +25,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = ParkingSceneConfig.key public chartConfig = ParkingSceneConfig public option = cloneDeep(option) + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/MyComponents/PieCenter/config.ts b/src/packages/components/Charts/MyComponents/PieCenter/config.ts index 948fa08..93a288f 100644 --- a/src/packages/components/Charts/MyComponents/PieCenter/config.ts +++ b/src/packages/components/Charts/MyComponents/PieCenter/config.ts @@ -237,5 +237,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key: string = PieCenterConfig.key public chartConfig = cloneDeep(PieCenterConfig) public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } \ No newline at end of file diff --git a/src/packages/components/Charts/MyComponents/SceneDistribution/config.ts b/src/packages/components/Charts/MyComponents/SceneDistribution/config.ts index 02e0a5c..034cef5 100644 --- a/src/packages/components/Charts/MyComponents/SceneDistribution/config.ts +++ b/src/packages/components/Charts/MyComponents/SceneDistribution/config.ts @@ -3,7 +3,7 @@ import { CreateComponentType } from '@/packages/index.d' import { SceneDistributionConfig } from './index' import dataJson from './data.json' import { cloneDeep } from 'lodash' - +import { chartInitConfig } from '@/settings/designSetting' export const option = { sceneCode: 'T06', componentIndexKey: "a", @@ -24,4 +24,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = SceneDistributionConfig.key public chartConfig = SceneDistributionConfig public option = cloneDeep(option) + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts index f3849b8..b55a217 100644 --- a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts +++ b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts @@ -46,5 +46,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = TopAlarmsConfig.key public chartConfig = TopAlarmsConfig public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } } diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts b/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts index 171458b..f0d1502 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts @@ -3,7 +3,9 @@ import { CreateComponentType } from '@/packages/index.d' import { WorkshopSceneConfig } from './index' import dataJson from './data.json' import { cloneDeep } from 'lodash' +import { chartInitConfig } from '@/settings/designSetting' export enum FontWeightEnum { + NORMAL = '常规', BOLD = '加粗', } @@ -52,4 +54,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = WorkshopSceneConfig.key public chartConfig = WorkshopSceneConfig public option = cloneDeep(option) + public attr = { ...chartInitConfig, x: 0, y: 0, w: 500, h: 325, zIndex: 1 } }