From 26919a1554976d02f024046105b42c211523d390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=9D=E8=8E=89?= <1084050926@qq.com> Date: Thu, 22 Aug 2024 17:22:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B8=A9=E5=BA=A6?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 +- .../Pages/ChartItemSetting/GlobalSetting.vue | 34 + .../commonDataComponents/useAlarmTrendRes.ts | 11 +- .../useAreaDevCountRes.ts | 9 +- .../commonDataComponents/useAssetsClassRes.ts | 12 +- .../useCategoryBrandCountTableRes.ts | 10 +- .../useCompanyTempTopRes.ts | 2 +- src/hooks/useChartCommonData.hook.ts | 9 +- .../Charts/Bars/BarCommon/config.ts | 21 + .../Charts/Bars/BarCommon/index.vue | 50 +- .../Charts/Lines/LineCommon/config.ts | 20 + .../components/Charts/Maps/MapBase/config.ts | 2 + .../components/Charts/Maps/MapBase/config.vue | 41 +- .../components/Charts/Maps/MapBase/index.vue | 113 +- .../Maps/MapBase/mapGeojson/440600.json | 7844 +++++++++++++++++ .../RealTimeAlarmStatistics/config.ts | 4 +- .../RealTimeAlarmStatistics/configData.vue | 5 +- .../RealTimeAlarmStatistics/index.vue | 24 +- .../AlarmLevelStatistic/config.ts | 10 +- .../AlarmLevelStatistic/configData.vue | 24 +- .../AlarmLevelStatistic/index.ts | 2 +- .../AlarmLevelStatistic/index.vue | 28 +- .../CustomComponents/AlarmTrend/config.ts | 27 + .../CustomComponents/AlarmTrend/config.vue | 23 + .../AlarmTrend/configData.vue | 49 + .../CustomComponents/AlarmTrend/index.ts | 16 + .../CustomComponents/AlarmTrend/index.vue | 256 + .../ClassifiedStatistic/index.vue | 32 +- .../CustomComponents/Overview/index.vue | 15 +- .../CustomComponents/index.ts | 2 + .../Decorates/Borders/BorderCustom1/index.vue | 1 - .../Tables/Tables/TablesBasic/index.vue | 19 +- src/packages/public/chart.ts | 1 + src/packages/public/publicConfig.ts | 18 +- src/settings/chartThemes/global.theme.json | 2 + .../chartEditStore/chartEditStore.d.ts | 9 +- .../globalQueryParamsStore.ts | 24 + .../ChartDataV2/components/AlarmTrend.vue | 35 +- 38 files changed, 8649 insertions(+), 159 deletions(-) create mode 100644 src/packages/components/Charts/Maps/MapBase/mapGeojson/440600.json create mode 100644 src/packages/components/CustomComponents/CustomComponents/AlarmTrend/config.ts create mode 100644 src/packages/components/CustomComponents/CustomComponents/AlarmTrend/config.vue create mode 100644 src/packages/components/CustomComponents/CustomComponents/AlarmTrend/configData.vue create mode 100644 src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.ts create mode 100644 src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.vue create mode 100644 src/store/modules/globalQueryParamsStore/globalQueryParamsStore.ts diff --git a/.env b/.env index 13143dd4..cf06f708 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ VITE_DEV_PORT = '8080' # VITE_DEV_PATH = 'http://192.168.0.34:11887' VITE_DEV_PATH = 'http://192.168.0.34:8025/' # VITE_DEV_PATH = 'http://192.168.0.120:3001' -VITE_DEV_TOKEN = "1f58b5b5-4eae-415b-bce9-d206adb1477b" +VITE_DEV_TOKEN = "6d3db4a4-bcf6-47f7-8764-3b95f4f9b4d3" # production path -VITE_PRO_PATH = 'http://192.168.0.235:8177' +# VITE_PRO_PATH = 'http://192.168.0.235:8177' diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue index e42cb2df..d5b3b2ae 100644 --- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue +++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue @@ -283,6 +283,23 @@ + + + + + + + @@ -301,6 +318,20 @@ + + + + + + + + + + ({ + queryParams: {} + }), + getters: { + getGlobalQueryParams():{[k:string]: any} { + return this.queryParams + } + }, + actions: { + setGlobalQueryParams(queryParams: {[k:string]: any}, merge: boolean = true) { + if(merge) { + this.queryParams = cloneDeep(queryParams) + } + else { + Object.assign(this.queryParams, queryParams) + } + } + } +}) diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AlarmTrend.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AlarmTrend.vue index ed218a78..50bd6ec1 100644 --- a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AlarmTrend.vue +++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AlarmTrend.vue @@ -7,15 +7,16 @@ - - + + - - + + - - + + + @@ -26,12 +27,32 @@ import type {Ref} from 'vue' import {SettingItemBox} from '@/components/Pages/ChartItemSetting' import {useTargetData} from '../../hooks/useTargetData.hook' import {commonDataType, AlarmTrendType} from '@/store/modules/chartEditStore/chartEditStore.d' +import { useOriginStore } from '@/store/modules/originStore/originStore' +const originStore = useOriginStore() +const systemConstant = originStore?.getOriginStore?.user?.systemConstant +const levelOptions = systemConstant['warn_levels'].filter((item:any)=>{ +if(item.value){ + item.value = item.value*1 + return item +} +}) const {targetData} = useTargetData() as { targetData: Ref<{ commonData: commonDataType, id: string }> } const currentObj = computed(() => { return targetData.value.commonData[targetData.value.commonData.currentSource] as AlarmTrendType }) - +const confirmStatusOption = [ + { label: '已确认', value: 'ok' }, + { label: '未确认', value: 'not' } + ] +const recoveryStatusOption = [ + { label: '已恢复', value: 'ok' }, + { label: '未恢复', value: 'not' } + ] +// const recoveryStatusOption = [ +// { label: '已恢复', value: 'ok' }, +// { label: '未恢复', value: 'not' } +// ]