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 @@ + + + + + + + + + + + + @@ -391,6 +422,9 @@ const yAxisArr: Ref = computed(() => { const legend = computed(() => { return props.optionData.legend }) +const dataZoom = computed(() => { + return props.optionData.dataZoom +}) const grid = computed(() => { return props.optionData.grid diff --git a/src/hooks/commonDataComponents/useAlarmTrendRes.ts b/src/hooks/commonDataComponents/useAlarmTrendRes.ts index 959b2c94..0a89cd34 100644 --- a/src/hooks/commonDataComponents/useAlarmTrendRes.ts +++ b/src/hooks/commonDataComponents/useAlarmTrendRes.ts @@ -3,9 +3,10 @@ import { CreateComponentType } from '@/packages/index.d' import { ResultErrcode } from "@/enums/httpEnum"; import { AlarmTrendType } from '@/store/modules/chartEditStore/chartEditStore.d' import dataJson from "./data.json"; - +import {useGlobalQueryParamsStore} from '@/store/modules/globalQueryParamsStore/globalQueryParamsStore' export const handleAlarmTrend =async (targetComponent: CreateComponentType) => { console.log(targetComponent.commonData,'targetComponent.commonData'); +const globalQueryParamsStore = useGlobalQueryParamsStore() const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as AlarmTrendType let { enable, signal_ids,alarmConfirmStatus,alarmRecoveryStatus,level} = obj @@ -15,10 +16,10 @@ export const handleAlarmTrend =async (targetComponent: CreateComponentType) => { errmsg: '' } const queryParams = { - signal_ids, - alarmConfirmStatus:alarmConfirmStatus.length ? alarmConfirmStatus.split(',') : [], - alarmRecoveryStatus:alarmRecoveryStatus.length ? alarmRecoveryStatus.split(',') : [], - level:level.length ? alarmRecoveryStatus.split(',') : [] + signal_ids:signal_ids.length?signal_ids.split(','):[], + alarmConfirmStatus, + alarmRecoveryStatus, + level } const res = await publicInterface('/dcim/dems/devie_history_alarm', 'trend_chart', queryParams) diff --git a/src/hooks/commonDataComponents/useAreaDevCountRes.ts b/src/hooks/commonDataComponents/useAreaDevCountRes.ts index 9b742426..2238a99e 100644 --- a/src/hooks/commonDataComponents/useAreaDevCountRes.ts +++ b/src/hooks/commonDataComponents/useAreaDevCountRes.ts @@ -6,13 +6,15 @@ import dataJson from "./data.json"; export const handleAreaDevCountClass =async (targetComponent: CreateComponentType) => { const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as AreaDevCountType - console.log(targetComponent,'targetComponent_targetComponent'); // targetComponent?.option.series.forEach((item,index)=>{ // item.encode = { y:index===0? 'dev_count':'it_dev_count', x: 'space' } // }) - + const queryParams = { + space_complete_id:obj.space_complete_id, + space_type:'station' + } // 处理数据 - const res = await publicInterface('/dcim/dems/device','get_area_dev_count', {}) + const res = await publicInterface('/dcim/dems/device','get_area_dev_count', queryParams) res!.data = { // dimensions: res?.data.brand_count.map((item: {})=>Object.keys(item).join('')), dimensions: ['区域','配电设备总数','IT设备总数'], @@ -22,6 +24,7 @@ export const handleAreaDevCountClass =async (targetComponent: CreateComponentTyp '配电设备总数':item?.dev_count, 'IT设备总数':item?.it_dev_count, + complete_id:item?.space?.complete_id } }) } diff --git a/src/hooks/commonDataComponents/useAssetsClassRes.ts b/src/hooks/commonDataComponents/useAssetsClassRes.ts index 810d5370..b28f3e88 100644 --- a/src/hooks/commonDataComponents/useAssetsClassRes.ts +++ b/src/hooks/commonDataComponents/useAssetsClassRes.ts @@ -3,19 +3,19 @@ import { CreateComponentType } from '@/packages/index.d' import { ResultErrcode } from "@/enums/httpEnum"; import { AssetsClassType } from '@/store/modules/chartEditStore/chartEditStore.d' import dataJson from "./data.json"; -import { Product } from "@vicons/carbon"; - +import {useGlobalQueryParamsStore} from '@/store/modules/globalQueryParamsStore/globalQueryParamsStore' export const handleAssetsClass =async (targetComponent: CreateComponentType) => { +const globalQueryParamsStore = useGlobalQueryParamsStore() + const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as AssetsClassType let { enable, dataSource } = obj - console.log(enable, dataSource,'handleAssetsClass') if(!enable) return { errcode: ResultErrcode.SUCCESS, data: { ...dataJson }, errmsg: '' } const query = { - + ...globalQueryParamsStore.getGlobalQueryParams } // 处理数据 if(dataSource==='IT'){ @@ -23,10 +23,10 @@ export const handleAssetsClass =async (targetComponent: CreateComponentType) => const res = await publicInterface('/dcim/asset','get_asset_overview_page_info_new', query) res!.data = { // dimensions: res?.data.brand_count.map((item: {})=>Object.keys(item).join('')), - dimensions: ['product','data'], + dimensions: ['品牌','data'], source:res?.data.brand_count.slice(0,8).map((item: {})=>{ return { - product:Object.keys(item)[0], + '品牌':Object.keys(item)[0], data:Object.values(item)[0], } }) diff --git a/src/hooks/commonDataComponents/useCategoryBrandCountTableRes.ts b/src/hooks/commonDataComponents/useCategoryBrandCountTableRes.ts index 28e4de32..1cfa8b16 100644 --- a/src/hooks/commonDataComponents/useCategoryBrandCountTableRes.ts +++ b/src/hooks/commonDataComponents/useCategoryBrandCountTableRes.ts @@ -5,7 +5,7 @@ import { commonDataType, CategoryBrandCountTableType } from '@/store/modules/cha import { CreateComponentType } from '@/packages/index.d' import { ResultErrcode } from '@/enums/httpEnum' import dataJson from './data.json' - +import {useGlobalQueryParamsStore} from '@/store/modules/globalQueryParamsStore/globalQueryParamsStore' export const handleCategoryBrandCountTable =async (targetComponent: CreateComponentType) => { let { currentSource, enable } = (targetComponent.commonData as commonDataType).categoryBrandCountTable as CategoryBrandCountTableType if(!enable) return { @@ -13,9 +13,13 @@ export const handleCategoryBrandCountTable =async (targetComponent: CreateCompon data: { ...dataJson }, errmsg: '' } +const globalQueryParamsStore = useGlobalQueryParamsStore() + console.log(currentSource,'currentSource'); - - const res = await publicInterface(currentSource==='IT'?'/dcim/asset':'/dcim/dems/device',currentSource==='IT'?'get_category_brand_count': 'get_dev_category_brand_count', {}) + const queryParams = { + ...globalQueryParamsStore.getGlobalQueryParams + } + const res = await publicInterface(currentSource==='IT'?'/dcim/asset':'/dcim/dems/device',currentSource==='IT'?'get_category_brand_count': 'get_dev_category_brand_count', queryParams) const top = ['TOP1','TOP2','TOP3'] res!.data = { diff --git a/src/hooks/commonDataComponents/useCompanyTempTopRes.ts b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts index eafd26f2..cdaa4ffe 100644 --- a/src/hooks/commonDataComponents/useCompanyTempTopRes.ts +++ b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts @@ -5,7 +5,7 @@ import { CompanyTempTopType } from '@/store/modules/chartEditStore/chartEditStor import dataJson from "./data.json"; export const handleCompanyTempTop =async (targetComponent: CreateComponentType) => { - console.log(targetComponent.commonData,'targetComponent.commonData'); + console.log(targetComponent,'targetComponent.commonData'); const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as CompanyTempTopType let { enable, space_complete_id, signal_ids} = obj diff --git a/src/hooks/useChartCommonData.hook.ts b/src/hooks/useChartCommonData.hook.ts index c1236ce2..2c4aa95f 100644 --- a/src/hooks/useChartCommonData.hook.ts +++ b/src/hooks/useChartCommonData.hook.ts @@ -48,11 +48,7 @@ export const useChartCommonData = ( // eCharts 组件配合 vChart 库更新方式 const echartsUpdateHandle = (dataset: any) => { if (chartFrame === ChartFrameEnum.ECHARTS) { - // if (vChartRef.value) { - // setOption(vChartRef.value, { dataset: dataset }) - // } - // if(!dataset.dimensions) return - console.log(targetComponent,'targetComponent') + if(targetComponent.option){ const SingleDataArr = [ CurrentSourceEnum.SINGLEPOINT, @@ -168,7 +164,6 @@ export const useChartCommonData = ( } if (res && res.errcode === ResultErrcode.SUCCESS) { try { - console.log(res,'res--fetchFn') const { data } = res // 多值的 @@ -185,7 +180,6 @@ export const useChartCommonData = ( else throw Error() } else if(Object.prototype.toString.call(data) === '[object Object]'){ - console.log(data,'data_isMultiple'); if(data.dimensions && data.source) { if(typeof targetComponent.commonData.dataLength === 'number') { @@ -231,6 +225,7 @@ export const useChartCommonData = ( const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value // 开启轮询 if (time) { + fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit)) } else { fetchFn() diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts index 2f26a741..9c1cb17d 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.ts +++ b/src/packages/components/Charts/Bars/BarCommon/config.ts @@ -45,6 +45,27 @@ export const option = { min: null } ], + dataZoom:{ + show: false, + height: 5, + xAxisIndex: [0], + bottom: 10, + showDetail: false, + showDataShadow: false, + borderColor: 'transparent', + textStyle: { + fontSize: 0 + }, + startValue: 0, + endValue: 5, // 从0开始的7个 + backgroundColor: 'rgba(0,0,0,0)', + borderWidth: 0, + handleSize: '0%', + handleStyle: { + color: '#d3dee5' + } + }, + dataset: { ...dataJson }, series: [seriesItem, seriesItem], allSeriesConfig: seriesItem diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index f11d2207..49755e89 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -1,12 +1,18 @@ - + + diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index 0ae48cca..16261b28 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -39,6 +39,8 @@ import { CanvasRenderer } from 'echarts/renderers' import { useChartDataFetch } from '@/hooks' import { mergeTheme, setOption } from '@/packages/public/chart' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' +import { useChartCommonData } from '@/hooks' + import {isPreview, postMessageToParent} from '@/utils' import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json' import mapChinaJson from './mapGeojson/china.json' @@ -152,17 +154,24 @@ const updateMapFn = (data: any) => { let obj = (dataMap.value as any)[it.properties.name] || {} return { name: it.properties.name, + adcode: it.properties.adcode, + value: it.properties.center ? it.properties.center.concat(50) : [], itemStyle: { color: colorMap.value[obj.roomId] || '#4dca59', } } }) + console.log(props.chartConfig.option.series[0].data,'props.chartConfig.option.series[0].data') } //动态获取json注册地图 const getGeojson = (regionId: string) => { return new Promise(resolve => { + console.log(regionId,'regionId') + if(regionId==='440600'){ + get_area_dev_count() + } import(`./mapGeojson/${regionId}.json`).then(data => { currentMap.value = data.default registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} }) @@ -171,16 +180,27 @@ const getGeojson = (regionId: string) => { }) }) } - +const get_area_dev_count =async ()=>{ + const res = await publicInterface('/dcim/dems/device','get_area_dev_count', {space_type:'county'}) + customData.value.devList = res?.data +} //异步时先注册空的 保证初始化不报错 -registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} }) +if(props.chartConfig.option.mapRegion.province){ + registerMap(`${props.chartConfig.option.mapRegion.province}`, { geoJSON: {} as any, specialAreas: {} }) + +}else{ + registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} }) + +} // 进行更换初始化地图 如果为china 单独处理 const registerMapInitAsync = async () => { await nextTick() const adCode = `${props.chartConfig.option.mapRegion.adcode}` + const province = `${props.chartConfig.option.mapRegion.province}` if (adCode !== 'china') { - await getGeojson(adCode) + + await getGeojson(province?province:adCode) } else { await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands) } @@ -220,25 +240,7 @@ const vEchartsSetOption = () => { setOption(vChartRef.value, props.chartConfig.option) } -// 更新数据处理 -const dataSetHandle = async (dataset: any) => { - props.chartConfig.option.series.forEach((item: any) => { - // if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point - if (item.type === 'lines' && dataset.line) { - item.data = dataset.line.map((it: any) => { - return { - ...it, - lineStyle: { - color: props.chartConfig.option.series[2].lineStyle.normal.color - } - } - }) - } else if (item.type === 'map' && dataset.map) item.data = dataset.map - }) - if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces - isPreview() && vEchartsSetOption() -} // 处理海南群岛 const hainanLandsHandle = async (newData: boolean) => { if (newData) { @@ -250,6 +252,29 @@ const hainanLandsHandle = async (newData: boolean) => { // 点击区域 const chartPEvents = (e: any) => { + console.log(e,'e') + console.log(props.chartConfig.option,'props.chartConfig.option.series[1]') + if(props.chartConfig.option.mapRegion.province===440600){ + const county = currentMap.value.features.find((item:any)=>item.properties.name===e.name) +if(county){ + const space_complete:any = customData.value.devList.find((item:any)=>{ + if(item.space.extend_column_string.length){ + + return JSON.parse(item.space.extend_column_string).county_code===`${county.properties.adcode}` + } + }) + + const chartEditStore = useChartEditStore() + chartEditStore.getComponentList.forEach(component=>{ + if(component.commonData.currentSource==='areaDevCount'){ + component.commonData['areaDevCount'].space_complete_id = space_complete?space_complete?.space.complete_id:null + // useChartCommonData(component, useChartEditStore) + } + + }) +} + console.log(county,'county') + } if (e.seriesType !== 'map') return if (!props.chartConfig.option.mapRegion.enter) { return @@ -295,6 +320,10 @@ onMounted(() => { watch(() => customData.value.dataMap, () => { let obj = dataMap.value as any props.chartConfig.option.series[1].tooltip.formatter = (v: any) => { + // if(props.chartConfig.option.mapRegion.province===440600){ + // let str = `${v.name}${1111}` + // return str + // } let value: any if(JSON.stringify(obj) !== '{}') value = obj[v.name]?.value || '-' else value = !isNaN(v.value) ? v.value : '-' @@ -413,30 +442,7 @@ onUnmounted(() => { box?.value?.removeEventListener('mousedown', handleMousedown) }) -// //监听 dataset 数据发生变化 -// watch( -// () => props.chartConfig.option.dataset, -// newData => { -// dataSetHandle(newData) -// }, -// { -// immediate: true, -// deep: false -// } -// ) -// 监听线的颜色 -// if (props.chartConfig.option.series[2] && !isPreview()) { -// watch( -// () => props.chartConfig.option.series[2].lineStyle.normal.color, -// () => { -// dataSetHandle(props.chartConfig.option.dataset) -// }, -// { -// deep: false -// } -// ) -// } //监听是否显示南海群岛 if (!isPreview()) { @@ -469,6 +475,20 @@ watch( deep: false } ) +//监听地图展示区域发生变化 +watch( + () => `${props.chartConfig.option.mapRegion.province}`, + newData => { + try { + checkOrMap(newData) + } catch (error) { + console.log(error) + } + }, + { + deep: false + } +) let timer:unknown @@ -499,10 +519,7 @@ onMounted(() => { onUnmounted(() => { if(timer) clearInterval(timer as number) }) -// 预览 -// useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => { -// dataSetHandle(newData) -// }) + \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/configData.vue b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/configData.vue new file mode 100644 index 00000000..e056cd4d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/configData.vue @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.ts b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.ts new file mode 100644 index 00000000..fb5886fd --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.ts @@ -0,0 +1,16 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const AlarmTrend: ConfigType = { + key: 'AlarmTrend', + chartKey: 'VAlarmTrend', + conKey: 'VCAlarmTrend', + // VCD开头 + conDataKey: 'VCDAlarmTrend', + title: '告警趋势', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'AlarmTrend.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.vue b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.vue new file mode 100644 index 00000000..4fb34a25 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/AlarmTrend/index.vue @@ -0,0 +1,256 @@ + + + + + 月 + 年 + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/ClassifiedStatistic/index.vue b/src/packages/components/CustomComponents/CustomComponents/ClassifiedStatistic/index.vue index 28e2c073..064f5d47 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ClassifiedStatistic/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ClassifiedStatistic/index.vue @@ -6,9 +6,13 @@ + + {{Object.values(item)[0]}} + + - {{Object.keys(item)[0]}}{{Object.values(item)[0]}}台 + {{Object.keys(item)[0]}} @@ -29,7 +33,8 @@ import {cloneDeep} from 'lodash' import moment from "moment" import {selectTimeOptions} from "@/views/chart/ContentConfigurations/components/ChartData/index.d"; import {RequestHttpIntervalEnum} from "@/enums/httpEnum"; - +import {useGlobalQueryParamsStore} from '@/store/modules/globalQueryParamsStore/globalQueryParamsStore' +const globalQueryParamsStore = useGlobalQueryParamsStore() const props = defineProps({ chartConfig: { type: Object as PropType, @@ -47,13 +52,14 @@ const getStyle = (radius: number) => { overflow: 'hidden' } } -console.log(props.chartConfig,'chartConfig'); let type_count:any = ref([]) +const queryParams = { + ...globalQueryParamsStore.getGlobalQueryParams +} const getData = () => { if(props.chartConfig?.customData?.currentSource==='IT'){ - publicInterface('/dcim/asset', 'get_asset_overview_page_info_new', {}).then(res => { - console.log(res,'res----') + publicInterface('/dcim/asset', 'get_asset_overview_page_info_new', queryParams).then(res => { if (res && res.data) { type_count.value = res.data.type_count // for (const key in computeNodeData) { @@ -62,8 +68,7 @@ const getData = () => { } }) }else{ - publicInterface('/dcim/dems/device', 'get_dev_category_count', {}).then(res => { - console.log(res,'res----') + publicInterface('/dcim/dems/device', 'get_dev_category_count', queryParams).then(res => { if (res && res.data) { type_count.value = res.data.map((item:any)=>{ return { @@ -147,12 +152,25 @@ onUnmounted(() => { overflow: auto; color:#fff; .img{ + position: relative; width: 100px; height: 100px; img{ width: 100%; height: 100%; } + .value{ + position: absolute; + width: 100%; + top:50%; + left:50%; + transform: translate(-50%,-50%); + white-space: pre-wrap; + text-align: center; + font-size: 17px; + + + } } } .count{ diff --git a/src/packages/components/CustomComponents/CustomComponents/Overview/index.vue b/src/packages/components/CustomComponents/CustomComponents/Overview/index.vue index 9dbd3918..1ef26ad8 100644 --- a/src/packages/components/CustomComponents/CustomComponents/Overview/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/Overview/index.vue @@ -30,7 +30,8 @@ import {cloneDeep} from 'lodash' import moment from "moment" import {selectTimeOptions} from "@/views/chart/ContentConfigurations/components/ChartData/index.d"; import {RequestHttpIntervalEnum} from "@/enums/httpEnum"; - +import {useGlobalQueryParamsStore} from '@/store/modules/globalQueryParamsStore/globalQueryParamsStore' +const globalQueryParamsStore = useGlobalQueryParamsStore() const props = defineProps({ chartConfig: { type: Object as PropType, @@ -48,13 +49,13 @@ const getStyle = (radius: number) => { overflow: 'hidden' } } -console.log(props.chartConfig,'chartConfig'); let type_count:any = ref([]) - +const queryParams = { + ...globalQueryParamsStore.getGlobalQueryParams +} const getData = () => { if(props.chartConfig?.customData?.currentSource==='IT'){ - publicInterface('/dcim/asset', 'get_asset_overview_page_info_new', {}).then(res => { - console.log(res,'res----') + publicInterface('/dcim/asset', 'get_asset_overview_page_info_new', queryParams).then(res => { if (res && res.data) { let commonBrands = res.data.type_count.reduce((prev:any, curr:any) => { @@ -80,8 +81,7 @@ const getData = () => { } }) }else{ - publicInterface('/dcim/dems/device', 'get_dev_category_count', {}).then(res => { - console.log(res,'res----') + publicInterface('/dcim/dems/device', 'get_dev_category_count', queryParams).then(res => { if (res && res.data) { const commonBrands:any = res.data.reduce((prev:any, curr:any) => { return curr.count > prev.count ? curr : prev; @@ -104,7 +104,6 @@ const getData = () => { } }) } - console.log(type_count.value,`type_count_${props.chartConfig?.customData?.currentSource}`) } let timer:unknown diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts index 504b3b28..1dcdfd6e 100644 --- a/src/packages/components/CustomComponents/CustomComponents/index.ts +++ b/src/packages/components/CustomComponents/CustomComponents/index.ts @@ -20,6 +20,7 @@ import { PositionConfig } from './Position' import { JumpBtnConfig } from './JumpBtn' import { ClassifiedStatistic } from './ClassifiedStatistic' import { AlarmLevelStatistic } from './AlarmLevelStatistic' +import { AlarmTrend } from './AlarmTrend' import { RoomTemperature } from './RoomTemperature' import { Overview } from './Overview' @@ -46,6 +47,7 @@ export default [ JumpBtnConfig, ClassifiedStatistic, AlarmLevelStatistic, + AlarmTrend, RoomTemperature, Overview ] diff --git a/src/packages/components/Decorates/Borders/BorderCustom1/index.vue b/src/packages/components/Decorates/Borders/BorderCustom1/index.vue index 5c079b17..4e029e6d 100644 --- a/src/packages/components/Decorates/Borders/BorderCustom1/index.vue +++ b/src/packages/components/Decorates/Borders/BorderCustom1/index.vue @@ -25,7 +25,6 @@ const { dataset, fit, borderRadius } = toRefs(props.chartConfig.option) const option = shallowReactive({ dataset: '' }) - const getStyle = (radius: number) => { return { borderRadius: `${radius}px`, diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue index edf7f255..3307ff49 100644 --- a/src/packages/components/Tables/Tables/TablesBasic/index.vue +++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue @@ -13,6 +13,7 @@ ({ + 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' } +// ]