diff --git a/.env b/.env index 0115e716..30a49059 100644 --- a/.env +++ b/.env @@ -2,7 +2,8 @@ VITE_DEV_PORT = '8080' # development path -VITE_DEV_PATH = 'http://192.168.0.34:11887' +# VITE_DEV_PATH = 'http://192.168.0.34:11887' +VITE_DEV_PATH = 'http://192.168.0.34:18077' # VITE_DEV_PATH = 'http://192.168.0.120:3001' # production path diff --git a/src/assets/images/chart/customponents/EngineeringConfig.png b/src/assets/images/chart/customponents/EngineeringConfig.png new file mode 100644 index 00000000..a32e0ff6 Binary files /dev/null and b/src/assets/images/chart/customponents/EngineeringConfig.png differ diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts index a57b6d94..fe20cb39 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.ts +++ b/src/packages/components/Charts/Bars/BarCommon/config.ts @@ -37,7 +37,8 @@ xAxis: { type: 'value' }, dataset: { ...dataJson }, - series: [seriesItem, seriesItem] + series: [seriesItem, seriesItem], + allSeriesConfig: seriesItem } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Bars/BarCommon/config.vue b/src/packages/components/Charts/Bars/BarCommon/config.vue index abe45649..7b03ce5c 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.vue +++ b/src/packages/components/Charts/Bars/BarCommon/config.vue @@ -107,7 +107,11 @@ const seriesList = computed(() => { return props.optionData.series }) -const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) +// const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) + +const allSeriesConfig = computed(() => { + return props.optionData.allSeriesConfig +}) watch(() => allSeriesConfig.value, (v) => { seriesList.value.forEach((item: typeof seriesItem) => { diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.ts b/src/packages/components/Charts/Bars/BarCrossrange/config.ts index 340656ac..abdd2687 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/config.ts +++ b/src/packages/components/Charts/Bars/BarCrossrange/config.ts @@ -37,7 +37,8 @@ export const option = { type: 'category' }, dataset: { ...dataJson }, - series: [seriesItem, seriesItem] + series: [seriesItem, seriesItem], + allSeriesConfig: seriesItem } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.vue b/src/packages/components/Charts/Bars/BarCrossrange/config.vue index de0678d3..69d1e74d 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/config.vue +++ b/src/packages/components/Charts/Bars/BarCrossrange/config.vue @@ -132,7 +132,11 @@ const seriesList = computed(() => { return props.optionData.series }) -const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) +// const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) + +const allSeriesConfig = computed(() => { + return props.optionData.allSeriesConfig +}) watch(() => allSeriesConfig.value, (v) => { seriesList.value.forEach((item: typeof seriesItem) => { diff --git a/src/packages/components/Charts/Lines/LineCommon/config.ts b/src/packages/components/Charts/Lines/LineCommon/config.ts index 261e2679..ac9ce632 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.ts +++ b/src/packages/components/Charts/Lines/LineCommon/config.ts @@ -43,7 +43,8 @@ export const option = { type: 'value' }, dataset: { ...dataJson }, - series: [seriesItem, seriesItem] + series: [seriesItem, seriesItem], + allSeriesConfig: seriesItem } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Lines/LineCommon/config.vue b/src/packages/components/Charts/Lines/LineCommon/config.vue index 1e1fe777..58f23e45 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.vue +++ b/src/packages/components/Charts/Lines/LineCommon/config.vue @@ -142,7 +142,11 @@ const seriesList = computed(() => { return props.optionData.series }) -const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) +// const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) + +const allSeriesConfig = computed(() => { + return props.optionData.allSeriesConfig +}) watch(() => allSeriesConfig.value, (v) => { seriesList.value.forEach((item: typeof seriesItem) => { diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts index 80a79979..ddaef6a4 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts @@ -54,7 +54,8 @@ const options = { type: 'value' }, dataset: { ...dataJson }, - series: [seriesItem] + series: [seriesItem], + allSeriesConfig: seriesItem } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue index b1ca4786..5f5c16c8 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue +++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue @@ -126,10 +126,11 @@ import { PropType, computed, ref, watch } from 'vue' import type { Ref } from 'vue' import { lineConf } from '@/packages/chartConfiguration/echarts/index' -import { GlobalThemeJsonType } from '@/settings/chartThemes/index' +import { chartColorsSearch, defaultTheme, GlobalThemeJsonType } from '@/settings/chartThemes/index' import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting' import { seriesItem } from "./config"; import { cloneDeep } from "lodash"; +import { graphic } from "echarts/core"; const props = defineProps({ optionData: { @@ -142,11 +143,30 @@ const seriesList = computed(() => { return props.optionData.series }) -const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) +// const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) + +const allSeriesConfig = computed(() => { + return props.optionData.allSeriesConfig +}) watch(() => allSeriesConfig.value, (v) => { - seriesList.value.forEach((item: typeof seriesItem) => { - Object.assign(item, cloneDeep(v)) + seriesList.value.forEach((item: typeof seriesItem, index: number) => { + const themeColor = chartColorsSearch[defaultTheme] + item.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: themeColor[(3 + index) % themeColor.length] + }, + { + offset: 1, + color: 'rgba(0,0,0, 0)' + } + ]) + Object.assign(item, cloneDeep(v), { + areaStyle: { + color: cloneDeep(item.areaStyle.color) + } + }) }) }, { deep: true, diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/index.vue b/src/packages/components/Charts/Lines/LineGradientSingle/index.vue index 9cd0a29f..2e74b19f 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/index.vue +++ b/src/packages/components/Charts/Lines/LineGradientSingle/index.vue @@ -80,6 +80,19 @@ watch( watch( () => props.chartConfig.option.dataset, () => { + const themeColor = colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme] + props.chartConfig.option.series.forEach((value: any, index: number) => { + value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: themeColor[(3 + index) % themeColor.length] + }, + { + offset: 1, + color: 'rgba(0,0,0, 0)' + } + ]) + }) option.value = props.chartConfig.option } ) diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts index 84d26ae3..8160b522 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts @@ -55,7 +55,8 @@ export const option = { type: 'value' }, dataset: { ...dataJson }, - series: [seriesItem] + series: [seriesItem], + allSeriesConfig: seriesItem } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.vue b/src/packages/components/Charts/Lines/LineLinearSingle/config.vue index 6a7c46bd..bd78340e 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/config.vue +++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.vue @@ -178,7 +178,11 @@ const seriesList = computed(() => { return props.optionData.series }) -const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) +// const allSeriesConfig: Ref = ref(cloneDeep(seriesItem)) + +const allSeriesConfig = computed(() => { + return props.optionData.allSeriesConfig +}) watch(() => allSeriesConfig.value, (v) => { seriesList.value.forEach((item: typeof seriesItem) => { diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts new file mode 100644 index 00000000..7eaba032 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts @@ -0,0 +1,29 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { EngineeringConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + // // 图片路径 + // dataset: '', + // // 适应方式 + // fit: 'contain', + // // 圆角 + // borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + constructor() { + super(); + this.attr.w = 960 + this.attr.h = 540 + } + public key = EngineeringConfig.key + public chartConfig = cloneDeep(EngineeringConfig) + public option = cloneDeep(option) + public customData = cloneDeep({ + showInterval: false, + mapId: null + }) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue new file mode 100644 index 00000000..8f424483 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue new file mode 100644 index 00000000..74c0e984 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.ts b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.ts new file mode 100644 index 00000000..f536e9c2 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/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 EngineeringConfig: ConfigType = { + key: 'EngineeringConfig', + chartKey: 'VEngineeringConfig', + conKey: 'VCEngineeringConfig', + // VCD开头 + conDataKey: 'VCDEngineeringConfig', + title: '工程组态', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'EngineeringConfig.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue new file mode 100644 index 00000000..d71dd865 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts index b4c48450..4a7631f7 100644 --- a/src/packages/components/CustomComponents/CustomComponents/index.ts +++ b/src/packages/components/CustomComponents/CustomComponents/index.ts @@ -3,6 +3,7 @@ import { ComprehensivePUEConfig } from './ComprehensivePUE' import { RealTimeTrafficConfig } from './RealTimeTraffic' import { OverviewOfComputingNodesConfig } from './OverviewOfComputingNodes' import { GDMapConfig } from './GDMap' +import { EngineeringConfig } from './EngineeringConfig' import { MonitorRealTimeEventsConfig } from './MonitorRealTimeEvents' import { DashboardConfig } from './Dashboard' @@ -12,6 +13,7 @@ export default [ RealTimeTrafficConfig, OverviewOfComputingNodesConfig, GDMapConfig, + EngineeringConfig, MonitorRealTimeEventsConfig, DashboardConfig, ] diff --git a/src/packages/components/Decorates/Mores/TimeCommon1/index.vue b/src/packages/components/Decorates/Mores/TimeCommon1/index.vue index fe42b362..ebca8a3c 100644 --- a/src/packages/components/Decorates/Mores/TimeCommon1/index.vue +++ b/src/packages/components/Decorates/Mores/TimeCommon1/index.vue @@ -17,7 +17,7 @@ import { isPreview } from '@/utils/router' let date = ref(moment().format('yyyy-MM-DD')) -const weeks = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'] +const weeks = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] let time = ref(moment().format('HH:mm:ss ') + weeks[Number(moment().format('e'))]) let timer: any diff --git a/src/packages/components/Informations/Mores/Video/config.ts b/src/packages/components/Informations/Mores/Video/config.ts index a67bfb05..78059f09 100644 --- a/src/packages/components/Informations/Mores/Video/config.ts +++ b/src/packages/components/Informations/Mores/Video/config.ts @@ -6,7 +6,8 @@ import video from '@/assets/videos/earth.mp4' export const option = { // 视频路径 - dataset: video, + dataset: 'https://goviewpro.tos-cn-beijing.volces.com/charts-img-db/charts-img-db_id_17bwi76fzta800.mp4', + datasetCustom: '', // 视频列表 datasetList: [], // 循环播放 diff --git a/src/packages/components/Informations/Mores/Video/config.vue b/src/packages/components/Informations/Mores/Video/config.vue index 4d2e2a97..1bf730bd 100644 --- a/src/packages/components/Informations/Mores/Video/config.vue +++ b/src/packages/components/Informations/Mores/Video/config.vue @@ -6,9 +6,11 @@ - - - + + + + + diff --git a/src/packages/components/Informations/Mores/Video/index.vue b/src/packages/components/Informations/Mores/Video/index.vue index b184c83d..1dfe60ab 100644 --- a/src/packages/components/Informations/Mores/Video/index.vue +++ b/src/packages/components/Informations/Mores/Video/index.vue @@ -12,7 +12,7 @@ :muted="option.muted" :width="w" :height="h" - :src="option.dataset" + :src="option.datasetCustom || option.dataset" >