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' } +// ]