diff --git a/src/assets/images/chart/tasks/banner.png b/src/assets/images/chart/tasks/banner.png new file mode 100644 index 0000000..f1b14a7 Binary files /dev/null and b/src/assets/images/chart/tasks/banner.png differ diff --git a/src/assets/images/chart/tasks/bannerimg1.png b/src/assets/images/chart/tasks/bannerimg1.png new file mode 100644 index 0000000..1030f27 Binary files /dev/null and b/src/assets/images/chart/tasks/bannerimg1.png differ diff --git a/src/assets/images/chart/tasks/radiobg.png b/src/assets/images/chart/tasks/radiobg.png new file mode 100644 index 0000000..f9a8985 Binary files /dev/null and b/src/assets/images/chart/tasks/radiobg.png differ diff --git a/src/packages/components/Equipment/Equipment/Icons01/config.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons01/config.ts similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons01/config.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons01/config.ts diff --git a/src/packages/components/Equipment/Equipment/Icons01/config.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons01/config.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons01/config.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons01/config.vue diff --git a/src/packages/components/Equipment/Equipment/Icons01/index.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons01/index.ts similarity index 82% rename from src/packages/components/Equipment/Equipment/Icons01/index.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons01/index.ts index 70d36b6..0ca0a3d 100644 --- a/src/packages/components/Equipment/Equipment/Icons01/index.ts +++ b/src/packages/components/Equipment/Equipment/EquipmentIcons01/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const EquipmentIcons01Config: ConfigType = { - key: 'Icons01', - chartKey: 'VIcons01', - conKey: 'VCIcons01', + key: 'EquipmentIcons01', + chartKey: 'VEquipmentIcons01', + conKey: 'VCEquipmentIcons01', title: '图标-卫星', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Equipment/Equipment/Icons01/index.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons01/index.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons01/index.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons01/index.vue diff --git a/src/packages/components/Equipment/Equipment/Icons02/config.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons02/config.ts similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons02/config.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons02/config.ts diff --git a/src/packages/components/Equipment/Equipment/Icons02/config.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons02/config.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons02/config.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons02/config.vue diff --git a/src/packages/components/Equipment/Equipment/Icons02/index.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons02/index.ts similarity index 82% rename from src/packages/components/Equipment/Equipment/Icons02/index.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons02/index.ts index 5727f5c..35c0da3 100644 --- a/src/packages/components/Equipment/Equipment/Icons02/index.ts +++ b/src/packages/components/Equipment/Equipment/EquipmentIcons02/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const EquipmentIcons02Config: ConfigType = { - key: 'Icons02', - chartKey: 'VIcons02', - conKey: 'VCIcons02', + key: 'EquipmentIcons02', + chartKey: 'VEquipmentIcons02', + conKey: 'VCEquipmentIcons02', title: '图标-高空瞭望', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Equipment/Equipment/Icons02/index.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons02/index.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons02/index.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons02/index.vue diff --git a/src/packages/components/Equipment/Equipment/Icons03/config.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons03/config.ts similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons03/config.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons03/config.ts diff --git a/src/packages/components/Equipment/Equipment/Icons03/config.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons03/config.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons03/config.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons03/config.vue diff --git a/src/packages/components/Equipment/Equipment/Icons03/index.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons03/index.ts similarity index 82% rename from src/packages/components/Equipment/Equipment/Icons03/index.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons03/index.ts index 53e1643..f29dacc 100644 --- a/src/packages/components/Equipment/Equipment/Icons03/index.ts +++ b/src/packages/components/Equipment/Equipment/EquipmentIcons03/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const EquipmentIcons03Config: ConfigType = { - key: 'Icons03', - chartKey: 'VIcons03', - conKey: 'VCIcons03', + key: 'EquipmentIcons03', + chartKey: 'VEquipmentIcons03', + conKey: 'VCEquipmentIcons03', title: '图标-监控摄像头', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Equipment/Equipment/Icons03/index.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons03/index.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons03/index.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons03/index.vue diff --git a/src/packages/components/Equipment/Equipment/Icons04/config.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons04/config.ts similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons04/config.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons04/config.ts diff --git a/src/packages/components/Equipment/Equipment/Icons04/config.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons04/config.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons04/config.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons04/config.vue diff --git a/src/packages/components/Equipment/Equipment/Icons04/index.ts b/src/packages/components/Equipment/Equipment/EquipmentIcons04/index.ts similarity index 82% rename from src/packages/components/Equipment/Equipment/Icons04/index.ts rename to src/packages/components/Equipment/Equipment/EquipmentIcons04/index.ts index b02216c..62e55da 100644 --- a/src/packages/components/Equipment/Equipment/Icons04/index.ts +++ b/src/packages/components/Equipment/Equipment/EquipmentIcons04/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const EquipmentIcons04Config: ConfigType = { - key: 'Icons04', - chartKey: 'VIcons04', - conKey: 'VCIcons04', + key: 'EquipmentIcons04', + chartKey: 'VEquipmentIcons04', + conKey: 'VCEquipmentIcons04', title: '图标-无人机', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Equipment/Equipment/Icons04/index.vue b/src/packages/components/Equipment/Equipment/EquipmentIcons04/index.vue similarity index 100% rename from src/packages/components/Equipment/Equipment/Icons04/index.vue rename to src/packages/components/Equipment/Equipment/EquipmentIcons04/index.vue diff --git a/src/packages/components/Equipment/Equipment/index.ts b/src/packages/components/Equipment/Equipment/index.ts index 9910b18..6e7caa7 100644 --- a/src/packages/components/Equipment/Equipment/index.ts +++ b/src/packages/components/Equipment/Equipment/index.ts @@ -10,10 +10,10 @@ import { EquipmentTitlesbg07Config } from './TitlesBg07/index'; import { EquipmentTitlesbg08Config } from './TitlesBg08/index'; import { EquipmentHuoQingJianCeConfig } from './HuoQingJianCe/index'; import { EquipmentHuoQingXianSuoConfig } from './HuoQingXianSuo/index'; -import { EquipmentIcons01Config } from './Icons01/index'; -import { EquipmentIcons02Config } from './Icons02/index'; -import { EquipmentIcons03Config } from './Icons03/index'; -import { EquipmentIcons04Config } from './Icons04/index'; +import { EquipmentIcons01Config } from './EquipmentIcons01/index'; +import { EquipmentIcons02Config } from './EquipmentIcons02/index'; +import { EquipmentIcons03Config } from './EquipmentIcons03/index'; +import { EquipmentIcons04Config } from './EquipmentIcons04/index'; export default [ EquipmentContentbg01Config, diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/config.ts b/src/packages/components/Tasks/Tasks/TaskBanner/config.ts new file mode 100644 index 0000000..7878a86 --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskBanner/config.ts @@ -0,0 +1,53 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig, requestSqlConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { TaskBannerConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + colors: ['#457453','#00611A','#00CC13','#C9FFC7'], + titleColor: '#CBE6CD', + titleSize: 15, + desColor: '#FFFFFF', + desSize: 15, + bannerArr: [ + "/src/assets/images/chart/tasks/bannerimg1.png", + "/src/assets/images/chart/tasks/bannerimg1.png", + "/src/assets/images/chart/tasks/bannerimg1.png", + ], + dataset:[ + { + title: '预警描述', + desc: '费县马庄镇牛田村村委东北方向375.75° 1.197公里处发现火情' + }, + { + title: '水平角', + desc: '375.75°' + }, + { + title: '俯视角', + desc: '98.5°' + }, + { + title: '经纬度', + desc: '117.90911,3012349' + }, + { + title: '预警时间', + desc: '2024.12.24 13:08:07' + }, + { + title: '暸望塔', + desc: '费县瞭望塔' + } + ] +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = TaskBannerConfig.key + public attr = { ...chartInitConfig, w: 400, h: 527, zIndex: 1 } + public chartConfig = cloneDeep(TaskBannerConfig) + public option = cloneDeep(option) + public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, } + public filter = "return res.result;" +} diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/config.vue b/src/packages/components/Tasks/Tasks/TaskBanner/config.vue new file mode 100644 index 0000000..2d2a068 --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskBanner/config.vue @@ -0,0 +1,78 @@ + + + diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/index.ts b/src/packages/components/Tasks/Tasks/TaskBanner/index.ts new file mode 100644 index 0000000..bbb7cf3 --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskBanner/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const TaskBannerConfig: ConfigType = { + key: 'TaskBanner', + chartKey: 'VTaskBanner', + conKey: 'VCTaskBanner', + title: '轮播图', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.TASKS, + chartFrame: ChartFrameEnum.STATIC, + image: 'banner.png', +}; diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue new file mode 100644 index 0000000..ac1a60e --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/packages/components/Tasks/Tasks/TaskRadio/config.ts b/src/packages/components/Tasks/Tasks/TaskRadio/config.ts new file mode 100644 index 0000000..24d3ff8 --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskRadio/config.ts @@ -0,0 +1,26 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { TaskRadioConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + textColor: '#FFFFFF', + textSize: 14, + colors: ['#004714','#74C288'], + checkColor: '#00F535', + dataValue: 1, + dataset: [ + { label: '一般' ,value: '1' }, + { label: '较大' ,value: '2' }, + { label: '重大' ,value: '3' }, + { label: '特大' ,value: '4' } + ] +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = TaskRadioConfig.key + public attr = { ...chartInitConfig, w: 484, h: 40, zIndex: 1 } + public chartConfig = cloneDeep(TaskRadioConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Tasks/Tasks/TaskRadio/config.vue b/src/packages/components/Tasks/Tasks/TaskRadio/config.vue new file mode 100644 index 0000000..5f87fbf --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskRadio/config.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/packages/components/Tasks/Tasks/TaskRadio/index.ts b/src/packages/components/Tasks/Tasks/TaskRadio/index.ts new file mode 100644 index 0000000..b63be3e --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskRadio/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const TaskRadioConfig: ConfigType = { + key: 'TaskRadio', + chartKey: 'VTaskRadio', + conKey: 'VCTaskRadio', + title: '单选', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.TASKS, + chartFrame: ChartFrameEnum.STATIC, + image: 'radiobg.png', +}; diff --git a/src/packages/components/Tasks/Tasks/TaskRadio/index.vue b/src/packages/components/Tasks/Tasks/TaskRadio/index.vue new file mode 100644 index 0000000..2cba44d --- /dev/null +++ b/src/packages/components/Tasks/Tasks/TaskRadio/index.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/packages/components/Tasks/Tasks/index.ts b/src/packages/components/Tasks/Tasks/index.ts new file mode 100644 index 0000000..1014d69 --- /dev/null +++ b/src/packages/components/Tasks/Tasks/index.ts @@ -0,0 +1,7 @@ +import { TaskBannerConfig } from './TaskBanner/index'; +import { TaskRadioConfig } from './TaskRadio/index'; + +export default [ + TaskBannerConfig, + TaskRadioConfig +]; diff --git a/src/packages/components/Tasks/index.d.ts b/src/packages/components/Tasks/index.d.ts new file mode 100644 index 0000000..da2ba94 --- /dev/null +++ b/src/packages/components/Tasks/index.d.ts @@ -0,0 +1,7 @@ +export enum ChatCategoryEnum { + TITLE = 'Tasks', +} + +export enum ChatCategoryEnumName { + TITLE = '智处', +} \ No newline at end of file diff --git a/src/packages/components/Tasks/index.ts b/src/packages/components/Tasks/index.ts new file mode 100644 index 0000000..72b9e6a --- /dev/null +++ b/src/packages/components/Tasks/index.ts @@ -0,0 +1,3 @@ +import Tasks from './Tasks' + +export const TasksList = [...Tasks] diff --git a/src/packages/components/Units/Titles/TitlesBtnActive/config.ts b/src/packages/components/Units/Titles/TitlesBtnActive/config.ts index 23b181f..99f587f 100644 --- a/src/packages/components/Units/Titles/TitlesBtnActive/config.ts +++ b/src/packages/components/Units/Titles/TitlesBtnActive/config.ts @@ -6,7 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { boxId: 'linearGradientTitlesLeftBtnActive', - colors: ['#131415','#EA9607','#EBBE11','#EBBE10','#EBBA0F','#EBB90F'], + colors: ['#131415','#EA9607','#EBBE11','#EBBE10','#EBBA0F','#EBB90F','#EBBA0F'], } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Units/Titles/TitlesBtnActive/index.vue b/src/packages/components/Units/Titles/TitlesBtnActive/index.vue index 9e18bb4..615108d 100644 --- a/src/packages/components/Units/Titles/TitlesBtnActive/index.vue +++ b/src/packages/components/Units/Titles/TitlesBtnActive/index.vue @@ -55,7 +55,7 @@ > diff --git a/src/packages/components/Units/Titles/Icons01/config.ts b/src/packages/components/Units/Titles/UnitsIcons01/config.ts similarity index 100% rename from src/packages/components/Units/Titles/Icons01/config.ts rename to src/packages/components/Units/Titles/UnitsIcons01/config.ts diff --git a/src/packages/components/Units/Titles/Icons01/config.vue b/src/packages/components/Units/Titles/UnitsIcons01/config.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons01/config.vue rename to src/packages/components/Units/Titles/UnitsIcons01/config.vue diff --git a/src/packages/components/Units/Titles/Icons01/index.ts b/src/packages/components/Units/Titles/UnitsIcons01/index.ts similarity index 83% rename from src/packages/components/Units/Titles/Icons01/index.ts rename to src/packages/components/Units/Titles/UnitsIcons01/index.ts index e3794bb..8bb1bb9 100644 --- a/src/packages/components/Units/Titles/Icons01/index.ts +++ b/src/packages/components/Units/Titles/UnitsIcons01/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const Icons01Config: ConfigType = { - key: 'Icons01', - chartKey: 'VIcons01', - conKey: 'VCIcons01', + key: 'UnitsIcons01', + chartKey: 'VUnitsIcons01', + conKey: 'VCUnitsIcons01', title: '图标01', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Units/Titles/Icons01/index.vue b/src/packages/components/Units/Titles/UnitsIcons01/index.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons01/index.vue rename to src/packages/components/Units/Titles/UnitsIcons01/index.vue diff --git a/src/packages/components/Units/Titles/Icons02/config.ts b/src/packages/components/Units/Titles/UnitsIcons02/config.ts similarity index 100% rename from src/packages/components/Units/Titles/Icons02/config.ts rename to src/packages/components/Units/Titles/UnitsIcons02/config.ts diff --git a/src/packages/components/Units/Titles/Icons02/config.vue b/src/packages/components/Units/Titles/UnitsIcons02/config.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons02/config.vue rename to src/packages/components/Units/Titles/UnitsIcons02/config.vue diff --git a/src/packages/components/Units/Titles/Icons02/index.ts b/src/packages/components/Units/Titles/UnitsIcons02/index.ts similarity index 83% rename from src/packages/components/Units/Titles/Icons02/index.ts rename to src/packages/components/Units/Titles/UnitsIcons02/index.ts index 09b4138..6cd499f 100644 --- a/src/packages/components/Units/Titles/Icons02/index.ts +++ b/src/packages/components/Units/Titles/UnitsIcons02/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const Icons02Config: ConfigType = { - key: 'Icons02', - chartKey: 'VIcons02', - conKey: 'VCIcons02', + key: 'UnitsIcons02', + chartKey: 'VUnitsIcons02', + conKey: 'VCUnitsIcons02', title: '图标02', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Units/Titles/Icons02/index.vue b/src/packages/components/Units/Titles/UnitsIcons02/index.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons02/index.vue rename to src/packages/components/Units/Titles/UnitsIcons02/index.vue diff --git a/src/packages/components/Units/Titles/Icons03/config.ts b/src/packages/components/Units/Titles/UnitsIcons03/config.ts similarity index 100% rename from src/packages/components/Units/Titles/Icons03/config.ts rename to src/packages/components/Units/Titles/UnitsIcons03/config.ts diff --git a/src/packages/components/Units/Titles/Icons03/config.vue b/src/packages/components/Units/Titles/UnitsIcons03/config.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons03/config.vue rename to src/packages/components/Units/Titles/UnitsIcons03/config.vue diff --git a/src/packages/components/Units/Titles/Icons03/index.ts b/src/packages/components/Units/Titles/UnitsIcons03/index.ts similarity index 83% rename from src/packages/components/Units/Titles/Icons03/index.ts rename to src/packages/components/Units/Titles/UnitsIcons03/index.ts index 182d6e3..e6f8865 100644 --- a/src/packages/components/Units/Titles/Icons03/index.ts +++ b/src/packages/components/Units/Titles/UnitsIcons03/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const Icons03Config: ConfigType = { - key: 'Icons03', - chartKey: 'VIcons03', - conKey: 'VCIcons03', + key: 'UnitsIcons03', + chartKey: 'VUnitsIcons03', + conKey: 'VCUnitsIcons03', title: '图标03', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Units/Titles/Icons03/index.vue b/src/packages/components/Units/Titles/UnitsIcons03/index.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons03/index.vue rename to src/packages/components/Units/Titles/UnitsIcons03/index.vue diff --git a/src/packages/components/Units/Titles/Icons04/config.ts b/src/packages/components/Units/Titles/UnitsIcons04/config.ts similarity index 100% rename from src/packages/components/Units/Titles/Icons04/config.ts rename to src/packages/components/Units/Titles/UnitsIcons04/config.ts diff --git a/src/packages/components/Units/Titles/Icons04/config.vue b/src/packages/components/Units/Titles/UnitsIcons04/config.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons04/config.vue rename to src/packages/components/Units/Titles/UnitsIcons04/config.vue diff --git a/src/packages/components/Units/Titles/Icons04/index.ts b/src/packages/components/Units/Titles/UnitsIcons04/index.ts similarity index 83% rename from src/packages/components/Units/Titles/Icons04/index.ts rename to src/packages/components/Units/Titles/UnitsIcons04/index.ts index d86091e..f576d90 100644 --- a/src/packages/components/Units/Titles/Icons04/index.ts +++ b/src/packages/components/Units/Titles/UnitsIcons04/index.ts @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; export const Icons04Config: ConfigType = { - key: 'Icons04', - chartKey: 'VIcons04', - conKey: 'VCIcons04', + key: 'UnitsIcons04', + chartKey: 'VUnitsIcons04', + conKey: 'VCUnitsIcons04', title: '图标04', category: ChatCategoryEnum.TITLE, categoryName: ChatCategoryEnumName.TITLE, diff --git a/src/packages/components/Units/Titles/Icons04/index.vue b/src/packages/components/Units/Titles/UnitsIcons04/index.vue similarity index 100% rename from src/packages/components/Units/Titles/Icons04/index.vue rename to src/packages/components/Units/Titles/UnitsIcons04/index.vue diff --git a/src/packages/components/Units/Titles/index.ts b/src/packages/components/Units/Titles/index.ts index 54691a1..163b835 100644 --- a/src/packages/components/Units/Titles/index.ts +++ b/src/packages/components/Units/Titles/index.ts @@ -10,10 +10,10 @@ import { ContentTitle03Config } from './ContentTitle03/index'; import { ContentTitle04Config } from './ContentTitle04/index'; import { ContentTitle05Config } from './ContentTitle05/index'; import { LeftChartsConfig } from './LeftCharts/index'; -import { Icons01Config } from './Icons01/index'; -import { Icons02Config } from './Icons02/index'; -import { Icons03Config } from './Icons03/index'; -import { Icons04Config } from './Icons04/index'; +import { Icons01Config } from './UnitsIcons01/index'; +import { Icons02Config } from './UnitsIcons02/index'; +import { Icons03Config } from './UnitsIcons03/index'; +import { Icons04Config } from './UnitsIcons04/index'; import { SearchBoxConfig } from './SearchBox/index'; import { RightBox01Config } from './RightBox01/index'; import { RightBox01IconCommonConfig } from './RightBox01IconCommon/index'; diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index ffcf4d0..a93ece1 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -203,6 +203,7 @@ export enum PackagesCategoryEnum { UNITS = 'Units', ZHIGAN = 'Zhigan', EQUIPMENT = 'Equipment', + TASKS = 'Tasks', } // 包分类名称 @@ -217,7 +218,8 @@ export enum PackagesCategoryName { CUSTOM = '预警信息', UNITS = '组件', ZHIGAN = '智感', - EQUIPMENT = '设备' + EQUIPMENT = '设备', + TASKS = '任务' } // 获取组件 @@ -239,4 +241,5 @@ export type PackagesType = { [PackagesCategoryEnum.UNITS]: ConfigType[]; [PackagesCategoryEnum.ZHIGAN]: ConfigType[]; [PackagesCategoryEnum.EQUIPMENT]: ConfigType[]; + [PackagesCategoryEnum.TASKS]: ConfigType[]; }; diff --git a/src/packages/index.ts b/src/packages/index.ts index 926a9c9..b990aed 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -8,6 +8,7 @@ import { DiyList } from '@/packages/components/Diy/index'; import { UnitsList } from '@/packages/components/Units/index'; import { ZhiganList } from '@/packages/components/Zhigan/index'; import { EquipmentList } from '@/packages/components/Equipment/index'; +import { TasksList } from '@/packages/components/Tasks/index'; import { PackagesCategoryEnum, @@ -49,6 +50,7 @@ export let packagesList: PackagesType = { [PackagesCategoryEnum.UNITS]: UnitsList, [PackagesCategoryEnum.ZHIGAN]: ZhiganList, [PackagesCategoryEnum.EQUIPMENT]: EquipmentList, + [PackagesCategoryEnum.TASKS]: TasksList, }; // 组件缓存, 可以大幅度提升组件加载速度 diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts index a249f96..d549e66 100644 --- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts +++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts @@ -60,9 +60,9 @@ const packagesListObj = { icon: renderIcon(AirPlaneOutlineIcon), label: PackagesCategoryName.ZHIGAN }, - [PackagesCategoryEnum.MAPICONS]: { + [PackagesCategoryEnum.TASKS]: { icon: renderIcon(AirPlaneOutlineIcon), - label: PackagesCategoryName.MAPICONS + label: PackagesCategoryName.TASKS }, [PackagesCategoryEnum.EQUIPMENT]: { icon: renderIcon(AirPlaneOutlineIcon),