no message

.env.development

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

.env.production

@@ -8,7 +8,7 @@ VITE_APP_ENV = 'production'
 # VITE_API_URL = 'http://218.59.194.82:13292/'
 
 # 烟台服务器
-VITE_API_URL = 'http://10.7.100.3:8092/'
+ VITE_API_URL = 'http://10.7.100.3:8092/'
 
 # 后台管理地址: http://218.59.194.82:13280/
 

src/store/index.ts

@@ -20,7 +20,8 @@ export const Store = defineStore({
 			layerID:'',//控制唯一底图加载id
 			markID:'',//控制标注id
 			keepAlives:['Map3DMain'],//控制加载缓存页面
-			userport:''
+			userport:'',
+			Layerlist:[],//存储所有图层
 		}
 	},
 	getters:{

src/views/Login/Login.vue

@@ -128,7 +128,6 @@
 					}
 
 					console.log('用户运行环境',store.userport)
-
 					//跳转到Main3D页面			
 					this.$router.replace({
 						path: '/home'

src/views/Main/MainView.vue

@@ -35,8 +35,9 @@
 			},
 		},
 		mounted() {
-
-		}
+			
+		},
+		
 	}
 </script>
 

src/views/Main/components/header.vue

@@ -112,6 +112,24 @@
 
 			//退出登录事件
 			logout() {
+				let roleId = store.roleId
+				let atlasLayersSqlWhere = '"roleId"' + " = " + roleId 
+				console.log('window对象',window)
+				this.$http.get('/getTableList', {
+					tableName: 'sys_map_atlas_layers', //表名
+					sqlWhere: atlasLayersSqlWhere, //查询条件
+					orderByField: '' //排序字段
+				}).then(res => {
+					res.data.forEach(res=>{
+						if(res.layerorder && res.layercode){
+							let id = 'service_' + res.layercode + res.layerorder;
+							window[id] = undefined
+							delete window[id]
+						}
+					})
+				})
+				
+				
 				this.$router.replace({
 					path: '/login'
 				});

src/views/Map3d/components/drawEdit.vue

@@ -22,10 +22,12 @@
 <template>
 	<div class="jt-drawTool">
 		<div style="margin-bottom: 0rem;">
-			<el-select class="selectInfo" v-model="value" @change="handleClick" placeholder="请选择" style="width: 65%; margin-bottom: 10rem;margin-right: 10rem;">
+			<el-select class="selectInfo" v-model="value" @change="handleClick" placeholder="请选择"
+				style="width: 65%; margin-bottom: 10rem;margin-right: 10rem;">
 				<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
 			</el-select>
-			<el-button type="danger" :icon="Delete" style="margin-top: 8rem;width: 30%;" @click="removeAll()">清除</el-button>
+			<el-button type="danger" :icon="Delete" style="margin-top: 8rem;width: 30%;" @click="removeAll()">清除
+			</el-button>
 		</div>
 		<div v-show="value=='二维平面类'">
 			<el-row :gutter="20" style="margin-left: 0rem; margin-right: 0rem">
@@ -33,7 +35,8 @@
 					<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>
+					<div style="margin-top: 5rem; font-size: 14rem;" :class="currentIndex===index?'selectFontStyle':''">
+						{{item.label}}</div>
 				</el-col>
 			</el-row>
 		</div>
@@ -43,17 +46,20 @@
 					<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>
+					<div style="margin-top: 5rem; font-size: 14rem;" :class="currentIndex===index?'selectFontStyle':''">
+						{{item.label}}</div>
 				</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 militaryPlotting" :span="8" @click="createMilitaryPlot(item.drawType,index)">
+				<el-col v-for="(item,index) in militaryPlotting" :span="8"
+					@click="createMilitaryPlot(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>
+					<div style="margin-top: 5rem; font-size: 14rem;" :class="currentIndex===index?'selectFontStyle':''">
+						{{item.label}}</div>
 				</el-col>
 			</el-row>
 		</div>
@@ -180,22 +186,22 @@
 				],
 				militaryPlotting: [{
 						label: '直线箭头',
-						drawType: 'straightArrow',
+						drawType: 'DrawStraightArrow',
 						number: 1,
 						icon: 'iconfont icon-zhijiantou'
 					},
 					{
 						label: '攻击箭头',
-						drawType: 'attackArrow',
+						drawType: 'DrawAttackArrow',
 						number: 2,
 						icon: 'iconfont icon-tujifangxiang'
 					},
 					{
 						label: '钳击箭头',
-						drawType: 'pincerArrow',
+						drawType: 'DrawPincerArrow',
 						number: 3,
 						icon: 'iconfont icon-qianji'
-					}
+					},
 				]
 			}
 		},
