Ver código fonte

初始化完善

DESKTOP-CRQ4N2U\jintian 2 anos atrás
pai
commit
5fd052f94e

+ 2 - 2
.env.development

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

+ 2 - 2
.env.production

@@ -5,9 +5,9 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13182/'
+VITE_API_URL = 'http://218.59.194.82:13292/'
 
-# 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
+# 后台管理地址: http://218.59.194.82:13280/
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 1 - 1
index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>金田CIM三维基础平台</title>
+		<title>烟台市自然资源三维立体一张图系统</title>
 		<style>
 			#app {
 				height: 100vh;

BIN
public/jt3dSDK/gltf/pyramid.glb


BIN
public/jt3dSDK/gltf/pyramidA.glb


BIN
public/jt3dSDK/gltf/pyramidAA.glb


BIN
public/jt3dSDK/gltf/pyramidB.glb


BIN
public/jt3dSDK/gltf/pyramidJ.glb


BIN
public/jt3dSDK/gltf/xin.glb


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
public/jt3dSDK/jt3d.es.js


BIN
src/assets/images/header/header-1.png


BIN
src/assets/images/header/header-1.webp


BIN
src/assets/images/login/login-title.png


BIN
src/assets/images/login/login-title.webp


+ 1 - 1
src/views/Login/Login.vue

@@ -167,7 +167,7 @@
 <style lang="scss" scoped>
 	$fontColor: #fff;
 	$fullsize: calc(100% - 0rem);
-	$header-title: url(@/assets/images/login/login-title.webp) 0rem no-repeat;
+	$header-title: url(@/assets/images/login/login-title.png) 0rem no-repeat;
 	$header-bg-color: linear-gradient(100deg,
 		rgb(16, 96, 210, 0.2) 30%,
 		rgb(16, 106, 250, 0.1) 70%);

+ 3 - 3
src/views/Main/components/header.vue

@@ -27,9 +27,9 @@
 				<el-menu-item index="0">
 					<router-link to="/home/Map3d">三维地图</router-link>
 				</el-menu-item>
-				<el-menu-item index="1">
+			<!-- 	<el-menu-item index="1">
 					<router-link to="/home/SysAdmin">系统管理</router-link>
-				</el-menu-item>
+				</el-menu-item> -->
 <!-- 				<el-menu-item index="2">
 					<router-link to="/home/table">数据维护</router-link>
 				</el-menu-item>
@@ -137,7 +137,7 @@
 	$fontColor: #fff;
 	$fullsize: calc(100% - 0rem);
 	$header-title-bg: url(@/assets/images/header/header-title-bg.png) 0rem no-repeat;
-	$header-title: url(@/assets/images/header/header-1.webp) 0rem no-repeat;
+	$header-title: url(@/assets/images/header/header-1.png) 0rem no-repeat;
 	$header-bg: url(@/assets/images/header/header-bg.png) 0rem no-repeat;
 	$header-bg-color: linear-gradient(100deg,
 		rgb(16, 96, 210) 30%,

+ 17 - 15
src/views/Map3d/Map3DMain.vue

@@ -116,7 +116,7 @@
 
 			<!-- 空间分析组件 -->
 			<jt-popup title="空间分析" ref="refAnalysisSpace">
-				<analysisSpace />
+				<analysisSpace ref="_refAnalysisSpace"/>
 			</jt-popup>
 
 			<!-- 剖面分析结果组件 -->
@@ -136,7 +136,7 @@
 
 			<!-- 坐标定位拾取组件 -->
 			<jt-popup title="坐标定位拾取" ref="refCoordsTool">
-				<coordsTool />
+				<coordsTool ref="_refCoordsTool"/>
 			</jt-popup>
 
 			<!-- 地形分析组件 -->
@@ -164,8 +164,8 @@
 				<layer ref="refLayer"/>
 			</jt-popup>
 
-			<!--图上绘组件-->
-			<jt-popup title="图上绘" ref="refDialogEdit">
+			<!--图上绘组件-->
+			<jt-popup title="图上绘" ref="refDialogEdit">
 				<dialogEdit />
 			</jt-popup>
 
@@ -186,7 +186,6 @@
 	import * as echarts from "echarts";
 	let store = undefined
 	let jt3d = undefined;
-	let tipEntity = undefined;
 
 	export default {
 		name: "Map3DMain",
@@ -200,6 +199,7 @@
 				mapLoaded: false,
 				showbasicLayer: false, //控制地图组件显示隐藏
 				ChartTestData: {}, //剖面分析结果chart
+				tipEntity:undefined
 			}
 		},
 
