初始化

.env.development

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

.env.production

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

src/views/Main/components/header.vue

@@ -27,10 +27,10 @@
 				<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 index="2">
+				</el-menu-item>
+				<!-- 				<el-menu-item index="2">
 					<router-link to="/home/table">数据维护</router-link>
 				</el-menu-item>
 				<el-menu-item index="3">

src/views/Map3d/Map3DMain.vue

@@ -29,7 +29,7 @@
 	const navigation = defineAsyncComponent(() => import('./components/navigation.vue'));
 
 	import map3d from './components/map.vue';
-	import queryKeyword from './components/query-keyword.vue';
+	// import queryKeyword from './components/query-keyword.vue';
 	import toolbars from './components/toolbars.vue';
 	import layer from './components/layer.vue';
 	import measure from './components/measure.vue';
@@ -86,7 +86,7 @@
 			</jt-popup>
 
 			<!-- 关键字查询组件 -->
-			<queryKeyword ref="queryword" />
+			<!-- <queryKeyword ref="queryword" /> -->
 
 			<!-- 比例尺、指南针 -->
 			<navigation ref="refNavigation"/>
@@ -116,7 +116,7 @@
 
 			<!-- 空间分析组件 -->
 			<jt-popup title="空间分析" ref="refAnalysisSpace">
-				<analysisSpace ref="_refAnalysisSpace"/>
+				<analysisSpace />
 			</jt-popup>
 
 			<!-- 剖面分析结果组件 -->
@@ -136,7 +136,7 @@
 
 			<!-- 坐标定位拾取组件 -->
 			<jt-popup title="坐标定位拾取" ref="refCoordsTool">
-				<coordsTool ref="_refCoordsTool"/>
+				<coordsTool />
 			</jt-popup>
 
 			<!-- 地形分析组件 -->
@@ -199,7 +199,7 @@
 				mapLoaded: false,
 				showbasicLayer: false, //控制地图组件显示隐藏
 				ChartTestData: {}, //剖面分析结果chart
-				tipEntity:undefined
+				tipEntity :undefined
 			}
 		},
 
@@ -277,7 +277,7 @@
 				this.$refs.refDrawerSectionAnalysis.drawerVisible = false;
 
 				if (this.tipEntity) {
-					window.viewer.entities.remove(this.tipEntity);
+					jt3d._viewer.entities.remove(this.tipEntity);
 					this.tipEntity = undefined;
 				}
 				jt3d.SpatialAnalysis.Profile.removeProfileAnalysis();
@@ -293,9 +293,9 @@
 			initEchartsData(sectionAnalysisData) {
 				let _self=this;
 				
-				if (this.tipEntity) {
-					window.viewer.entities.remove(this.tipEntity);
-					this.tipEntity = undefined;
+				if (jt3d.tipEntity) {
+					jt3d._viewer.entities.remove(jt3d.tipEntity);
+					jt3d.tipEntity = undefined;
 				}
 				// jt3d.SpatialAnalysis.Profile.removeProfileAnalysis();
 

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,15 +187,12 @@
 				let _self = this;
 				switch (type) {
 					case "start":
-						if (jt3d.statusBar.show) {
-							jt3d.statusBar.show = false;
-						}
+						jt3d.statusBar.show = false;
 						jt3d.SpatialAnalysis.SunshineShadow.start();
+
 						break;
 					case "remove":
-						if (!jt3d.statusBar.show) {
-							jt3d.statusBar.show = true;
-						}
+						jt3d.statusBar.show = true;
 						jt3d.SpatialAnalysis.SunshineShadow.remove();
 						break;
 				}

src/views/Map3d/components/basicLayer.vue

@@ -72,8 +72,6 @@
 					isterrain: false, //是否切换地形
 					terrainUrl: "http://202.102.167.52:16381/crdata/dem", //地形地址
 					terrainExaggeration: 1, //地形夸张系数
-					requestVertexNormals: true, //请求地形照明数据
-					requestWaterMask: false, //请求水体效果所需要的海岸线数据
 				},
 
 				//标注数据
@@ -172,8 +170,6 @@
 				jt3d.layer.addTerrain({
 					url: this.terrainData.terrainUrl,
 					terrainExaggeration: this.terrainData.terrainExaggeration,
-					requestVertexNormals:this.terrainData.requestVertexNormals,
-					requestWaterMask:this.terrainData.requestWaterMask,
 				})
 			},
 

src/views/Map3d/components/map.vue

@@ -270,7 +270,7 @@
 					pitch: -90,
 					range: 315000
 				};
-
+				
 				let optionsE = {
 					west: 118.69586,
 					south: 35.91360,

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,12 +56,6 @@
 				图层
 			</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" />
@@ -77,18 +71,18 @@
 				<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="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="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="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="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-menu>
 			</template>
 		</el-dropdown>
@@ -219,42 +213,41 @@
 				} else if (type == "viewerlabel") {
 					this.closePopup()
 					this.$parent.$refs.refviewerlabel.isshow = true
-				} else if (type == "clearAll") { //清除所有
-
+				} else if (type == "clearAll") {//清除所有
 					jt3d.DrawToolsEdit.Clear();
 					jt3d.DrawMilitaryPlot.clearAll();
-
+					
 					//清除测量
 					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 {
+				}else {
 					this.closePopup()
 					this.$parent.showbasicLayer = true
 				}
@@ -396,7 +389,7 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		width: 560rem;
+		width: 540rem;
 		right: 20rem;
 		cursor: pointer !important;
 		padding: 0rem !important;

src/views/SysAdmin/SysAdmin.vue

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

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' ? './' : './',
+	base: process.env.NODE_ENV === 'production' ? './' : '/sdyt/',
 
 	resolve: {
 		alias: {