linux完善中

src/views/Map3d/Map3DMain.vue

@@ -87,9 +87,9 @@
 
 			<!-- 关键字查询组件 -->
 			<!-- <queryKeyword ref="queryword" /> -->
-			
+
 			<!-- 比例尺、指南针 -->
-			<navigation/>
+			<navigation ref="refNavigation"/>
 
 			<!-- 视角标签 -->
 			<jt-popup title="视角标签" ref="refviewerlabel">
@@ -160,8 +160,8 @@
 			</jt-popup>
 
 			<!-- 图层控jt-popup制组件 -->
-			<jt-popup title="图层控制" ref="refLayer">
-				<layer />
+			<jt-popup title="图层控制" ref="refLayerPopup">
+				<layer ref="refLayer"/>
 			</jt-popup>
 
 			<!--图上绘制组件-->
@@ -329,7 +329,7 @@
 								tipEntity = window.viewer.entities.add({
 									position: Cesium.Cartesian3.fromDegrees(xy[0], xy[1], Number(tipData[1])),
 									billboard: {
-										image: '/jt3dSDK/imgs/point/point.png',
+										image: 'jt3dSDK/imgs/point/point.png',
 										horizontalOrigin: Cesium.HorizontalOrigin.center,
 										verticalOrigin: Cesium.VerticalOrigin.bottom,
 										scale: 1,

src/views/Map3d/components/ImageLayerSplit.vue

@@ -290,6 +290,10 @@
 					default:
 						break;
 				}
+
+				//图层定位
+				this.$parent.$parent.$refs.refLayer.mark = "service";
+				this.$parent.$parent.$refs.refLayer.setLayersLocation(jt3d, data);
 			},
 			/**
 			 * 
@@ -545,6 +549,10 @@
 					default:
 						break;
 				}
+
+				//图层定位
+				this.$parent.$parent.$refs.refLayer.mark = "service";
+				this.$parent.$parent.$refs.refLayer.setLayersLocation(jt3d, data);
 			},
 
 			/**
@@ -700,7 +708,7 @@
 			//Promise回调
 			function init() {
 				return new Promise((resolve, reject) => {
-					_self.initData.forEach((res,index) => {
+					_self.initData.forEach((res, index) => {
 						let num = Number(res.layerorder)
 						if (num < 10) {
 							res.layerorder = '0' + res.layerorder
@@ -709,10 +717,17 @@
 						res.value = res;
 						res.label = res.layername;
 
-						if (index == 0) {
+						// if (index == 0) {
+						// 	_self.leftValue = res;
+						// }
+						// if (index == 1) {
+						// 	_self.rightValue = res;
+						// }
+
+						if (res.layername === "4120-485") {
 							_self.leftValue = res;
 						}
-						if (index == 1) {
+						if (res.layername === "4120-490") {
 							_self.rightValue = res;
 						}
 
@@ -731,7 +746,9 @@
 			}).then(res => {
 				//初始图层列表
 				this.initData = res.data
-				init().then(item => {})
+				init().then(item => {
+
+				})
 			})
 		},
 
@@ -762,8 +779,9 @@
 			float: left;
 			margin-left: 10rem;
 		}
-		.el-tree{
-			width:300rem !important;
+
+		.el-tree {
+			width: 300rem !important;
 		}
 
 		// .el-popper.is-light,

src/views/Map3d/components/map.vue

@@ -124,7 +124,7 @@
 					color: '#04FFFF',
 					isImageAlpha: true, //用图片自带颜色
 					duration: 3000,
-					imgUrl: "/jt3dSDK/imgs/polylinematerial/spriteline1.png"
+					imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
 				});
 			},
 

src/views/Map3d/components/toolbars.vue

@@ -87,8 +87,8 @@
 					<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="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>
@@ -156,7 +156,7 @@
 							width: 11,
 							color: 'RED',
 							duration: 20000,
-							imgUrl: "/jt3dSDK/imgs/polylinematerial/LinkPulse.png",
+							imgUrl: "jt3dSDK/imgs/polylinematerial/LinkPulse.png",
 							isImageAlpha: false,
 						});
 						a1.then(function() {
@@ -172,7 +172,7 @@
 							count: 5,
 							direction: "horizontal",
 							order: "+",
-							imgUrl: "/jt3dSDK/imgs/polylinematerial/arrowopacity.png",
+							imgUrl: "jt3dSDK/imgs/polylinematerial/arrowopacity.png",
 							isImageAlpha: false,
 						});
 					}
@@ -185,7 +185,7 @@
 							count: 20,
 							direction: "horizontal",
 							order: "+",
-							imgUrl: "/jt3dSDK/imgs/polylinematerial/arrowopacity.png",
+							imgUrl: "jt3dSDK/imgs/polylinematerial/arrowopacity.png",
 							isImageAlpha: false,
 						});
 					}
@@ -195,7 +195,7 @@
 							width: 10,
 							color: 'GREEN',
 							duration: 10000,
-							imgUrl: "/jt3dSDK/imgs/polylinematerial/20201124170520929.png",
+							imgUrl: "jt3dSDK/imgs/polylinematerial/20201124170520929.png",
 							isImageAlpha: false,
 						});
 					}
@@ -205,7 +205,7 @@
 			showWidget: function(type) {
 				if (type === "layers") {
 					this.closePopup()
-					this.$parent.$refs.refLayer.isshow = true;
+					this.$parent.$refs.refLayerPopup.isshow = true;
 				} else if (type === "fullMap") {
 					this.$parent.$refs.refMap3d.fullMap(jt3d);
 				} else if (type === "rotateCamera") {
@@ -247,7 +247,7 @@
 				this.$parent.$refs.refprintmap.isshow = false;
 				this.$parent.$refs.refDialogEdit.isshow = false;
 				this.$parent.showbasicLayer = false;
-				this.$parent.$refs.refLayer.isshow = false;
+				this.$parent.$refs.refLayerPopup.isshow = false;
 				if (this.$parent.$refs._refImageLayerSplit) {
 					this.$parent.$refs._refImageLayerSplit.removeSplitLayer(); //关闭卷帘
 				}
@@ -333,7 +333,7 @@
 				if (command === 'ViewerSplitScreen') {
 					this.closePopup();
 					this.$parent.$refs.refViewerSplitScreen.isshow = true;
-					this.$parent.$refs.refLayer.isshow = true;
+					this.$parent.$refs.refLayerPopup.isshow = true;
 					this.$parent.$refs._refViewerSplitScreen.initSplitScreen(); //开启分屏
 				}
 			},

vite.config.js

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