|  | @@ -192,21 +192,75 @@
 | 
	
		
			
				|  |  |  				],
 | 
	
		
			
				|  |  |  				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'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '弓形线',
 | 
	
		
			
				|  |  | +						drawType: 'DrawBowLine',
 | 
	
		
			
				|  |  | +						number: 6,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					// {
 | 
	
		
			
				|  |  | +					// 	label: '弓形面',
 | 
	
		
			
				|  |  | +					// 	drawType: 'DrawBowPlane',
 | 
	
		
			
				|  |  | +					// 	number: 7,
 | 
	
		
			
				|  |  | +					// 	icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					// },
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '扇形',
 | 
	
		
			
				|  |  | +						drawType: 'DrawSector',
 | 
	
		
			
				|  |  | +						number: 8,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '曲线',
 | 
	
		
			
				|  |  | +						drawType: 'DrawCurve',
 | 
	
		
			
				|  |  | +						number: 9,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '曲线旗帜',
 | 
	
		
			
				|  |  | +						drawType: 'DrawCurveFlag',
 | 
	
		
			
				|  |  | +						number: 10,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '三角旗帜',
 | 
	
		
			
				|  |  | +						drawType: 'DrawTriangleFlag',
 | 
	
		
			
				|  |  | +						number: 11,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  | +					},
 | 
	
		
			
				|  |  | +					{
 | 
	
		
			
				|  |  | +						label: '矩形直角旗帜',
 | 
	
		
			
				|  |  | +						drawType: 'DrawRectFlag',
 | 
	
		
			
				|  |  | +						number: 12,
 | 
	
		
			
				|  |  | +						icon: 'iconfont icon-qianji'
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  |  				],
 | 
	
		
			
				|  |  |  				point: [{
 | 
	
	
		
			
				|  | @@ -283,12 +337,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;
 | 
	
		
			
				|  |  | +				// 	}
 | 
	
		
			
				|  |  | +				// });
 | 
	
		
			
				|  |  |  			},
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			//创建二维标会和三维标会
 |