Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/hooks/ceshiFun.hook.ts

@@ -4,7 +4,6 @@ export function mapFun() {
 
   const ceshiClick = () => {
     console.log('ceshi');
-    alert('ceshi');
   };
 
   // 根据坐标点跳转位置

src/hooks/eventHandler.hook.ts

@@ -139,7 +139,7 @@ export const eventCommonHandler = (
             
             EventBus.emit(elementList[j].elementId[k] + type, params);
             
-            // 分组内组件通信
+            // 分组内所有组件默认添加通信
             componentList[i]?.groupList?.forEach((groupItem,idx)=>{
               EventBus.emit(groupItem.id +"dataupdate", params);
             })

src/hooks/measureFunction.ts

@@ -4,7 +4,6 @@ export function mapFun() {
 
   const ceshiClick = () => {
     console.log('ceshi');
-    alert('ceshi');
   };
 
   // 根据坐标点跳转位置

src/packages/components/Charts/Maps/MapLayer/index.vue

@@ -314,9 +314,11 @@ const vChartRef = ref<HTMLElement>()
 
 onMounted(()=>{
   handlerGetLayerTree();
+
   EventBus.on(props.chartConfig.id + 'GraphicClick', (data) => {
     console.log('data', data);
   });
+  
 })
 
 const isFirstLoad = ref(true);

src/packages/components/Charts/Maps/MapMars3d/index.vue

@@ -68,7 +68,6 @@ const initMap = (newData: any) => {
 
   window.globalMap = map;
 
-
     // 所有绑定的点击事件
     let bindEvents = props.chartConfig.events.interactConfigEvents
 
@@ -76,12 +75,8 @@ const initMap = (newData: any) => {
 
     // 图层点击事件
     window.globalMap.on(mars3d.EventType.click,(event)=>{
-
-        // alert("layer id："+event.layer.id+"; graphic id："+event.graphic.options.attr.id);
-
         // 查找绑定的点击事件的图层
         for(let i=0;i<bindEvents.length;i++){
-            console.log("bindEvent",bindEvents[i])
             for(let j=0;j<bindEvents[i].movementList.length;j++){
                 console.log("bindEvent",bindEvents[i].movementList[j])
                 if(event.layer.id == bindEvents[i].movementList[j].params){
@@ -89,7 +84,6 @@ const initMap = (newData: any) => {
                 }
             }
         }
-
     })
 
   // 初始化矢量图层

src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue

@@ -22,7 +22,6 @@
         </div>
       </div>
     </div>
-    
   </div>
 </template>
 
@@ -96,7 +95,7 @@ const handlerLoadFirePoint = (points:[])=>{
       style: {
         image: "/public/map/fire.png",
         clampToGround: true,
-        scale: 0.4,
+        scale: 0.8,
         label: {
           text: item.title,
           font_size: 12,

src/packages/components/Tasks/Tasks/TaskBanner/index.vue

@@ -25,7 +25,8 @@ import { CreateComponentType } from '@/packages/index.d';
 import { useChartDataFetch } from '@/hooks';
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
 import { EventBus } from '@/utils/eventBus';
-
+import { getAppEnvConfig } from '@/utils/env'
+var { VITE_GLOB_API_URL } = getAppEnvConfig();
 
 import { replaceSqlParams } from '@/utils/sqlHandler';
 
@@ -69,13 +70,12 @@ onMounted(()=>{
           desc:resData[0][firstLetterToLowerCase(item.en_name)]
         }
         data.push(info);
-
       })
-    
+      props.chartConfig.option.dataset.imgArr = [VITE_GLOB_API_URL+"/"+resData[0].image]
+      console.log("0000",)
       props.chartConfig.option.dataset.data = data;
     });
   });
-
 })
 
 function firstLetterToLowerCase(str) {