@@ -229,16 +235,19 @@
 				if (jt3d.handlerLeftClick) {
 					jt3d.handlerLeftClick.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
 				}
-
 				/* 创建监听 */
 				jt3d.DrawMilitaryPlot.onEditProperty = {};
 				// 开始绘制
-				jt3d.DrawMilitaryPlot.draw(type, {
-					onComplete(cPoint, gPoint) {
-						// _self.$parent.$parent.param = param;
-						// _self.$parent.$parent.showDialog = true;
-					}
-				});
+				jt3d.DrawMilitaryPlot.drawActivate(type);
+				/* 创建监听 */
+				// jt3d.DrawMilitaryPlot.onEditProperty = {};
+				// // 开始绘制
+				// jt3d.DrawMilitaryPlot.draw(type, {
+				// 	onComplete(cPoint, gPoint) {
+				// 		// _self.$parent.$parent.param = param;
+				// 		// _self.$parent.$parent.showDialog = true;
+				// 	}
+				// });
 			},
 			//创建二维标会和三维标会
 			createGraphics(type, index) {
@@ -272,12 +281,13 @@
 </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;
@@ -288,18 +298,19 @@
 	// 	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;
 

src/views/Map3d/components/layer.vue

@@ -972,6 +972,7 @@
 				sqlWhere: atlasLayersSqlWhere, //查询条件
 				orderByField: '' //排序字段
 			}).then(res => {
+				// store.Layerlist = res.data
 				console.log('所有图层', res)
 				//初始图层列表
 				this.inittree = res.data

src/views/Map3d/components/map.vue

@@ -58,7 +58,9 @@
 									// pixelOffset: new Cesium.Cartesian2(0, billboard.pixelOffset),
 									disableDepthTestDistance: Number.POSITIVE_INFINITY,
 									scale: 1,
-									scaleByDistance: new Cesium.NearFarScalar(1.5e2, 1, 2400, 0) //按距离缩放，即距离大于180米时，图标不显示  Cesium.NearFarScalar(near, nearValue, far, farValue)相机范围的下界。相机范围下界的值。相机范围的上限。该值位于摄像机范围的上界。
+									scaleByDistance: new Cesium.NearFarScalar(1.5e2, 1,
+											2400, 0
+											) //按距离缩放，即距离大于180米时，图标不显示  Cesium.NearFarScalar(near, nearValue, far, farValue)相机范围的下界。相机范围下界的值。相机范围的上限。该值位于摄像机范围的上界。
 								}
 							});
 							jt3d._viewer.entities.add(that.entity, {
@@ -198,7 +200,11 @@
 					isRetainDrawPoint: true, //绘制完成是否保留绘制点
 					iconType: 'blue',
 				});
-				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
+				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+					viewer: jt3d._viewer,
+					Cesium: Cesium,
+				});
+				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
 
 				jt3d.LocateUtil = new this.jt3dSDK.LocateUtil(jt3d._viewer);
 

src/views/Map3d/components/measure.vue

@@ -160,7 +160,7 @@
 							}
 
 							// _self.popup = new  _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], position, "位置信息", html,40);
-							_self.popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, -30);
+							_self.popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, 30);
 						}
 					},
 					onError(message) {