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

.env.development

@@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = /
 VITE_GLOB_API_URL = http://192.168.10.163:9620
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://60.213.14.14:6070
+VITE_GLOB_UPLOAD_URL= http://60.213.14.14:6070
 
 VITE_GLOB_INFO_IMAGE_URL=http://120.222.154.48:6050
 

src/hooks/ceshiFun.hook.ts

@@ -100,20 +100,62 @@ export function mapFun() {
     })
   }
 
+  const handlerDrawDoubleArrow = async () => {
+    const graphic = await window.drawGraphicLayer.startDraw({
+      type: "doubleArrow",
+      style: {
+        color: "#3388ff",
+        opacity: 0.5,
+        outline: true,
+        outlineColor: "#ffffff",
+        outlineWidth: 2.0,
+        clampToGround:true
+      }
+    })
+  }
+
+  const handlerDrawAttackArrow = async () =>{
+    const graphic = await window.drawGraphicLayer.startDraw({
+      type: "attackArrow",
+      style: {
+        color: "#3388ff",
+        opacity: 0.5,
+        outline: true,
+        outlineColor: "#ffffff",
+        outlineWidth: 2.0,
+        clampToGround:true
+      }
+    })
+  }
+
+  const handlerDrawCloseVurve = async ()=>{
+    const graphic = await window.drawGraphicLayer.startDraw({
+      type: "closeVurve",
+      style: {
+        color: "#3388ff",
+        opacity: 0.5,
+        outline: true,
+        outlineColor: "#ffffff",
+        outlineWidth: 2.0,
+        clampToGround:true
+      }
+    })
+  }
+
   const handlerClearDraw = async ()=>{
     window.drawGraphicLayer.clear();
   }
 
   const handlerDrawRectangle = async () => {
     const graphic = await window.drawGraphicLayer.startDraw({
-      type: isEntityPrimitive ? "rectangle" : "rectangleP",
+      type: "rectangle" ,
       style: {
-        color: clampToGround ? "#ffff00" : "#3388ff",
+        color: "#ffff00",
         opacity: 0.6,
         outline: true,
         outlineColor: "#ffffff",
         outlineWidth: 2.0,
-        clampToGround
+        clampToGround:true
       }
     })
   }
@@ -507,7 +549,6 @@ export function mapFun() {
     window.graphicLayer.addGraphic(graphic)
   }
 
-
   return {
     ceshiClick,
     handlerFlyToPoint,
@@ -520,6 +561,9 @@ export function mapFun() {
     handlerMeasureHeight,
     handlerClearMeasure,
     handlerDrawPolygon,
+    handlerDrawDoubleArrow,
+    handlerDrawAttackArrow,
+    handlerDrawCloseVurve,
     handlerDrawBrushLine,
     handlerDrawLine,
     handlerDrawPoint,
@@ -625,8 +669,12 @@ export const funSelectOptions = [
     value:"handlerDrawBrushLine"
   },
   {
-    label:"军事标绘",
-    value:"handlerDrawJun"
+    label:"军事标绘单箭头",
+    value:"handlerDrawAttackArrow"
+  },
+  {
+    label:"绘制闭合曲面",
+    value:"handlerDrawCloseVurve"
   },
   {
     label:"绘制贴地矩形",
@@ -648,6 +696,10 @@ export const funSelectOptions = [
     label:"绘制自由线",
     value:"drawBrushLine",
   },
+  {
+    label:"军事标绘双箭头",
+    value:"handlerDrawDoubleArrow"
+  },
   {
     label:"空间距离测量",
     value:"handlerMeasureLength"

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

@@ -138,10 +138,14 @@
     </setting-item-box>
 
   </collapse-item>
-<!-- 
+
   <collapse-item name="底图图层" :expanded="true">
 
-  </collapse-item> -->
+    <setting-item-box name="地图底图" :alone="true">
+      <!-- <n-select v-model:value="optionData.mapOptions.basemaps" size="small" :options="themeOptions" /> -->
+    </setting-item-box>
+
+  </collapse-item>
 
   <collapse-item name="右键菜单" :expanded="true">
 
@@ -160,117 +164,44 @@ const props = defineProps({
     type: Object as PropType<typeof option>,
     required: true
   }
-}
-)
+})
 
-console.log("props.optionData",props.optionData);
 
 
+props.optionData.mapOptions.basemaps =  [
+    {
+			"id": 10,
+			"name": "地图底图",
+			"type": "group"
+		},
+		{
+			"id": 2021,
+			"pid": 10,
+			"name": "天地图影像",
+			"icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_img.png",
+			"type": "group",
+			"layers": [
+                {
+					"name": "底图",
+					"type": "tdt",
+					"layer": "img_d"
+				},
+				{
+					"name": "注记",
+					"type": "tdt",
+					"layer": "img_z"
+				}
+			],
+			"show": true
+		}
+]
+
 
 const themeOptions = [
   {
     value: ThemeEnum.NORMAL,
     label: '标准'
-  },
-  {
-    value: ThemeEnum.DARK,
-    label: '幻影黑'
-  },
-  {
-    value: ThemeEnum.LIGHT,
-    label: '月光银'
-  },
-  {
-    value: ThemeEnum.WHITES_MOKE,
-    label: '远山黛'
-  },
-  {
-    value: ThemeEnum.FRESH,
-    label: '草色青'
-  },
-  {
-    value: ThemeEnum.GREY,
-    label: '雅士灰'
-  },
-  {
-    value: ThemeEnum.GRAFFITI,
-    label: '涂鸦'
-  },
-  {
-    value: ThemeEnum.MACARON,
-    label: '马卡龙'
-  },
-  {
-    value: ThemeEnum.BLUE,
-    label: '靛青蓝'
-  },
-  {
-    value: ThemeEnum.DARKBLUE,
-    label: '极夜蓝'
-  },
-  {
-    value: ThemeEnum.WINE,
-    label: '酱籽'
   }
 ]
 
-const langOptions = [
-  {
-    value: LangEnum.ZH_CN,
-    label: '中文简体'
-  },
-  {
-    value: LangEnum.EN,
-    label: '英文'
-  },
-  {
-    value: LangEnum.ZH_EN,
-    label: '中英文对照'
-  }
-]
-
-const viewModeOptions = [
-  {
-    value: ViewModeEnum.PLANE,
-    label: '2D'
-  },
-  {
-    value: ViewModeEnum.STEREOSCOPIC,
-    label: '3D'
-  }
-]
-
-const featuresOptions = [
-  {
-    value: FeaturesEnum.BG,
-    label: '区域面'
-  },
-  {
-    value: FeaturesEnum.POINT,
-    label: '标注'
-  },
-  {
-    value: FeaturesEnum.ROAD,
-    label: '道路'
-  },
-  {
-    value: FeaturesEnum.BUILDING,
-    label: '建筑物'
-  }
-]
-
-const MarkerOptions = [
-  {
-    value: MarkerEnum.CIRCLE_MARKER,
-    label: '圆形标点'
-  },
-  {
-    value: MarkerEnum.MARKER,
-    label: '定位标点'
-  },
-  {
-    value: MarkerEnum.NONE,
-    label: '隐藏标点'
-  }
-]
 </script>

src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue

@@ -139,6 +139,7 @@
 
   const { chartEditStore } = useTargetData();
 
+
   const routeOptions = ref([]);
   const skipTypeOptions = ref([
     {