@@ -274,11 +274,11 @@
 			 * 关闭剖面分析结果
 			 */
 			closeDrawerSectionAnalysis() {
-				this.$refs.refDrawerSectionAnalysis.drawerVisible = true;
+				this.$refs.refDrawerSectionAnalysis.drawerVisible = false;
 
-				if (tipEntity) {
-					window.viewer.entities.remove(tipEntity);
-					tipEntity = undefined;
+				if (this.tipEntity) {
+					window.viewer.entities.remove(this.tipEntity);
+					this.tipEntity = undefined;
 				}
 				jt3d.SpatialAnalysis.Profile.removeProfileAnalysis();
 				jt3d.DrawTools.Clear();
@@ -291,9 +291,11 @@
 			 * 构建剖面分析结果chart
 			 */
 			initEchartsData(sectionAnalysisData) {
-				if (tipEntity) {
-					window.viewer.entities.remove(tipEntity);
-					tipEntity = undefined;
+				let _self=this;
+				
+				if (this.tipEntity) {
+					window.viewer.entities.remove(this.tipEntity);
+					this.tipEntity = undefined;
 				}
 				// jt3d.SpatialAnalysis.Profile.removeProfileAnalysis();
 
@@ -325,8 +327,8 @@
 								tipData = params["data"].coord;
 							}
 
-							if (!tipEntity) {
-								tipEntity = window.viewer.entities.add({
+							if (!_self.tipEntity) {
+								_self.tipEntity = window.viewer.entities.add({
 									position: Cesium.Cartesian3.fromDegrees(xy[0], xy[1], Number(tipData[1])),
 									billboard: {
 										image: 'jt3dSDK/imgs/point/point.png',
@@ -338,7 +340,7 @@
 									},
 								});
 							} else {
-								tipEntity.position = Cesium.Cartesian3.fromDegrees(xy[0], xy[1], Number(tipData[1]));
+								_self.tipEntity.position = Cesium.Cartesian3.fromDegrees(xy[0], xy[1], Number(tipData[1]));
 							}
 
 							//定位到点

+ 13 - 10
src/views/Map3d/components/analysis-space.vue

@@ -26,7 +26,7 @@
 					<el-button color="rgb(255 100 100)" @click="SunShine('remove')"><span style="color: #fff;">移除光照分析</span></el-button>
 				</div>
 			</el-collapse-item>
-			<el-collapse-item name="方量分析">
+			<!-- <el-collapse-item name="方量分析">
 				<template #title>
 					<i class='iconfont icon-svgfangliangfenxi' />方量分析
 				</template>
@@ -61,7 +61,7 @@
 						</el-form-item>
 					</el-form>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> -->
 			<el-collapse-item name="剖面分析">
 				<template #title>
 					<i class='iconfont icon-svgpoumianfenxi' />剖面分析
@@ -84,7 +84,7 @@
 					<el-button color="rgb(20 136 255)" @click="SightLine('activate')">添加通视分析</el-button>
 					<el-button color="rgb(255 100 100)" @click="SightLine('deactivate')"><span style="color: #fff;">清除通视分析</span></el-button>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> 
 			<el-collapse-item name="视域分析">
 				<template #title>
 					<i class='iconfont icon-svgshiyufenxi' />视域分析
@@ -97,7 +97,7 @@
 					<el-button color="rgb(255 100 100)" @click="ViewShed('deactivate')"><span style="color: #fff;">清除视域</span></el-button>
 				</div>
 			</el-collapse-item>
-			<el-collapse-item name="限高分析">
+			<!-- <el-collapse-item name="限高分析">
 				<template #title>
 					<i class='iconfont icon-svgxiangaofenxi' />限高分析
 				</template>
@@ -118,8 +118,8 @@
 						<el-button color="rgb(255 100 100)" @click="HeightLimit('deactivate')"><span style="color: #fff;">清除限高分析</span></el-button>
 					</div>
 				</div>
-			</el-collapse-item>
-			<el-collapse-item name="剖切展示">
+			</el-collapse-item> -->
+			<!-- <el-collapse-item name="剖切展示">
 				<template #title>
 					<i class='iconfont icon-svgpouqiezhanshi' />剖切展示
 				</template>
@@ -129,7 +129,7 @@
 					</div>
 					<el-button color="rgb(20 136 255)" @click="Cutting('activate')">添加剖切多边形</el-button>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> -->
 			<!-- <el-collapse-item name="视频融合">
 				<template #title>
 					<i class='iconfont icon-svgshipinronghe' />视频融合
@@ -187,12 +187,15 @@
 				let _self = this;
 				switch (type) {
 					case "start":
-						jt3d.statusBar.show = false;
+						if (jt3d.statusBar.show) {
+							jt3d.statusBar.show = false;
+						}
 						jt3d.SpatialAnalysis.SunshineShadow.start();
-
 						break;
 					case "remove":
-						jt3d.statusBar.show = true;
+						if (!jt3d.statusBar.show) {
+							jt3d.statusBar.show = true;
+						}
 						jt3d.SpatialAnalysis.SunshineShadow.remove();
 						break;
 				}

+ 11 - 1
src/views/Map3d/components/basicLayer.vue

@@ -61,6 +61,12 @@
 				layerID: '', //底图切换唯一ID
 				layerList: [], //图层列表
 
+				baseMapData: {
+					url: "https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+					minimumLevel: 1,
+					maximumLevel: 18
+				},
+
 				//地形数据
 				terrainData: {
 					isterrain: false, //是否切换地形
@@ -140,6 +146,8 @@
 				}).then(res => {
 					let options = {
 						url: url, //服务地址
+						minimumLevel: this.baseMapData.minimumLevel,
+						maximumLevel: this.baseMapData.maximumLevel
 					};
 					if (url.indexOf("map.geoq.cn") != -1) {
 						options.CRS = "WGS84";
@@ -197,7 +205,7 @@
 						if (item.parameterset instanceof Object) {
 							parameterset = item.parameterset;
 						} else if (item.parameterset != "" && item.parameterset != null && item.parameterset != undefined) {
-							
+
 							parameterset = JSON.parse(item.parameterset);
 						}
 
@@ -226,6 +234,8 @@
 							//设置参数
 							let options = {
 								url: item.datasource, //服务地址
+								minimumLevel: _self.baseMapData.minimumLevel,
+								maximumLevel: _self.baseMapData.maximumLevel
 							};
 							if (item.datasource.indexOf("map.geoq.cn") != -1) {
 								options.CRS = "WGS84";

+ 10 - 87
src/views/Map3d/components/drawEdit.vue

@@ -57,16 +57,7 @@
 				</el-col>
 			</el-row>
 		</div>
-		<div v-show="value=='点标绘类'">
-			<el-row :gutter="20" style="margin-left: 0rem; margin-right: 0rem">
-				<el-col v-for="(item,index) in point" :span="8" @click="createDrawPoint(item.drawType,index)">
-					<el-avatar shape="circle" :size="70" :class="currentIndex===index?'selectStyle':'defaultStyle'">
-						<i :class="[item.icon,currentIndex===index?'selectFontStyle':'']" />
-					</el-avatar>
-					<div style="margin-top: 5rem; font-size: 14rem;" :class="currentIndex===index?'selectFontStyle':''">{{item.label}}</div>
-				</el-col>
-			</el-row>
-		</div>
+
 	</div>
 </template>
 
@@ -82,9 +73,6 @@
 				currentIndex: -1,
 				value: "二维平面类",
 				options: [{
-						value: '点标绘类',
-						label: '点标绘类',
-					}, {
 						value: '二维平面类',
 						label: '二维平面类',
 					},
@@ -208,43 +196,7 @@
 						number: 3,
 						icon: 'iconfont icon-qianji'
 					}
-				],
-				point: [{
-						label: '小模型',
-						drawType: 'model',
-						number: 1,
-						icon: 'iconfont icon-jihedi'
-					}, {
-						label: '文字',
-						drawType: 'label',
-						number: 2,
-						icon: 'iconfont icon-jihedi'
-					},
-					{
-						label: '点',
-						drawType: 'point',
-						number: 3,
-						icon: 'iconfont icon-jihedi'
-					},
-					{
-						label: '点及文字',
-						drawType: 'point2Label',
-						number: 4,
-						icon: 'iconfont icon-jihedi'
-					},
-					{
-						label: '广告牌',
-						drawType: 'billboard',
-						number: 5,
-						icon: 'iconfont icon-jihedi'
-					},
-					{
-						label: '广告牌及文字',
-						drawType: 'billboard2Label',
-						number: 6,
-						icon: 'iconfont icon-jihedi'
-					}
-				],
+				]
 			}
 		},
 
@@ -252,10 +204,8 @@
 		methods: {
 			//清除全部
 			removeAll() {
-				jt3d.DrawToolsEdit.Clear();
-				jt3d.DrawMilitaryPlot.clearAll();
-				jt3d.DrawPointEdit.clearAll();
-
+				jt3d.DrawToolsEdit.Clear()
+				jt3d.DrawMilitaryPlot.clearAll()
 				this.currentIndex = -1;
 
 				//还原左键单击事件
@@ -290,7 +240,6 @@
 					}
 				});
 			},
-
 			//创建二维标会和三维标会
 			createGraphics(type, index) {
 				let _self = this;
@@ -313,30 +262,6 @@
 						console.log('错误原因', message)
 					}
 				});
-			},
-
-			//创建点类标绘
-			createDrawPoint(type, index) {
-				let _self = this;
-				this.currentIndex = index;
-
-				//移除左键单击事件
-				if (jt3d.handlerLeftClick) {
-					jt3d.handlerLeftClick.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
-				}
-
-				/* 创建监听 */
-				jt3d.DrawPointEdit.onEditProperty = {};
-				// 开始绘制
-				jt3d.DrawPointEdit.draw(type, {
-					isEdit: true,
-					onComplete(cPoint, gPoint) {
-
-					},
-					onError(message) {
-						console.log('错误原因', message)
-					}
-				});
 			}
 
 		},
