diff --git a/src/assets/images/chart/units/leftchartsbg.png b/src/assets/images/chart/units/leftchartsbg.png new file mode 100644 index 0000000..d3e273e Binary files /dev/null and b/src/assets/images/chart/units/leftchartsbg.png differ diff --git a/src/assets/images/chart/units/searchBtn.png b/src/assets/images/chart/units/searchBtn.png new file mode 100644 index 0000000..5d67b85 Binary files /dev/null and b/src/assets/images/chart/units/searchBtn.png differ diff --git a/src/assets/images/chart/units/texttitle02bg.png b/src/assets/images/chart/units/texttitle02bg.png index 187e02e..5525d90 100644 Binary files a/src/assets/images/chart/units/texttitle02bg.png and b/src/assets/images/chart/units/texttitle02bg.png differ diff --git a/src/assets/images/chart/units/texttitle03bg.png b/src/assets/images/chart/units/texttitle03bg.png new file mode 100644 index 0000000..b669f53 Binary files /dev/null and b/src/assets/images/chart/units/texttitle03bg.png differ diff --git a/src/assets/images/chart/units/texttitle04bg.png b/src/assets/images/chart/units/texttitle04bg.png new file mode 100644 index 0000000..a6459d7 Binary files /dev/null and b/src/assets/images/chart/units/texttitle04bg.png differ diff --git a/src/assets/images/chart/units/texttitle05bg.png b/src/assets/images/chart/units/texttitle05bg.png new file mode 100644 index 0000000..e97f977 Binary files /dev/null and b/src/assets/images/chart/units/texttitle05bg.png differ diff --git a/src/packages/components/Decorates/Titles/Titles01/config.ts b/src/packages/components/Decorates/Titles/Titles01/config.ts index d586832..38a6c16 100644 --- a/src/packages/components/Decorates/Titles/Titles01/config.ts +++ b/src/packages/components/Decorates/Titles/Titles01/config.ts @@ -10,7 +10,7 @@ export const option = { borderTitleHeight: 98, borderTitleSize: 18, borderTitleColor: '#fff', - colors: ['#608561', '#374536'], + colors: ['#608561','#EEEEEE','#EAEAEA','#DCDCDC','#D8D8D8','#374536','#98B394','#DCFFD9','#687B66','#A1E6AC','#3D6644','#122115','#6C8069','#4E5C4C','#FFE6B3'], backgroundColor: '#00000000' } diff --git a/src/packages/components/Decorates/Titles/Titles01/index.vue b/src/packages/components/Decorates/Titles/Titles01/index.vue index 4ad6dd5..81da8b3 100644 --- a/src/packages/components/Decorates/Titles/Titles01/index.vue +++ b/src/packages/components/Decorates/Titles/Titles01/index.vue @@ -5,39 +5,39 @@ 大标题@2x - - - + + + - - - - + + + + - - + + - - - + + + - - + + - - + + - - - + + + @@ -54,9 +54,9 @@ - - - + + + @@ -110,34 +110,34 @@ - + - - + + - - - + + + - - + + - + - + @@ -146,11 +146,11 @@ - + - + diff --git a/src/packages/components/Units/Titles/ContentTitle/config.ts b/src/packages/components/Units/Titles/ContentTitle/config.ts index 77e6f15..4bdb961 100644 --- a/src/packages/components/Units/Titles/ContentTitle/config.ts +++ b/src/packages/components/Units/Titles/ContentTitle/config.ts @@ -6,7 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { boxId: 'linearGradientContentTitle', - colors: ['#08251E','#00A374','#11B472','#00FF8C','#00F4B6','#00FF77','#00BF6B','#00673F','#00683F','#72A18A','#1CC370'], + colors: ['#08251E','#00A374','#11B472','#00FF8C','#00F4B6','#00FF77','#00BF6B','#00673F','#00683F','#72A18A','#1CC370','#EBBE10','#4FE985'], } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Units/Titles/ContentTitle/index.vue b/src/packages/components/Units/Titles/ContentTitle/index.vue index 9d2a220..7953594 100644 --- a/src/packages/components/Units/Titles/ContentTitle/index.vue +++ b/src/packages/components/Units/Titles/ContentTitle/index.vue @@ -29,7 +29,7 @@ - + @@ -39,7 +39,10 @@ - + @@ -49,7 +52,7 @@ - + @@ -60,8 +63,8 @@ - - + + diff --git a/src/packages/components/Units/Titles/ContentTitle01/index.vue b/src/packages/components/Units/Titles/ContentTitle01/index.vue index 9d6e5a3..7e47d85 100644 --- a/src/packages/components/Units/Titles/ContentTitle01/index.vue +++ b/src/packages/components/Units/Titles/ContentTitle01/index.vue @@ -1,6 +1,6 @@ diff --git a/src/packages/components/Units/Titles/ContentTitle02/config.ts b/src/packages/components/Units/Titles/ContentTitle02/config.ts index f8e6db6..f801784 100644 --- a/src/packages/components/Units/Titles/ContentTitle02/config.ts +++ b/src/packages/components/Units/Titles/ContentTitle02/config.ts @@ -6,12 +6,12 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { boxId: 'linearGradientContentTitle02', - colors: [], + colors: ['#1F6B55','#0A392A','#396754','#457453'], } export default class Config extends PublicConfigClass implements CreateComponentType { public key = ContentTitle02Config.key - public attr = { ...chartInitConfig, w: 401, h: 40, zIndex: 1 } + public attr = { ...chartInitConfig, w: 172, h: 71, zIndex: 1 } public chartConfig = cloneDeep(ContentTitle02Config) public option = cloneDeep(option) } diff --git a/src/packages/components/Units/Titles/ContentTitle02/config.vue b/src/packages/components/Units/Titles/ContentTitle02/config.vue index 158afeb..c5f2d98 100644 --- a/src/packages/components/Units/Titles/ContentTitle02/config.vue +++ b/src/packages/components/Units/Titles/ContentTitle02/config.vue @@ -1,5 +1,38 @@ diff --git a/src/packages/components/Units/Titles/ContentTitle03/index.ts b/src/packages/components/Units/Titles/ContentTitle03/index.ts new file mode 100644 index 0000000..040c33f --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle03/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitle03Config: ConfigType = { + key: 'ContentTitle03', + chartKey: 'VContentTitle03', + conKey: 'VCContentTitle03', + title: '模块标题-03', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitle03bg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle03/index.vue b/src/packages/components/Units/Titles/ContentTitle03/index.vue new file mode 100644 index 0000000..0aa0732 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle03/index.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/packages/components/Units/Titles/ContentTitle04/config.ts b/src/packages/components/Units/Titles/ContentTitle04/config.ts new file mode 100644 index 0000000..2768b1c --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle04/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentTitle04Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentTitle04', + colors: ['#067847','#0EB07D','#FFB111','#FFB217','#457453','#0CB170'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentTitle04Config.key + public attr = { ...chartInitConfig, w: 176, h: 60, zIndex: 1 } + public chartConfig = cloneDeep(ContentTitle04Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentTitle04/config.vue b/src/packages/components/Units/Titles/ContentTitle04/config.vue new file mode 100644 index 0000000..c5f2d98 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle04/config.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentTitle04/index.ts b/src/packages/components/Units/Titles/ContentTitle04/index.ts new file mode 100644 index 0000000..f9aaf3c --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle04/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitle04Config: ConfigType = { + key: 'ContentTitle04', + chartKey: 'VContentTitle04', + conKey: 'VCContentTitle04', + title: '模块标题-04', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitle04bg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle04/index.vue b/src/packages/components/Units/Titles/ContentTitle04/index.vue new file mode 100644 index 0000000..83f618b --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle04/index.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/packages/components/Units/Titles/ContentTitle05/config.ts b/src/packages/components/Units/Titles/ContentTitle05/config.ts new file mode 100644 index 0000000..9617d86 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle05/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentTitle05Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentTitle05', + colors: ['#583700','#FF9538','#E3AC5C','#C2742F','#F5A500','#0CB170'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentTitle05Config.key + public attr = { ...chartInitConfig, w: 81, h: 23, zIndex: 1 } + public chartConfig = cloneDeep(ContentTitle05Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentTitle05/config.vue b/src/packages/components/Units/Titles/ContentTitle05/config.vue new file mode 100644 index 0000000..c5f2d98 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle05/config.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentTitle05/index.ts b/src/packages/components/Units/Titles/ContentTitle05/index.ts new file mode 100644 index 0000000..a0fabe6 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle05/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitle05Config: ConfigType = { + key: 'ContentTitle05', + chartKey: 'VContentTitle05', + conKey: 'VCContentTitle05', + title: '模块标题-05', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitle05bg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle05/index.vue b/src/packages/components/Units/Titles/ContentTitle05/index.vue new file mode 100644 index 0000000..b04117d --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle05/index.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/packages/components/Units/Titles/LeftCharts/config.ts b/src/packages/components/Units/Titles/LeftCharts/config.ts new file mode 100644 index 0000000..5bd9423 --- /dev/null +++ b/src/packages/components/Units/Titles/LeftCharts/config.ts @@ -0,0 +1,65 @@ +import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' +import { LeftChartsConfig } from './index' +import { CreateComponentType } from '@/packages/index.d' +import { graphic } from 'echarts/core' +import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index' +import cloneDeep from 'lodash/cloneDeep' +import dataJson from './data.json' + +export const includes = ['xAxis', 'yAxis', 'grid'] + +const option = { + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + type: 'line' + } + }, + xAxis: { + show: true, + type: 'category' + }, + yAxis: { + show: true, + type: 'value' + }, + dataset: { ...dataJson }, + series: [ + { + type: 'line', + smooth: true, + symbolSize: 10, //设定实心点的大小 + label: { + show: true, + position: 'top', + color: '#fff', + fontSize: 12 + }, + lineStyle: { + width: 3, + type: 'solid' + }, + areaStyle: { + opacity: 0.8, + color: new graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: chartColorsSearch[defaultTheme][3] + }, + { + offset: 1, + color: 'rgba(0,0,0,0)' + } + ]) + } + } + ] +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key: string = LeftChartsConfig.key + public chartConfig = cloneDeep(LeftChartsConfig) + // 图表配置项 + public option = echartOptionProfixHandle(option, includes) +} diff --git a/src/packages/components/Units/Titles/LeftCharts/config.vue b/src/packages/components/Units/Titles/LeftCharts/config.vue new file mode 100644 index 0000000..3b33266 --- /dev/null +++ b/src/packages/components/Units/Titles/LeftCharts/config.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/packages/components/Units/Titles/LeftCharts/data.json b/src/packages/components/Units/Titles/LeftCharts/data.json new file mode 100644 index 0000000..a28d4ee --- /dev/null +++ b/src/packages/components/Units/Titles/LeftCharts/data.json @@ -0,0 +1,40 @@ +{ + "dimensions": ["product", "data1", "data2"], + "source": [ + { + "product": "Mon", + "data1": 120, + "data2": 130 + }, + { + "product": "Tue", + "data1": 200, + "data2": 130 + }, + { + "product": "Wed", + "data1": 150, + "data2": 312 + }, + { + "product": "Thu", + "data1": 80, + "data2": 268 + }, + { + "product": "Fri", + "data1": 70, + "data2": 155 + }, + { + "product": "Sat", + "data1": 110, + "data2": 117 + }, + { + "product": "Sun", + "data1": 130, + "data2": 160 + } + ] +} diff --git a/src/packages/components/Units/Titles/LeftCharts/index.ts b/src/packages/components/Units/Titles/LeftCharts/index.ts new file mode 100644 index 0000000..2dff90c --- /dev/null +++ b/src/packages/components/Units/Titles/LeftCharts/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const LeftChartsConfig: ConfigType = { + key: 'LeftCharts', + chartKey: 'VLeftCharts', + conKey: 'VCLeftCharts', + title: '单折线渐变图', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'leftchartsbg.png' +} diff --git a/src/packages/components/Units/Titles/LeftCharts/index.vue b/src/packages/components/Units/Titles/LeftCharts/index.vue new file mode 100644 index 0000000..ea67334 --- /dev/null +++ b/src/packages/components/Units/Titles/LeftCharts/index.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/packages/components/Units/Titles/SearchBox/config.ts b/src/packages/components/Units/Titles/SearchBox/config.ts new file mode 100644 index 0000000..8b6b165 --- /dev/null +++ b/src/packages/components/Units/Titles/SearchBox/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { SearchBoxConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientSearchBox', + colors: ['#00AF4A','#00751E','#344534','#647B64','#04691A','#0EF840','#07261E','#4A5C4A','#FFE4AC','#84DC9B'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = SearchBoxConfig.key + public attr = { ...chartInitConfig, w: 205, h: 53, zIndex: 1 } + public chartConfig = cloneDeep(SearchBoxConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/SearchBox/config.vue b/src/packages/components/Units/Titles/SearchBox/config.vue new file mode 100644 index 0000000..c5f2d98 --- /dev/null +++ b/src/packages/components/Units/Titles/SearchBox/config.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/packages/components/Units/Titles/SearchBox/index.ts b/src/packages/components/Units/Titles/SearchBox/index.ts new file mode 100644 index 0000000..4d154f4 --- /dev/null +++ b/src/packages/components/Units/Titles/SearchBox/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const SearchBoxConfig: ConfigType = { + key: 'SearchBox', + chartKey: 'VSearchBox', + conKey: 'VCSearchBox', + title: '全局搜索', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'searchBtn.png', +}; diff --git a/src/packages/components/Units/Titles/SearchBox/index.vue b/src/packages/components/Units/Titles/SearchBox/index.vue new file mode 100644 index 0000000..6908120 --- /dev/null +++ b/src/packages/components/Units/Titles/SearchBox/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/packages/components/Units/Titles/index.ts b/src/packages/components/Units/Titles/index.ts index e727ef4..093422d 100644 --- a/src/packages/components/Units/Titles/index.ts +++ b/src/packages/components/Units/Titles/index.ts @@ -5,7 +5,12 @@ import { TitlesBtnActiveConfig } from './TitlesBtnActive/index'; import { ContentBackgroundConfig } from './ContentBackground/index'; import { ContentTitleConfig } from './ContentTitle/index'; import { ContentTitle01Config } from './ContentTitle01/index'; -// import { ContentTitle02Config } from './ContentTitle02/index'; +import { ContentTitle02Config } from './ContentTitle02/index'; +import { ContentTitle03Config } from './ContentTitle03/index'; +import { ContentTitle04Config } from './ContentTitle04/index'; +import { ContentTitle05Config } from './ContentTitle05/index'; +import { LeftChartsConfig } from './LeftCharts/index'; +import { SearchBoxConfig } from './SearchBox/index'; export default [ TopTitlesConfig, @@ -15,5 +20,10 @@ export default [ ContentBackgroundConfig, ContentTitleConfig, ContentTitle01Config, - // ContentTitle02Config + ContentTitle02Config, + ContentTitle03Config, + ContentTitle04Config, + ContentTitle05Config, + LeftChartsConfig, + SearchBoxConfig ];