diff --git a/src/assets/images/chart/zhigan/ZhiGan_SheXiangTouModal.png b/src/assets/images/chart/zhigan/ZhiGan_SheXiangTouModal.png new file mode 100644 index 0000000..8560413 Binary files /dev/null and b/src/assets/images/chart/zhigan/ZhiGan_SheXiangTouModal.png differ diff --git a/src/assets/images/chart/zhigan/component/SheXiangTouModal_Back.png b/src/assets/images/chart/zhigan/component/SheXiangTouModal_Back.png new file mode 100644 index 0000000..f067d35 Binary files /dev/null and b/src/assets/images/chart/zhigan/component/SheXiangTouModal_Back.png differ diff --git a/src/assets/images/chart/zhigan/component/SheXiangTouModal_VideoBack.png b/src/assets/images/chart/zhigan/component/SheXiangTouModal_VideoBack.png new file mode 100644 index 0000000..676195c Binary files /dev/null and b/src/assets/images/chart/zhigan/component/SheXiangTouModal_VideoBack.png differ diff --git a/src/packages/components/Charts/Maps/MapLayer/index.vue b/src/packages/components/Charts/Maps/MapLayer/index.vue index 49b998b..f441e24 100644 --- a/src/packages/components/Charts/Maps/MapLayer/index.vue +++ b/src/packages/components/Charts/Maps/MapLayer/index.vue @@ -227,7 +227,6 @@ const handlerGetLayerTree = ()=>{ handlerLayers.value.push(layerGroup); }); - console.log("configlayers",handlerLayers.value); // window.globalMap.setLayersOptions(configLayers); }) } @@ -320,9 +319,8 @@ onMounted(()=>{ }); }) - - const isFirstLoad = ref(true); + const initMap = (newData: any) => { // 第一次加载 if(isFirstLoad.value){ @@ -331,6 +329,7 @@ const initMap = (newData: any) => { // map.setOptions(newData); map.setSceneOptions(newData.scene); } + isFirstLoad.value = false; window.globalMap = map; diff --git a/src/packages/components/Charts/Maps/MapMars3d/index.vue b/src/packages/components/Charts/Maps/MapMars3d/index.vue index dbc03fc..fe2af37 100644 --- a/src/packages/components/Charts/Maps/MapMars3d/index.vue +++ b/src/packages/components/Charts/Maps/MapMars3d/index.vue @@ -71,6 +71,7 @@ const initMap = (newData: any) => { // 所有绑定的点击事件 let bindEvents = props.chartConfig.events.interactConfigEvents + console.log("bindEvents",bindEvents); // 图层点击事件 @@ -2134,7 +2135,7 @@ const stopWatch = watch( // } // ] // } - + console.log("options",options); initMap(options); }, diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/config.ts b/src/packages/components/Tasks/Tasks/TaskBanner/config.ts index 3335394..191716a 100644 --- a/src/packages/components/Tasks/Tasks/TaskBanner/config.ts +++ b/src/packages/components/Tasks/Tasks/TaskBanner/config.ts @@ -42,7 +42,30 @@ export const option = { "/src/assets/images/chart/tasks/bannerimg1.png", "/src/assets/images/chart/tasks/bannerimg1.png", ] - } + }, + primaryKey:"id", + showColumns:[ + { + type:"text", + en_name: 'ReportPerson', + zh_name: '人员名称', + }, + { + type:"text", + en_name: 'ReportTime', + zh_name: '上报时间', + }, + { + type:"text", + en_name: 'Describe', + zh_name: '火情描述', + }, + { + type:"text", + en_name: 'Address', + zh_name: '位置地点', + }, + ] } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/config.vue b/src/packages/components/Tasks/Tasks/TaskBanner/config.vue index 2d2a068..563a4a9 100644 --- a/src/packages/components/Tasks/Tasks/TaskBanner/config.vue +++ b/src/packages/components/Tasks/Tasks/TaskBanner/config.vue @@ -58,10 +58,59 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue index 8841854..83289e0 100644 --- a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue +++ b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue @@ -45,7 +45,7 @@ const { -console.log("props.chartConfig",props.chartConfig.request.requestSQLContent.sql); +console.log("props.chartConfig",props.chartConfig.option.showColumns); @@ -56,25 +56,37 @@ onMounted(()=>{ // 组件通信 获取列表中的信息 EventBus.on(props.chartConfig.id+'dataupdate', (data) => { - props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql,{id:data.id}) - + props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql,{Id:data.id}) + // 数据callback处理(预览时触发) useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any) => { // props.chartConfig.option.dataset = resData; let data = []; - for(let key in resData[0]){ - let item = { - title:key, - desc:resData[0][key] + + props.chartConfig.option.showColumns?.forEach((item,index)=>{ + let info = { + title:item.zh_name, + desc:resData[0][firstLetterToLowerCase(item.en_name)] } - data.push(item); - } + data.push(info); + + }) + props.chartConfig.option.dataset.data = data; }); }); }) +function firstLetterToLowerCase(str) { + return str.charAt(0).toLowerCase() + str.slice(1); +} + +// 处理展示字段 +const handlerShowColumns = ()=> { + +} + function replaceSqlParams(sql, params) { return sql.replace(/#\{([^}]+)\}/g, (match, p1) => { diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.ts b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.ts new file mode 100644 index 0000000..e5062a5 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.ts @@ -0,0 +1,91 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig, requestSqlConfig } from '@/settings/designSetting' +import { ZhiGan_SheXiangTouModalConfig } from './index' +import dataJson from './data.json' + +const { source } = dataJson; + +export const option = { + videoList: [ + { + } + ], + dataset: source, + dataStyle: { + // 弹窗关闭按钮 + closeButtonWidth: 52, + closeButtonHeight: 30, + + // 弹窗标题 + generalTitleFontSize: 24, + generalTitleFontColor: '#ffffff', + generalTitleFontShadow: '#00CF2C', + + // 弹窗类型按钮 + typeButtonWidth: 115, + typeButtonHeight: 32, + typeButtonFontSize: 14, + typeButtonFontColor: '#FFFFFF', + + // 主体 + mainBodyMarginTop: 15, + mainLeftMarginLeft1: 10, + mainLeftMarginLeft2: 10, + mainLeftMarginLeft3: 10, + + // 左侧标题 + leftTitleIcon1_WidthAndHeight: 36, + leftTitle_FontSize: 24, + leftTitle_FontColor: '#ffffff', + leftTitle_FontShadow: '#00CF2C', + leftTitleIcon2_Width: 15, + leftTitleIcon2_Height: 12, + + // 左侧查询 + leftSearchMarginTop: 10, + leftSearchMarginLeft: 10, + + // 左侧列表 + leftListMarginTop: 10, + leftListMarginLeft: 10, + leftListHeight: 600, + leftListAloneHeight: 30, + leftListWidth: 300, + leftListWidth_Icon: 50, + leftListWidth_Title: 250, + + leftDivVideoListIconWidth: 23, + leftDivVideoListIconHeight: 16, + + leftListFontSize: 12, + leftListFontColor: '#cfdae6', + leftListFontBackgroud: '#242d33', + + // 右侧视频 + nowType: '1', + videoWidth: 956, + videoHeight: 688, + // 关闭按钮 + closeVideoIconColor: '#027734', + closeVideoIconWidthAndHeight: 34, + // 标题 + videoTitleFontSize: 16, + videoTitleFontColor: '#ffffff', + + videoloop: false, // 视频-循环播放 + videomuted: true, // 视频-静音 + videofit: 'fill', // 视频-适应方式 + + }, +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ZhiGan_SheXiangTouModalConfig.key + public attr = { ...chartInitConfig, w: 1360, h: 838, zIndex: -1 } + // public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from zg_wurenjishishihuamian' }, } + public filter = "return res.result;" + public chartConfig = cloneDeep(ZhiGan_SheXiangTouModalConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.vue new file mode 100644 index 0000000..e2c8d73 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/config.vue @@ -0,0 +1,351 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/data.json b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/data.json new file mode 100644 index 0000000..2d53d2a --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/data.json @@ -0,0 +1,108 @@ +{ + "source": [ + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇沂蒙抽水蓄能业营地", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县冯庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县冻蒙镇沂蒙抽水蓄能业营地", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇沂蒙抽水蓄能业营地", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县薛庄镇火山后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县马庄镇陈家鱼后村南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + }, + { + "title":"费县东蒙镇天蒙景区二村东边南斜坡后村", + "videourl": "http://111.36.45.20:18000/flv/hls/H-dcb1ea7388588111.flv" + } + ] +} diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.ts b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.ts new file mode 100644 index 0000000..832f4eb --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const ZhiGan_SheXiangTouModalConfig: ConfigType = { + key: 'ZhiGan_SheXiangTouModal', + chartKey: 'VZhiGan_SheXiangTouModal', + conKey: 'VCZhiGan_SheXiangTouModal', + title: '摄像头监控列表', + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, + chartFrame: ChartFrameEnum.COMMON, + image: 'ZhiGan_SheXiangTouModal.png' +} diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.vue new file mode 100644 index 0000000..161dc87 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.vue @@ -0,0 +1,679 @@ + + + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeButton.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeButton.vue new file mode 100644 index 0000000..099c254 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeButton.vue @@ -0,0 +1,74 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeVideoIcon.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeVideoIcon.vue new file mode 100644 index 0000000..a78074e --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/closeVideoIcon.vue @@ -0,0 +1,47 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon1.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon1.vue new file mode 100644 index 0000000..d225252 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon1.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon2.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon2.vue new file mode 100644 index 0000000..2f4cb8a --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/leftTitleIcon2.vue @@ -0,0 +1,47 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/listVideoNameIcon.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/listVideoNameIcon.vue new file mode 100644 index 0000000..edd073b --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/listVideoNameIcon.vue @@ -0,0 +1,96 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/searchInput.svg b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/searchInput.svg new file mode 100644 index 0000000..7ba0091 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/searchInput.svg @@ -0,0 +1,75 @@ + + + 编组 33 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/typeButton.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/typeButton.vue new file mode 100644 index 0000000..c7e97be --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/svg/typeButton.vue @@ -0,0 +1,286 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_XianSuoShangBaoFenLei/index.ts b/src/packages/components/Zhigan/Zhigan/ZhiGan_XianSuoShangBaoFenLei/index.ts index a32ef1e..6514962 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_XianSuoShangBaoFenLei/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_XianSuoShangBaoFenLei/index.ts @@ -9,6 +9,6 @@ export const ZhiGan_XianSuoShangBaoFenLeiConfig: ConfigType = { category: ChatCategoryEnum.ZHIGAN, categoryName: ChatCategoryEnumName.ZHIGAN, package: PackagesCategoryEnum.ZHIGAN, - chartFrame: ChartFrameEnum.ECHARTS, + chartFrame: ChartFrameEnum.COMMON, image: 'ZhiGan_XianSuoShangBaoFenLei.png' } diff --git a/src/packages/components/Zhigan/Zhigan/index.ts b/src/packages/components/Zhigan/Zhigan/index.ts index 85d7289..ddb2f0e 100644 --- a/src/packages/components/Zhigan/Zhigan/index.ts +++ b/src/packages/components/Zhigan/Zhigan/index.ts @@ -21,6 +21,8 @@ import { ZhiGan_ModalTimeLineConfig } from "./ZhiGan_ModalTimeLine/index"; import { ZhiGan_ModalButtonConfig } from "./ZhiGan_ModalButton/index"; import { ZhiGan_SheXiangTouLeiXingConfig } from "./ZhiGan_SheXiangTouLeiXing/index"; +import { ZhiGan_SheXiangTouModalConfig } from "./ZhiGan_SheXiangTouModal/index"; + import { ZhiGan_YongHuShuConfig } from "./ZhiGan_YongHuShu/index"; import { ZhiGan_XianSuoShangBaoFenLeiConfig } from "./ZhiGan_XianSuoShangBaoFenLei/index"; @@ -53,6 +55,7 @@ export default [ ZhiGan_ModalButtonConfig, ZhiGan_SheXiangTouLeiXingConfig, + ZhiGan_SheXiangTouModalConfig, ZhiGan_YongHuShuConfig, ZhiGan_XianSuoShangBaoFenLeiConfig, ]; diff --git a/src/packages/components/Zhiku/Zhiku/HuoQingDetailPie/index.ts b/src/packages/components/Zhiku/Zhiku/HuoQingDetailPie/index.ts index cab5b80..a0df45a 100644 --- a/src/packages/components/Zhiku/Zhiku/HuoQingDetailPie/index.ts +++ b/src/packages/components/Zhiku/Zhiku/HuoQingDetailPie/index.ts @@ -9,6 +9,6 @@ export const HuoQingDetailPieConfig: ConfigType = { category: ChatCategoryEnum.ZHIKU, categoryName: ChatCategoryEnumName.ZHIKU, package: PackagesCategoryEnum.ZHIKU, - chartFrame: ChartFrameEnum.ECHARTS, + chartFrame: ChartFrameEnum.COMMON, image: 'HuoQingDetailPie.png' }