完善军事标绘

src/views/Map3d/components/ViewerSplitScreen.vue

@@ -197,7 +197,10 @@
 				//二三维标绘
 				jt3dLeft.DrawTools = new this.jt3dSDK.DrawTools(jt3dLeft._viewer);
 				//军事标绘
-				jt3dLeft.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3dLeft._viewer);
+				jt3dLeft.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+					viewer: jt3dLeft._viewer,
+					Cesium: Cesium,
+				});
 
 				//天空盒子
 				jt3dLeft.SceneEffects = {};
@@ -205,6 +208,7 @@
 
 				//线对象
 				jt3dLeft.PolylineObject = new this.jt3dSDK.PolylineObject(jt3dLeft._viewer);
+				jt3dLeft.WallObject = new this.jt3dSDK.WallObject(jt3dLeft._viewer);
 
 				//比例尺、指南针
 				this.$parent.$parent.$refs.refNavigation.initNavigation(jt3dLeft);

src/views/Map3d/components/drawEdit.vue

@@ -119,6 +119,9 @@
 					}
 				],
 				options: [{
+						value: '点标绘类',
+						label: '点标绘类',
+					},{
 						value: '二维平面类',
 						label: '二维平面类',
 					},
@@ -226,21 +229,33 @@
 				],
 				militaryPlotting: [{
 						label: '直线箭头',
-						drawType: 'straightArrow',
+						drawType: 'DrawStraightArrow',
 						number: 1,
 						icon: 'iconfont icon-zhijiantou'
 					},
 					{
 						label: '攻击箭头',
-						drawType: 'attackArrow',
+						drawType: 'DrawAttackArrow',
 						number: 2,
 						icon: 'iconfont icon-tujifangxiang'
 					},
 					{
 						label: '钳击箭头',
-						drawType: 'pincerArrow',
+						drawType: 'DrawPincerArrow',
 						number: 3,
 						icon: 'iconfont icon-qianji'
+					},
+					{
+						label: '集结地',
+						drawType: 'DrawGatheringPlace',
+						number: 4,
+						icon: 'iconfont icon-qianji'
+					},
+					{
+						label: '闭合曲面',
+						drawType: 'DrawClosedCurve',
+						number: 5,
+						icon: 'iconfont icon-qianji'
 					}
 				]
 			}
@@ -279,12 +294,13 @@
 				/* 创建监听 */
 				jt3d.DrawMilitaryPlot.onEditProperty = {};
 				// 开始绘制
-				jt3d.DrawMilitaryPlot.draw(type, {
-					onComplete(cPoint, gPoint) {
-						// _self.$parent.$parent.param = param;
-						// _self.$parent.$parent.showDialog = true;
-					}
-				});
+				jt3d.DrawMilitaryPlot.drawActivate(type);
+				// jt3d.DrawMilitaryPlot.draw(type, {
+				// 	onComplete(cPoint, gPoint) {
+				// 		// _self.$parent.$parent.param = param;
+				// 		// _self.$parent.$parent.showDialog = true;
+				// 	}
+				// });
 			},
 			//创建二维标会和三维标会
 			createGraphics(type, index) {

src/views/Map3d/components/map.vue

@@ -209,10 +209,10 @@
 					iconType: 'blue',
 				});
 				jt3d.DrawPointEdit = new this.jt3dSDK.DrawPoint(jt3d._viewer);
-				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
-				// 	viewer: jt3d._viewer,
-				// 	Cesium: Cesium,
-				// });
+				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+					viewer: jt3d._viewer,
+					Cesium: Cesium,
+				});
 				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
 
 				jt3d.LocateUtil = new this.jt3dSDK.LocateUtil(jt3d._viewer);