no message

.env.development

@@ -5,6 +5,6 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'development'
 
 # 金田基础框架/开发环境
-VITE_API_URL = 'http://218.59.194.82:13293/'
+VITE_API_URL = 'http://218.59.194.82:13189/'
 
 # 后台管理地址: http://218.59.194.82:13190/sdjt-admin/

.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13293/'
+VITE_API_URL = 'http://218.59.194.82:13189/'
 
 # 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
 

src/utils/request.js

@@ -77,7 +77,7 @@ request.interceptors.response.use(
 		// 	location.reload();
 		// }
 
-		return Promise.reject(new Error(res.msg || 'Error'));
+		return Promise.reject(new Error(res.message || 'Error'));
 	},
 	async (error) => {
 		NProgress.done();

src/views/Map3d/components/layer.vue

@@ -168,7 +168,7 @@
 				}
 
 				//在显示的图层中，如果图层配置可以查询，则进行查询
-				if (layertype === '矢量面' && data.querytable) {
+				if (layertype === '标注' && data.querytable) {
 					if (checked) {
 						if (store.queryMapTables.indexOf(data.querytable) === -1) {
 							store.queryMapTables.push(data.querytable);

src/views/Map3d/components/map.vue

@@ -154,22 +154,35 @@
 				);
 				//注册大球单机事件
 				jt3d.handlerLeftClick.setInputAction(function(e) {
+					var cartesian = undefined;
+					var cartographic = undefined
 					var pick = jt3d._viewer.scene.pick(e.position); //拾取当前的entity对象
-					var cartesian = jt3d._viewer.scene.pickPosition(e.position); //获取当前点坐标
-					if (Cesium.defined(cartesian)) {
+					let radius = ''
+					if (pick) {
+						cartographic = Cesium.Cartographic.fromCartesian(pick.primitive._position);
+						radius = 0.001
+					} else {
+						cartesian = jt3d._viewer.scene.pickPosition(e.position); //获取当前点坐标
 						//将笛卡尔坐标转换为地理坐标
-						let cartographic = Cesium.Cartographic.fromCartesian(cartesian);
+						cartographic = Cesium.Cartographic.fromCartesian(cartesian);
+					}
+					if (Cesium.defined(cartographic)) {
+						console.log('cartographic', cartographic)
 						//将弧度转为度的十进制度表示
 						let lng = Cesium.Math.toDegrees(cartographic.longitude);
 						let lat = Cesium.Math.toDegrees(cartographic.latitude);
 						let alt = cartographic.height; //高度
-
+						console.log('cartographic', lng, lat)
+						_self.$parent.layershow = false
 						_self.$parent.$refs._refQueryGraphics.initQuery({
 							spatialType: '点',
 							coordinate: lng + " " + lat,
-							buffer: ''
+							buffer: radius
 						});
 					}
+					// console.log('position对象',e.position)
+					console.log('entity对象', pick)
+				
 				}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 			},
 

src/views/Map3d/components/query-graphics.vue

@@ -257,8 +257,9 @@
 				}
 
 				const getData = () => {
-
+					console.log(123666)
 					if (store.queryMapTables.length > 0) {
+						console.log(123677)
 						//查询等待框
 						loading = ElLoading.service({
 							lock: true,
@@ -271,7 +272,7 @@
 							let result = getAxios(itemTable, options);
 							data.push(result);
 						})
-
+						console.log(123677)
 						Promise.all(data).then(itemList => {
 
 							console.log("itemList", itemList) //itemList返回的数据是按顺序的
@@ -324,8 +325,8 @@
 
 										switch (tableName) {
 											//==============规划管理数据-重要控制线=========================
-											case "yjjbnt": //永久基本农田
-												childNode.label = itemData.properties["cfzr"] + "(" + itemData.properties["zzsxmc"] + ")"
+											case "yy_yj": //油井
+												childNode.label = itemData.properties["dwmc"] + "(" + itemData.properties["jh"] + ")"
 												break;
 											case "yjtz": //永久基本农田调整
 												childNode.label = itemData.properties["zldwmc"] + "(" + itemData.properties["dlmc"] + ")"

src/views/Map3d/components/queryResult.vue

@@ -58,70 +58,113 @@
 						})
 
 						//高亮显示并定位显示详细信息
-						jt3d.PolygonObject.generatePolygonByPoints(treeNode.data.geometry.coordinates[0][0], {
-							color: [255, 0, 255, 0],
-							outline: true,
-							outlineWidth: 5,
-							outlineColor: [0, 255, 180, 1]
-						}).then((locationEntity) => {
-							// 初始化定位参数
-							let options = {};
-							options.duration = Cesium.defaultValue(options.duration, 2);
-							options.heading = Cesium.defaultValue(options.heading, 0);
-							options.pitch = Cesium.defaultValue(options.pitch, -60);
-							options.range = Cesium.defaultValue(options.range, 800.0);
-
-							let flyToEntity = jt3d.LocateUtil.flyToEntity(locationEntity, options);
-							flyToEntity.then(function(flag) {
-								//详细信息
-								let strHtml = "";
-								strHtml += "<table>";
-								strHtml += "<thead>";
-								strHtml += "<tr>";
-								strHtml += "<th>属性名</th>";
-								strHtml += "<th>属性值</th>";
-								strHtml += "</tr> ";
-								strHtml += " </thead>";
-								strHtml += "<tbody>";
-
-								var field = treeNode.field;
-								var properties = treeNode.data.properties
-								field.forEach(itemField => {
-									if (itemField.isDisplay === 1) {
-										var fieldDesc = itemField.fieldDescription || itemField
-											.fieldName;
-										var fieldVals = properties[itemField.fieldName];
-
-										//日期格式
-										if (itemField.fieldType === 1) {
-											let time = new Date(fieldVals).getTime();
-											fieldVals = formattingTime(time);
-										}
-
-										if (fieldVals != null && fieldVals != "" && fieldVals !=
-											undefined) {
-											strHtml += "<tr>";
-											strHtml += "<td>" + fieldDesc + "</td>";
-											strHtml += "<td>" + fieldVals + "</td>";
-											strHtml += "</tr>";
-										}
+						if(treeNode.data.geometry.type == 'Point'){
+							let strHtml = "";
+							strHtml += "<table style='z-index:100;width:98%';border:2px solid #fff;>";
+							strHtml += "<thead>";
+							strHtml += "<tr>";
+							strHtml += "<th>属性名</th>";
+							strHtml += "<th>属性值</th>";
+							strHtml += "</tr> ";
+							strHtml += " </thead>";
+							strHtml += "<tbody>";
+											
+							var field = treeNode.field;
+							var properties = treeNode.data.properties
+							field.forEach(itemField => {
+								if (itemField.isDisplay === 1) {
+									var fieldDesc = itemField.fieldDescription || itemField
+										.fieldName;
+									var fieldVals = properties[itemField.fieldName];
+											
+									//日期格式
+									if (itemField.fieldType === 1) {
+										let time = new Date(fieldVals).getTime();
+										fieldVals = formattingTime(time);
 									}
-								});
-
-								strHtml += "</tbody>";
-								strHtml += "</table>";
-
-								let divb = document.getElementById('detailDiv')
-								divb.innerHTML = strHtml; //设置显示的数据，可以是标签．
-
+											
+									if (fieldVals != null && fieldVals != "" && fieldVals !=
+										undefined) {
+										strHtml += "<tr>";
+										strHtml += "<td>" + fieldDesc + "</td>";
+										strHtml += "<td>" + fieldVals + "</td>";
+										strHtml += "</tr>";
+									}
+								}
 							});
-
-						});
+							strHtml += "</tbody>";
+							strHtml += "</table>";
+							let divb = document.getElementById('detailDiv')
+							divb.innerHTML = strHtml; //设置显示的数据，可以是标签．
+						}else if(treeNode.data.geometry.type == "MultiPolygon"){
+							this.polygon(treeNode)
+						}
 					}
 
 					resolve(1)
 				})
 			},
+			
+			polygon(treeNode){
+				jt3d.PolygonObject.generatePolygonByPoints(treeNode.data.geometry.coordinates[0][0], {
+					color: [255, 0, 255, 0],
+					outline: true,
+					outlineWidth: 5,
+					outlineColor: [0, 255, 180, 1]
+				}).then((locationEntity) => {
+					// 初始化定位参数
+					let options = {};
+					options.duration = Cesium.defaultValue(options.duration, 2);
+					options.heading = Cesium.defaultValue(options.heading, 0);
+					options.pitch = Cesium.defaultValue(options.pitch, -60);
+					options.range = Cesium.defaultValue(options.range, 800.0);
+				
+					let flyToEntity = jt3d.LocateUtil.flyToEntity(locationEntity, options);
+					flyToEntity.then(function(flag) {
+						//详细信息
+						let strHtml = "";
+						strHtml += "<table>";
+						strHtml += "<thead>";
+						strHtml += "<tr>";
+						strHtml += "<th>属性名</th>";
+						strHtml += "<th>属性值</th>";
+						strHtml += "</tr> ";
+						strHtml += " </thead>";
+						strHtml += "<tbody>";
+				
+						var field = treeNode.field;
+						var properties = treeNode.data.properties
+						field.forEach(itemField => {
+							if (itemField.isDisplay === 1) {
+								var fieldDesc = itemField.fieldDescription || itemField
+									.fieldName;
+								var fieldVals = properties[itemField.fieldName];
+				
+								//日期格式
+								if (itemField.fieldType === 1) {
+									let time = new Date(fieldVals).getTime();
+									fieldVals = formattingTime(time);
+								}
+				
+								if (fieldVals != null && fieldVals != "" && fieldVals !=
+									undefined) {
+									strHtml += "<tr>";
+									strHtml += "<td>" + fieldDesc + "</td>";
+									strHtml += "<td>" + fieldVals + "</td>";
+									strHtml += "</tr>";
+								}
+							}
+						});
+				
+						strHtml += "</tbody>";
+						strHtml += "</table>";
+				
+						let divb = document.getElementById('detailDiv')
+						divb.innerHTML = strHtml; //设置显示的数据，可以是标签．
+				
+					});
+				});
+			}
 
 		},
 		mounted() {}
@@ -130,49 +173,61 @@
 
 <style lang="scss">
 	.jt-queryResult {
+		position: relative;
+		width: 100%;
+		height: 100%;
 		overflow: hidden;
-
+		z-index: 100000;
+	
+		// overflow-y: hidden;
+		._right {
+			// overflow-y: hidden;
+		}
+	
 		//左侧树
 		&>div:nth-child(1) {
+			position: absolute;
+			left: 0;
+			top: 0;
 			width: 220rem;
 			height: 380rem;
 			float: left;
-			overflow: auto;
+			overflow: auto !important;
 			border-right: 5rem solid #ddd;
-
+	
 			.el-tree {
 				background: rgb(28 59 112 / 0%);
 				height: calc(100% - 2rem);
 				color: #fff;
 				--el-tree-node-hover-bg-color: #2a67c3;
 				--el-font-size-base: 14rem;
-
+	
 				.overflowtext {
 					width: auto !important;
 					padding: 0;
 				}
 			}
-
-
-
+	
+	
+	
 			.tree-line {
 				.el-tree-node {
 					position: relative;
 				}
-
+	
 				.el-tree-node__children {
 					padding-left: 16rem !important; // 缩进量
-
+	
 					.el-tree-node__content {
 						padding-left: 18rem !important;
 					}
 				}
-
+	
 				//高亮显示选中样式
 				.el-tree-node.is-current>.el-tree-node__content {
 					background: #2a67c3;
 				}
-
+	
 				// 竖线
 				.el-tree-node::before {
 					content: "";
@@ -184,12 +239,12 @@
 					border-width: 1rem;
 					border-left: 1rem dashed rgba(255, 255, 255, .8);
 				}
-
+	
 				// 当前层最后一个节点的竖线高度固定
 				.el-tree-node:last-child::before {
 					height: 38rem; // 可以自己调节到合适数值
 				}
-
+	
 				// 横线
 				.el-tree-node::after {
 					content: "";
@@ -201,20 +256,20 @@
 					border-width: 1rem;
 					border-top: 1rem dashed rgba(255, 255, 255, .8);
 				}
-
+	
 				// 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
 				&>.el-tree-node::after {
 					border-top: none;
 				}
-
+	
 				&>.el-tree-node::before {
 					border-left: none;
 				}
-
+	
 				// 展开关闭的icon
 				.el-tree-node__expand-icon {
 					font-size: 16rem;
-
+	
 					// 叶子节点（无子节点）
 					&.is-leaf {
 						color: transparent;
@@ -222,58 +277,64 @@
 					}
 				}
 			}
-
+	
 		}
-
+	
 		//右侧基本信息
 		&>div:nth-child(2) {
+			position: absolute;
+			left: 220rem;
+			top: 0;
 			width: calc(100% - 240rem);
 			height: calc(100% - 0rem);
 			float: left;
 			margin-left: 10rem;
 			font-size: 14rem;
 			padding-top: 5rem;
-
+			overflow: auto;
+	
 			table {
 				border-collapse: collapse;
 				margin: 0 auto;
 				text-align: center;
 				width: 100%;
+				height: 100%;
+				border-right: 2px solid rgb(221, 221, 221);
 			}
-
+	
 			table td,
 			table th {
 				// border: 1rem solid #ddd;
 				color: #fff;
 				height: 30rem;
 			}
-
+	
 			table thead th {
 				background-color: rgb(28 59 112 / 100%);
 				border: 2rem solid #ddd;
 			}
-
+	
 			table tr:nth-child(odd) {
 				background: rgb(40 89 172 / 60%);
 				border-left: 2rem solid #ddd;
 				border-right: 2rem solid #ddd;
 				border-bottom: 1rem solid #ddd;
 			}
-
+	
 			table tr:nth-child(even) {
 				background: rgb(28 59 112 / 60%);
 				border-left: 2rem solid #ddd;
 				border-right: 2rem solid #ddd;
 				border-bottom: 1rem solid #ddd;
 			}
-
+	
 			// thead 表头固定，tbody 滚动
 			table>thead>tr {
 				display: table;
 				width: 100%;
 				table-layout: fixed;
 			}
-
+	
 			table>tbody {
 				display: block;
 				height: 340rem;
@@ -282,7 +343,7 @@
 				/* 当垂直内容超出显示高度时以滚动条形式展示 */
 				overflow-y: auto;
 			}
-
+	
 			table>tbody>tr {
 				/* 将tr设置为table元素,以此达到内容沾满table的效果 */
 				display: table;
@@ -291,7 +352,7 @@
 				/* 设置table-layout为fixed以达到首行和内容行对其的效果 */
 				table-layout: fixed;
 			}
-
+	
 			table>tbody>tr>td {
 				border-right: 2rem solid #ddd;
 			}