@@ -347,13 +272,12 @@
 </script>
 
 <style lang="scss" scoped>
-	.el-avatar {
+	.el-avatar{
 		width: 70rem !important;
 		height: 70rem !important;
 		font-size: 14px !important;
 		cursor: pointer;
 	}
-
 	// .el-popper{
 	// 	padding: 5rem 11rem;
 	// 	font-size: 12rem;
@@ -364,19 +288,18 @@
 	// 	left: 15rem !important;
 	// 	top: 175rem !important;
 	// }
-
-	::v-deep .el-scrollbar {
+	
+	::v-deep .el-scrollbar{
 		background-color: gainsboro !important;
 	}
-
-	.el-select-dropdown__item {
+	.el-select-dropdown__item{
 		color: #409eff !important;
 		padding: 0 32rem 0 20rem;
 		height: 34rem;
 		line-height: 34rem;
-		font-size: 14rem;
+		font-size:14rem;
 	}
-
+	
 	.jt-drawTool {
 		--el-avatar-size: 70rem !important;
 

+ 8 - 9
src/views/Map3d/components/map.vue

@@ -119,13 +119,13 @@
 			 * 添加镇街边界线——精灵线
 			 */
 			addBoundaryLine(jt3d) {
-				jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
-					width: 5,
-					color: '#04FFFF',
-					isImageAlpha: true, //用图片自带颜色
-					duration: 3000,
-					imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
-				});
+				// jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
+				// 	width: 5,
+				// 	color: '#04FFFF',
+				// 	isImageAlpha: true, //用图片自带颜色
+				// 	duration: 3000,
+				// 	imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
+				// });
 			},
 
 			/**
@@ -199,7 +199,6 @@
 					iconType: 'blue',
 				});
 				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
-				jt3d.DrawPointEdit = new this.jt3dSDK.DrawPoint(jt3d._viewer);
 
 				jt3d.LocateUtil = new this.jt3dSDK.LocateUtil(jt3d._viewer);
 
@@ -271,7 +270,7 @@
 					pitch: -90,
 					range: 115000
 				};
-
+				
 				let optionsE = {
 					west: 121.563298,
 					south: 37.284514,

+ 7 - 6
src/views/Map3d/components/measure.vue

@@ -46,6 +46,7 @@
 		data() {
 			return {
 				currentIndex: -1,
+				popup:undefined,
 				measure: [{
 						label: '长度测量(贴地)',
 						type: 'measureLength',
@@ -138,8 +139,8 @@
 			pickUp() {
 				let _self = this;
 
-				if (popup) {
-					popup.close();
+				if (this.popup) {
+					this.popup.close();
 				}
 
 				jt3d.SketchViewModel.sketchTools('point', {
@@ -158,8 +159,8 @@
 								z: Number(gPoint.height)
 							}
 
-							// popup = new  _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], position, "位置信息", html,40);
-							popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, -30);
+							// _self.popup = new  _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], position, "位置信息", html,40);
+							_self.popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, -30);
 						}
 					},
 					onError(message) {
@@ -174,8 +175,8 @@
 			clearMeasurementData() {
 				this.currentIndex = -1;
 				jt3d.CommonTools.clear();
-				if (popup) {
-					popup.close();
+				if (this.popup) {
+					this.popup.close();
 				}
 
 				//还原左键单击事件

+ 52 - 15
src/views/Map3d/components/toolbars.vue

@@ -32,12 +32,12 @@
 				测试动态线
 			</span>
 		</div> -->
-		<div class="toolbar-item" @click="showWidget('rotateCamera')">
+		<!-- <div class="toolbar-item" @click="showWidget('rotateCamera')">
 			<i class="iconfont icon-chaxunzuobiaozhi" />
 			<span class="title">
 				绕点旋转
 			</span>
-		</div>
+		</div> -->
 		<div class="toolbar-item" @click="showWidget('fullMap')">
 			<i class="iconfont icon-chaxunzuobiaozhi" />
 			<span class="title">
@@ -56,6 +56,12 @@
 				图层
 			</span>
 		</div>
+		<div class="toolbar-item" @click="showWidget('viewerlabel')">
+			<i class="iconfont minsize icon-fushi"></i>
+			<span class="title">
+				视角标签
+			</span>
+		</div>
 		<el-dropdown class="toolbar-item" :hide-on-click="false" @command="handleCommand">
 			<span class="el-dropdown-link">
 				<i class="iconfont icon-xitong1" />
@@ -69,27 +75,27 @@
 			<template #dropdown>
 				<span slot="slot" class="text"></span>
 				<el-dropdown-menu>
-					<el-dropdown-item command="DialogEdit"><i class="iconfont minsize icon-dituhuizhi"></i>图上标绘</el-dropdown-item>
-					<el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item>
-					<el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item>
+					<el-dropdown-item command="DialogEdit"><i class="iconfont minsize icon-dituhuizhi"></i>绘制功能</el-dropdown-item>
+					<!-- <el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item> -->
 					<el-dropdown-item v-if="store.userport=='PC'" command="printmap"><i class="iconfont maxsize icon-svgdayin"></i>打印地图</el-dropdown-item>
 					<el-dropdown-item command="measure"><i class="iconfont minsize icon-icon_measureTool"></i>图上量算</el-dropdown-item>
-					<el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item>
-					<el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item>
+					<!-- <el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item> -->
 					<el-dropdown-item command="analysis-space"><i class="iconfont icon-duodiankeshiyu"></i>空间分析</el-dropdown-item>
-					<el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item>
+					<!-- <el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item> -->
 					<el-dropdown-item command="special-effects"><i class="iconfont icon-yu"></i>特效效果</el-dropdown-item>
 					<el-dropdown-item command="coordsTool"><i class="iconfont icon-zuobiao"></i>坐标定位</el-dropdown-item>
-					<el-dropdown-item command="TrackRoam"><i class="iconfont maxsize icon-jurassic_jiankong"></i>路径漫游</el-dropdown-item>
+					<!-- 	<el-dropdown-item command="TrackRoam"><i class="iconfont maxsize icon-jurassic_jiankong"></i>路径漫游</el-dropdown-item>
 					<el-dropdown-item command="ImageLayerSplit"><i class="iconfont maxsize icon-juanlian"></i>卷帘对比</el-dropdown-item>
-					<el-dropdown-item command="ViewerSplitScreen"><i class="iconfont minsize icon-fenping"></i>分屏对比</el-dropdown-item>
+					<el-dropdown-item command="ViewerSplitScreen"><i class="iconfont minsize icon-fenping"></i>分屏对比</el-dropdown-item> -->
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
 		<div class="toolbar-item" @click="showWidget('clearAll')">
 			<i class="iconfont minsize icon-shanchu"></i>
 			<span class="title">
-				清除所有
+				清除
 			</span>
 		</div>
 	</div>
@@ -213,11 +219,42 @@
 				} else if (type == "viewerlabel") {
 					this.closePopup()
 					this.$parent.$refs.refviewerlabel.isshow = true
-				} else if (type == "clearAll") {//清除所有
-					jt3d.CommonTools.clear();
+				} else if (type == "clearAll") { //清除所有
+
 					jt3d.DrawToolsEdit.Clear();
 					jt3d.DrawMilitaryPlot.clearAll();
-				}else {
+
+					//清除测量
+					jt3d.CommonTools.clear();
+					this.$parent.$refs._refMeasure.currentIndex = -1;
+					if (this.$parent.$refs._refMeasure.popup) {
+						this.$parent.$refs._refMeasure.popup.close();
+					}
+
+					//移除光照分析
+					if (!jt3d.statusBar.show) {
+						jt3d.statusBar.show = true;
+					}
+					jt3d.SpatialAnalysis.SunshineShadow.remove();
+
+					//移除剖面分析结果
+					this.$parent.closeDrawerSectionAnalysis();
+
+					//清除坐标定位
+					this.$parent.$refs._refCoordsTool.empty();
+
+					//清除空间分析
+					this.$parent.$refs._refAnalysisSpace.init();
+					
+					//清除地形分析
+					this.$parent.$refs._refAnalysisTerrain.init();
+
+					//还原左键单击事件
+					this.$parent.$refs.refMap3d.clickEntity(jt3d);
+					
+					/* 开启地形检测 必须开启 否则会导致获取地形高度时异常 导致鼠标移动时位置哆嗦 */
+					jt3d._viewer.scene.globe.depthTestAgainstTerrain = true;
+				} else {
 					this.closePopup()
 					this.$parent.showbasicLayer = true
 				}
@@ -359,7 +396,7 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		width: 580rem;
+		width: 560rem;
 		right: 20rem;
 		cursor: pointer !important;
 		padding: 0rem !important;

+ 1 - 1
src/views/SysAdmin/SysAdmin.vue

@@ -3,7 +3,7 @@
 
 <template>
 	<view class="main">
-		<iframe src="http://218.59.194.82:13190/sdjt-admin/" scrolling="auto" frameborder="0" class="trend-container2" id="iframe"></iframe>
+		<iframe src="http://218.59.194.82:13280/" scrolling="auto" frameborder="0" class="trend-container2" id="iframe"></iframe>
 		<!-- <jt-popup :height="height" :title="title">
 			<h1>测试插槽</h1>
 		</jt-popup> -->

+ 1 - 1
vite.config.js

@@ -19,7 +19,7 @@ export default defineConfig({
 	// 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上,例如 https://www.ruoyi.vip/。
 	// 如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
 	// base: './',
-	base: process.env.NODE_ENV === 'production' ? './' : '/sdjt/',
+	base: process.env.NODE_ENV === 'production' ? './' : './',
 
 	resolve: {
 		alias: {

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff