From 124240e5529602637fdfa26cab66adcc678cb8bb Mon Sep 17 00:00:00 2001 From: huanghao1412 Date: Fri, 5 Jul 2024 17:28:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E7=94=B5?= =?UTF-8?q?=E9=87=8F=20=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/path/business.api.ts | 1 - .../customponents/ElectricityConsumption.png | Bin 0 -> 14198 bytes .../components/Charts/Maps/MapBase/config.ts | 70 ++-- .../components/Charts/Maps/MapBase/config.vue | 80 ++-- .../Charts/Maps/MapBase/configData.vue | 14 + .../components/Charts/Maps/MapBase/index.ts | 1 + .../components/Charts/Maps/MapBase/index.vue | 17 +- src/packages/components/Charts/Maps/index.ts | 2 +- src/packages/components/Charts/index.ts | 4 +- .../ElectricityConsumption/config.ts | 31 ++ .../ElectricityConsumption/config.vue | 23 ++ .../ElectricityConsumption/configData.vue | 37 ++ .../ElectricityConsumption/index.ts | 16 + .../ElectricityConsumption/index.vue | 381 ++++++++++++++++++ .../CustomComponents/index.ts | 2 + src/plugins/naive.ts | 2 + 16 files changed, 605 insertions(+), 76 deletions(-) create mode 100644 src/assets/images/chart/customponents/ElectricityConsumption.png create mode 100644 src/packages/components/Charts/Maps/MapBase/configData.vue create mode 100644 src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.ts create mode 100644 src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.vue create mode 100644 src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue create mode 100644 src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.ts create mode 100644 src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue diff --git a/src/api/path/business.api.ts b/src/api/path/business.api.ts index c00d35a0..9ccfaf0d 100644 --- a/src/api/path/business.api.ts +++ b/src/api/path/business.api.ts @@ -51,7 +51,6 @@ export const publicInterface = async (paramType:string, interfaceType:string, pa access_token = await getToken() as string } else { - console.log(import.meta.env, 777) access_token = import.meta.env.VITE_DEV_TOKEN } const res = await http(RequestHttpEnum.POST)(paramType, { diff --git a/src/assets/images/chart/customponents/ElectricityConsumption.png b/src/assets/images/chart/customponents/ElectricityConsumption.png new file mode 100644 index 0000000000000000000000000000000000000000..b7ed1b4b2c4d47b06856da10da6c943d0b020cc0 GIT binary patch literal 14198 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 UP3KNPaDza~@*0p*xi=sF2YX>@FaQ7m literal 0 HcmV?d00001 diff --git a/src/packages/components/Charts/Maps/MapBase/config.ts b/src/packages/components/Charts/Maps/MapBase/config.ts index d9844001..a2a81434 100644 --- a/src/packages/components/Charts/Maps/MapBase/config.ts +++ b/src/packages/components/Charts/Maps/MapBase/config.ts @@ -53,13 +53,13 @@ export const option = { type: 'effectScatter', coordinateSystem: 'geo', symbolSize: 4, - legendHoverLink: true, + legendHoverLink: false, showEffectOn: 'render', - rippleEffect: { - scale: 6, - color: '#FFFFFF', - brushType: 'fill' - }, + // rippleEffect: { + // scale: 6, + // color: '#FFFFFF', + // brushType: 'fill' + // }, tooltip: { show: true, backgroundColor: 'rgba(0,0,0,.6)', @@ -78,8 +78,9 @@ export const option = { textShadowBlur: 10, textBorderWidth: 0, color: '#FFFFFF', - show: true + show: false }, + symbol: 'none', itemStyle: { color: '#FFFFFF', borderColor: 'rgba(225,255,255,2)', @@ -110,7 +111,7 @@ export const option = { } }, label: { - show: false, + show: true, color: '#FFFFFF', fontSize: 12 }, @@ -121,13 +122,13 @@ export const option = { fontSize: 12 }, itemStyle: { - areaColor: '#389BB7', - shadowColor: '#389BB7', + areaColor: '#4196FF', + shadowColor: '#1C58EE54', borderWidth: 1 } }, itemStyle: { - borderColor: '#93EBF8', + borderColor: '#00DEFFFF', borderWidth: 1, areaColor: { type: 'radial', @@ -152,32 +153,39 @@ export const option = { shadowBlur: 10 } }, - { - type: 'lines', - zlevel: 2, - effect: { - show: true, - period: 4, //箭头指向速度，值越小速度越快 - trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重 - symbol: 'arrow', //箭头图标 - symbolSize: 7 //图标大小 - }, - lineStyle: { - normal: { - color: '#4fb6d2', - width: 1, //线条宽度 - opacity: 0.1, //尾迹线条透明度 - curveness: 0.3 //尾迹线条曲直度 - } - }, - data: [] - } + // { + // type: 'lines', + // zlevel: 2, + // effect: { + // show: true, + // period: 4, //箭头指向速度，值越小速度越快 + // trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重 + // symbol: 'arrow', //箭头图标 + // symbolSize: 7 //图标大小 + // }, + // lineStyle: { + // normal: { + // color: '#4fb6d2', + // width: 1, //线条宽度 + // opacity: 0.1, //尾迹线条透明度 + // curveness: 0.3 //尾迹线条曲直度 + // } + // }, + // data: [] + // } ] } + +export const customData = { + // k: 名字 v: 数值 + dataMap: '{}' +} + export const MapDefaultConfig = { ...option } export default class Config extends PublicConfigClass implements CreateComponentType { public key: string = MapBaseConfig.key public attr = { ...chartInitConfig, w: 750, h: 800, zIndex: -1 } public chartConfig = cloneDeep(MapBaseConfig) public option = echartOptionProfixHandle(option, includes) + public customData = cloneDeep(customData) } diff --git a/src/packages/components/Charts/Maps/MapBase/config.vue b/src/packages/components/Charts/Maps/MapBase/config.vue index e0363d8f..98f57d84 100644 --- a/src/packages/components/Charts/Maps/MapBase/config.vue +++ b/src/packages/components/Charts/Maps/MapBase/config.vue @@ -81,7 +81,7 @@ - + @@ -194,47 +194,47 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/packages/components/Charts/Maps/MapBase/configData.vue b/src/packages/components/Charts/Maps/MapBase/configData.vue new file mode 100644 index 00000000..a864fa40 --- /dev/null +++ b/src/packages/components/Charts/Maps/MapBase/configData.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/packages/components/Charts/Maps/MapBase/index.ts b/src/packages/components/Charts/Maps/MapBase/index.ts index 4010cf38..42dc7a3d 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.ts +++ b/src/packages/components/Charts/Maps/MapBase/index.ts @@ -5,6 +5,7 @@ export const MapBaseConfig: ConfigType = { key: 'MapBase', chartKey: 'VMapBase', conKey: 'VCMapBase', + conDataKey: 'VCDMapBase', title: '地图(可选省份)', category: ChatCategoryEnum.MAP, categoryName: ChatCategoryEnumName.MAP, diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index 95feda3c..b8134741 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -28,7 +28,7 @@ + + \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue new file mode 100644 index 00000000..38941c2f --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.ts b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.ts new file mode 100644 index 00000000..09a4cf3a --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/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 ElectricityConsumptionConfig: ConfigType = { + key: 'ElectricityConsumption', + chartKey: 'VElectricityConsumption', + conKey: 'VCElectricityConsumption', + // VCD开头 + conDataKey: 'VCDElectricityConsumption', + title: '用电量', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'ElectricityConsumption.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue new file mode 100644 index 00000000..c012b800 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue @@ -0,0 +1,381 @@ + + + + + \ 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 7a284e4a..cdf24759 100644 --- a/src/packages/components/CustomComponents/CustomComponents/index.ts +++ b/src/packages/components/CustomComponents/CustomComponents/index.ts @@ -13,6 +13,7 @@ import { VideoListConfig } from './VideoList' import { AirConditioningTableConfig } from './AirConditioningTable' import { SiteStatisticsConfig } from './SiteStatistics' import { PowerCapacityConfig } from './PowerCapacity' +import { ElectricityConsumptionConfig } from './ElectricityConsumption' export default [ // Theme1Config, @@ -30,4 +31,5 @@ export default [ AirConditioningTableConfig, SiteStatisticsConfig, PowerCapacityConfig, + ElectricityConsumptionConfig, ] diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts index 0d004df7..b72ba36e 100644 --- a/src/plugins/naive.ts +++ b/src/plugins/naive.ts @@ -68,6 +68,7 @@ import { NSelect, NSlider, NRadioGroup, + NRadioButton, NRadio, NSteps, NStep, @@ -172,6 +173,7 @@ const naive = create({ NSlider, NSelect, NRadioGroup, + NRadioButton, NRadio, NSteps, NStep,