diff --git a/index.html b/index.html index 8c986a8..c07fa95 100644 --- a/index.html +++ b/index.html @@ -18,6 +18,10 @@ + + + + - - -
- - -
-
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/src/hooks/eventHandler.hook.ts b/src/hooks/eventHandler.hook.ts index bdf67d1..7256ee5 100644 --- a/src/hooks/eventHandler.hook.ts +++ b/src/hooks/eventHandler.hook.ts @@ -80,16 +80,25 @@ export const eventCommonHandler = ( for (let k = 0; k < elementList[j].elementId.length; k++) { //获取位置 const arr = queryFun(componentList, elementList[j].elementId[k]); - console.log(arr); + // console.log(arr); if (arr.length > 1) { obj = componentList[arr[0]].groupList[arr[1]]; obj.status.hide = false; - console.log(obj); + // console.log(obj); // chartEditStore.updateComponentList(arr[0], obj, arr[1]); } else if (arr.length == 1) { obj = componentList[arr[0]]; obj.status.hide = false; - console.log(obj); + // console.log(obj); + + // 海康视频组件单独处理 + if(obj.isGroup && obj.groupList.some((li) => li.key == 'ZhiGan_ModalVideo')) { + obj.groupList.forEach((g) => { + if(g.key == 'ZhiGan_ModalVideo'){ + g.status.hide = false; + } + }); + } // chartEditStore.updateComponentList(arr[0], obj); } // if (componentList[i].id == elementList[j].elementId[k]) { @@ -103,7 +112,7 @@ export const eventCommonHandler = ( // 隐藏 for (let k = 0; k < elementList[j].elementId.length; k++) { //获取位置 - const arr = queryFun(componentList, elementList[j].elementId[k]); + const arr = queryFun(componentList, elementList[j].elementId[k]); if (arr.length > 1) { obj = componentList[arr[0]].groupList[arr[1]]; obj.status.hide = true; @@ -111,6 +120,15 @@ export const eventCommonHandler = ( } else if (arr.length == 1) { obj = componentList[arr[0]]; obj.status.hide = true; + + // 海康视频组件单独处理 + if(obj.isGroup && obj.groupList.some((li) => li.key == 'ZhiGan_ModalVideo')) { + obj.groupList.forEach((g) => { + if(g.key == 'ZhiGan_ModalVideo'){ + g.status.hide = true; + } + }); + } // chartEditStore.updateComponentList(arr[0], obj); } // if (componentList[i].id == elementList[j].elementId[k]) { diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/ts/direction.ts b/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/ts/direction.ts index 898740b..3ef43d3 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/ts/direction.ts +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/ts/direction.ts @@ -9,7 +9,6 @@ const INPUT_TIP_URL = "https://restapi.amap.com/v3/assistant/inputtips"; const RE_GEO_URL = "https://restapi.amap.com/v3/geocode/regeo"; const GD_KEY = "6af6a87038f44c8c793aa70331f2b7ca"; -// const GD_KEY = "8599882c8059403539cd882a8a6e64d0"; // 起点、沿途、不包含的沿途、终点，光点的颜色 export const wayColorList = { diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue index b81e4ea..4e843db 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue @@ -733,9 +733,10 @@ pitch: -51.9, }); } + + let endCoor = [118.031528, 35.431473]; // 漫游 async function roamLocation(startCoor) { - let endCoor = [118.031528, 35.431473]; let params: any = { startlng: parseFloat(startCoor[0]), startlat: parseFloat(startCoor[1]), @@ -758,6 +759,8 @@ // 组件通信 const sql = props.chartConfig.request?.requestSQLContent?.sql; EventBus.on(props.chartConfig.id + 'dataupdate', (data) => { + // 火情终点 + endCoor = [data.lng, data.lat]; props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql, { Id: data.id }); // 数据callback处理（预览时触发） useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue index bb9d61b..b81e705 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue @@ -114,7 +114,7 @@ props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql, { Id: data.id }); // 数据callback处理（预览时触发） useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { - option.dataset = resData; + option.dataset = resData; }); }); }); diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalVideo/config.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalVideo/config.vue index fe4dab5..5d24aee 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalVideo/config.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalVideo/config.vue @@ -1,6 +1,6 @@