From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/spatialAnalysis/Widget.js |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/widgets/spatialAnalysis/Widget.js b/widgets/spatialAnalysis/Widget.js
index b7520ab..c8e0e3d 100644
--- a/widgets/spatialAnalysis/Widget.js
+++ b/widgets/spatialAnalysis/Widget.js
@@ -84,7 +84,13 @@
 					{//BOX裁剪
 						name: 'BOX裁剪',
 						classs: 'BOXTailoring-tool',
-						img: './images/addL/pingmian.png'
+						img: './images/addL/BOX裁剪.png'
+					}
+					,
+					{//Cross裁剪
+						name: 'Cross裁剪',
+						classs: 'crossTailoring-tool',
+						img: './images/addL/BOX裁剪.png'
 					}
 				];
 
@@ -150,6 +156,11 @@
 								name: '平面裁剪',
 								classs: 'clippingPlanes-tool',
 								img: './images/addL/pdpx.png'
+							},
+							{//BOX裁剪
+								name: 'BOX裁剪',
+								classs: 'BOXTailoring-tool',
+								img: './images/addL/BOX裁剪.png'
 							}
 							,
 							{//建造模型
@@ -308,6 +319,20 @@
 					}
 				})
 
+				//Cross裁剪
+				$('.crossTailoring-tool').click(function () {
+					that.closeOnceUse();
+
+					if (that.promise == 'NODATA') {
+						layer.tips('请选择三维倾斜数据中的图层支持!', '.SelectLayerTool', {
+							tips: [3, 'red']
+						});
+					} else {
+						$(".jimu-widget-crossTailoring").show();
+						topic.publish('begincrossTailoring', that.promise);
+					}
+				})
+
 				$('.SelectLayerTool').click(() => {
 					$('#SelectLayerToolItem').toggle();
 				})
@@ -342,6 +367,12 @@
 					$(".jimu-widget-BOXTailoring").hide();
 					topic.publish('closesBOXTailoring');
 				}
+
+				//关闭Cross裁剪
+				if ($(".jimu-widget-crossTailoring").is(":visible")) {//判断是否隐藏
+					$(".jimu-widget-crossTailoring").hide();
+					topic.publish('closescrossTailoring');
+				}
 			},
 			liClick: function (itemid, name, ourdata = 1) {//点击事件
 				var that = this;
@@ -371,6 +402,18 @@
 									roll: Cesium.Math.toRadians(Number(ourdata.rollAngle))
 								}
 							});
+							// console.log(ourdata.lon)
+							// console.log(ourdata.lat)
+							// console.log(ourdata.height)
+							// console.log(ourdata.yawAngle)
+							// console.log(ourdata.pitchAngle)
+							// console.log(ourdata.rollAngle)
+							//115.996858
+							//29.170348
+							//232.99
+							//84.10
+							//-22.98
+							//360.00
 						}
 						if (ourdata.src.indexOf('.openrealspace') != -1) {
 							// console.log('数据正确');
@@ -580,6 +623,12 @@
 					topic.publish('closesBOXTailoring');
 				}
 
+				//关闭Cross裁剪
+				if ($(".jimu-widget-crossTailoring").is(":visible")) {//判断是否隐藏
+					$(".jimu-widget-crossTailoring").hide();
+					topic.publish('closescrossTailoring');
+				}
+
 			},
 			onOpen: function () {
 			},

--
Gitblit v1.9.3