diff --git a/src/assets/images/chart/zhiku/component/HuoQingDetailModalLeft.png b/src/assets/images/chart/zhiku/component/HuoQingDetailModalLeft.png new file mode 100644 index 0000000..90dc295 Binary files /dev/null and b/src/assets/images/chart/zhiku/component/HuoQingDetailModalLeft.png differ diff --git a/src/assets/images/chart/zhiku/component/HuoQingDetailModalRight.png b/src/assets/images/chart/zhiku/component/HuoQingDetailModalRight.png new file mode 100644 index 0000000..66e9cdc Binary files /dev/null and b/src/assets/images/chart/zhiku/component/HuoQingDetailModalRight.png differ diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.ts deleted file mode 100644 index 6e5e536..0000000 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.ts +++ /dev/null @@ -1,49 +0,0 @@ -import cloneDeep from 'lodash/cloneDeep' -import { PublicConfigClass } from '@/packages/public' -import { CreateComponentType } from '@/packages/index.d' -import { chartInitConfig } from '@/settings/designSetting' -import { HuoQingDetailModalConfig } from './index' - -export const option = { - dataStyle:{ - onlyShowLeftFrame: true, - mouseListener: true, - - mask: false, - maskClickClose: false, - maskColor: '#FFFFFF00', - maskFrameX: 0, - maskFrameY: 0, - maskFrameW: 0, - maskFrameH: 0, - maskFrameColor: '#FFFFFF00', - - // 总矩形边框颜色 - allUseStrokeColor: '#435A4E', - // 总矩形填充颜色 - allUseFillColor: '#021E17', - - // 左侧矩形边框颜色 - leftStrokeColor1: '#435A4E', - leftStrokeColor2: '#7CA791', - // 左侧矩形填充颜色 - leftFillColor: '#161A1A', - // 左侧矩形左上、右下修饰边角颜色 - leftStopColor1: '#25673D', - leftStopColor2: '#3E674A', - leftStopColor3: '#8BE8A3', - - // 左上、左下修饰矩形颜色 - topLeftFillColor: '#4D815D', - bottomLeftFillColor: '#FFE4AC', - // 左上、修饰圆形颜色 - topLeftEllipseColor: '#4A5C4A', - }, -} - -export default class Config extends PublicConfigClass implements CreateComponentType { - public key = HuoQingDetailModalConfig.key - public attr = { ...chartInitConfig, w: 417, h: 891, zIndex: -1 } - public chartConfig = cloneDeep(HuoQingDetailModalConfig) - public option = cloneDeep(option) -} diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.vue deleted file mode 100644 index 8f69d65..0000000 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/config.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.vue deleted file mode 100644 index 5c5da49..0000000 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.vue +++ /dev/null @@ -1,311 +0,0 @@ - - - - - diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/svg/frame.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/svg/frame.vue deleted file mode 100644 index 505142e..0000000 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/svg/frame.vue +++ /dev/null @@ -1,596 +0,0 @@ - - - diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.ts new file mode 100644 index 0000000..20b4aaa --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.ts @@ -0,0 +1,18 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { HuoQingDetailModalLeftConfig } from './index' + +export const option = { + dataStyle:{ + mouseListener: true, + }, +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = HuoQingDetailModalLeftConfig.key + public attr = { ...chartInitConfig, w: 394, h: 891, zIndex: -1 } + public chartConfig = cloneDeep(HuoQingDetailModalLeftConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.vue new file mode 100644 index 0000000..f675030 --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/config.vue @@ -0,0 +1,26 @@ + + + diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.ts similarity index 62% rename from src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.ts rename to src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.ts index b955aa0..5a761a8 100644 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModal/index.ts +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.ts @@ -1,11 +1,11 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' -export const HuoQingDetailModalConfig: ConfigType = { - key: 'HuoQingDetailModal', - chartKey: 'VHuoQingDetailModal', - conKey: 'VCHuoQingDetailModal', - title: '火情详情弹窗框架', +export const HuoQingDetailModalLeftConfig: ConfigType = { + key: 'HuoQingDetailModalLeft', + chartKey: 'VHuoQingDetailModalLeft', + conKey: 'VCHuoQingDetailModalLeft', + title: '火情详情弹窗框架(左)', category: ChatCategoryEnum.ZHIKU, categoryName: ChatCategoryEnumName.ZHIKU, package: PackagesCategoryEnum.ZHIKU, diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.vue new file mode 100644 index 0000000..4bd2524 --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalLeft/index.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.ts new file mode 100644 index 0000000..5007014 --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.ts @@ -0,0 +1,15 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { HuoQingDetailModalRightConfig } from './index' + +export const option = { +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = HuoQingDetailModalRightConfig.key + public attr = { ...chartInitConfig, w: 935, h: 866, zIndex: -1 } + public chartConfig = cloneDeep(HuoQingDetailModalRightConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.vue new file mode 100644 index 0000000..15e0a42 --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/config.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.ts new file mode 100644 index 0000000..8ac7e61 --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const HuoQingDetailModalRightConfig: ConfigType = { + key: 'HuoQingDetailModalRight', + chartKey: 'VHuoQingDetailModalRight', + conKey: 'VCHuoQingDetailModalRight', + title: '火情详情弹窗框架(右)', + category: ChatCategoryEnum.ZHIKU, + categoryName: ChatCategoryEnumName.ZHIKU, + package: PackagesCategoryEnum.ZHIKU, + chartFrame: ChartFrameEnum.STATIC, + image: 'HuoQingDetailModal.png' +} diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.vue b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.vue new file mode 100644 index 0000000..893d23b --- /dev/null +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailModalRight/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailTimeLine/data.json b/src/packages/components/Zhiku/Zhiku/HuoQingDetailTimeLine/data.json index 622c399..c71dae3 100644 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailTimeLine/data.json +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailTimeLine/data.json @@ -6,12 +6,7 @@ "content": "临沂市,山东省辖地级市,位于山东省东南部,地跨北纬34°22′~36°13′,东经117°24′~119°11′之间,属温带季风气候,四季分明,雨热同季,地势自北而南有沂山、蒙山、尼山3条主要山脉延伸,控制着沂沭河上游及其支流的流向,向南构成的扇状临郯苍平原是山东三平原之一。", "time": "2025-02-11 01:27:14", "imageurl": [ "@/assets/images/chart/zhigan/component/ModalCarouselPng01.png", "@/assets/images/chart/zhigan/component/ModalCarouselPng02.png" ], - "videos": [ - { - "title": "XZD153狼窝沟西南", - "videourl": "74b95e6575d741489b9a9061bb646467", - "manufacturer": "海康" - }, + "videos": [ { "title":"费县马庄镇陈家鱼后村南斜坡后村", "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv", @@ -34,12 +29,7 @@ "type": "success", "content": "", "time": "2025-02-11 01:27:15", - "imageurl": "@/assets/images/chart/zhigan/component/ModalCarouselPng03.png", - "videos": { - "title": "XZD153狼窝沟西南", - "videourl": "74b95e6575d741489b9a9061bb646467", - "manufacturer": "海康" - } + "imageurl": "@/assets/images/chart/zhigan/component/ModalCarouselPng03.png" }, { "title":"临沂市", diff --git a/src/packages/components/Zhiku/Zhiku/index.ts b/src/packages/components/Zhiku/Zhiku/index.ts index 0c5f3ca..46f62f6 100644 --- a/src/packages/components/Zhiku/Zhiku/index.ts +++ b/src/packages/components/Zhiku/Zhiku/index.ts @@ -2,7 +2,8 @@ import { HuoQingButtonConfig } from "./HuoQingButton/index"; import { HuoQingListConfig } from "./HuoQingList/index"; -import { HuoQingDetailModalConfig } from "./HuoQingDetailModal/index"; +import { HuoQingDetailModalLeftConfig } from "./HuoQingDetailModalLeft/index"; +import { HuoQingDetailModalRightConfig } from "./HuoQingDetailModalRight/index"; import { HuoQingDetailModalCloseConfig } from "./HuoQingDetailModalClose/index"; import { HuoQingDetailRadioConfig } from "./HuoQingDetailRadio/index"; import { HuoQingDetailTiltButtonConfig } from "./HuoQingDetailTiltButton/index"; @@ -17,7 +18,8 @@ export default [ HuoQingListConfig, - HuoQingDetailModalConfig, + HuoQingDetailModalLeftConfig, + HuoQingDetailModalRightConfig, HuoQingDetailModalCloseConfig, HuoQingDetailRadioConfig, HuoQingDetailTiltButtonConfig,