Merge branch 'ZHNY_DCF' into ZHNY_WW

src/router/index.js

@@ -110,6 +110,8 @@ router.beforeEach((to, from, next) => {
 	}
 });
 
+
+
 // 路由加载后(全局路由后置守卫)
 router.afterEach(() => {
 	NProgress.done();

src/views/Login/Login.vue

@@ -264,7 +264,7 @@
 		width: calc(100% - 0rem);
 		height: 70rem;
 		line-height: 70rem;
-		background: url(@/assets/images/login/login-title.png) 0rem no-repeat, linear-gradient(100deg, rgba(16, 96, 210, .2) 30%, rgba(16, 106, 250, .1) 70%);
+		background: url(@/assets/images/login/login-title1.png) 0rem no-repeat, linear-gradient(100deg, rgba(16, 96, 210, .2) 30%, rgba(16, 106, 250, .1) 70%);
 		background-size: 510rem 70rem, 100% 70rem;
 		background-repeat: no-repeat;
 		user-select: none;

src/views/Main/MainView.vue

@@ -1,16 +1,20 @@
 <script setup>
+	import {
+		defineAsyncComponent
+	} from 'vue';
 	import JtHeader from './components/header.vue';
 	import modifyModule from './components/modifyPassword.vue';
 	import ZhHeader from "./components/ZhHeader.vue";
 	import map3d from './components/map.vue';
-	import basicLayer from './components/basicLayer.vue';
+	// import basicLayer from './components/basicLayer.vue';
+	const layer = defineAsyncComponent(() => import('./components/layer.vue'));
+	const basicLayer = defineAsyncComponent(() => import('./components/basicLayer.vue'));
 	import {
 		provide
 	} from "vue";
 	provide("getMapInstance", () => {
 		return jt3d;
 	});
-	
 </script>
 <template>
 	<div class="Mainpage">
@@ -18,20 +22,29 @@
 		<!-- <JtHeader @handleSelect="handleSelect" /> -->
 		<ZhHeader></ZhHeader>
 		<map3d @onload="jtMap3DOnload" ref="refMap3d" class="map3d" />
-		<!-- 底图组件 -->
-		<basicLayer v-if="mapLoaded" style="display: none;" ref="basicLayers"></basicLayer>
-		<!-- 控制路由页面是否缓存 -->
-		<router-view v-slot="{ Component }" v-if="mapLoaded">
-			<keep-alive>
-				<component :is=" Component" v-if="$route.meta.keepAlive" />
-			</keep-alive>
-			<component :is="Component" v-if="!$route.meta.keepAlive" />
-		</router-view>
+		
+		<template v-if="mapLoaded">
+			<!-- 底图组件 -->
+			<basicLayer  style="display: none;" ref="basicLayers"></basicLayer>
+			
+			<!-- 图层列表 -->
+			<layer></layer>
+			
+			<!-- 控制路由页面是否缓存 -->
+			<router-view v-slot="{ Component }">
+				<keep-alive>
+					<component :is=" Component" v-if="$route.meta.keepAlive" />
+				</keep-alive>
+				<component :is="Component" v-if="!$route.meta.keepAlive" />
+			</router-view>
+			
+		</template>
+		
 		
 		<!-- 修改密码 -->
 		<!-- <modifyModule ref="modifyMoudle"></modifyModule> -->
 	</div>
-	
+
 </template>
 
 <script>
@@ -46,7 +59,7 @@
 		/* 数据 */
 		data() {
 			return {
-				mapLoaded:false,//保证地图加载完成，在加载子路由
+				mapLoaded: false, //保证地图加载完成，在加载子路由
 			}
 		},
 
@@ -59,24 +72,34 @@
 			jtMap3DOnload(map) {
 				jt3d = map;
 				this.mapLoaded = true;
-				console.log('地图实例',jt3d)
+				console.log('地图实例', jt3d)
 				store.jt3d = jt3d
 			},
 		},
 		mounted() {
 
-		}
+		},
+		beforeUnmount () {
+			console.log('重新设置一张图！！！')
+			localStorage.setItem("currenttab", "YzTtitle");
+		},
+		// beforeRouteLeave(to, from, next) {
+		// 	console.log(123)
+		// 	this.$unmounted();
+		// 	next();
+		// }
 	}
 </script>
 
 <style lang="scss" scoped>
-	.Mainpage{
+	.Mainpage {
 		position: relative;
 		top: 0;
 		width: 100%;
 		height: 100%;
 	}
-	.map3d{
+
+	.map3d {
 		z-index: 5;
 	}
 </style>

src/views/Main/components/ZhHeader.vue

@@ -2,17 +2,17 @@
 </script>
 <template>
 	<!-- 标题logo-->
-	
+
 	<div class="header">
-		
+
 		<router-link to="/home/Map3d">
 			<div :class="[ggTitle?'GgTitle':'GgXzTitle']" @click="slideTitle('GgTitle')"></div>
 		</router-link>
-		
+
 		<router-link to="/home/table">
 			<div :class="[yztTitle?'YztTitle':'YztXzTitle']" @click="slideTitle('YztTitle')"></div>
 		</router-link>
-		
+
 		<router-link to="/home/test">
 			<div :class="[sqTitle?'SqTitle':'SqXzTitle']" @click="slideTitle('SqTitle')"></div>
 		</router-link>
@@ -89,7 +89,8 @@
 		created() {
 			let val = localStorage.currenttab
 			this.slideTitle(val)
-		}
+		},
+		
 	}
 </script>
 

src/views/Map3d/components/layer.vue → src/views/Main/components/layer.vue

@@ -523,7 +523,7 @@
 						case "UrlTemplateImageryProvider": //加载URL模板服务
 							if (checked) {
 								data.isinit = '1';
-
+								
 								//设置参数
 								let _options = {
 									id: _serviceId,
@@ -541,7 +541,7 @@
 										_options.maximumLevel = parameterset.maximumLevel;
 									}
 								}
-
+								console.log('加载图层',jt3d)
 								//加载服务
 								jt3d.layer.addUrlTemplateImagery(_options, function(serviceId) {
 
@@ -549,6 +549,7 @@
 									_self.setLayerNumber(serviceId)
 								});
 							} else {
+								console.log('移除图层')
 								jt3d.layer.removeImageryProvider({
 									serviceId: _serviceId
 								}).then(res => {
@@ -842,7 +843,7 @@
 
 			//获取地图图集id
 			let roleId = store.roleId
-			atlasLayersSqlWhere = '"roleId"' + " = " + roleId + " and " + '"atlasType"' + "='图层'"
+			atlasLayersSqlWhere = '"roleId"' + " = " + 2 + " and " + '"atlasType"' + "='图层'"
 
 			//Promise回调
 			function init(data) {
@@ -883,7 +884,6 @@
 				this.inittree = res.data
 				init(res.data).then(item => {
 					console.log('图层控制树列表', _this.treeData)
-
 					//复选框初始化选中
 					_this.$nextTick(() => {
 						_this.$refs.treeRef.setCheckedKeys(_this.checkedkeys, true);

src/views/test/components/cqjcyj.vue

@@ -13,11 +13,11 @@
 		</el-carousel>
 	</div>
 	<div class="main">
-		<div>设备名称:13号地1区太阳能测报灯</div>
-		<div>检测区域:13号地东区</div>
-		<div>识别数量:7</div>
-		<div>识别种类:5</div>
-		<div>采集时间:2023年4月24日17:07:45</div>
+		<div>设备名称：13号地1区太阳能测报灯</div>
+		<div>检测区域：13号地东区</div>
+		<div>识别数量：7</div>
+		<div>识别种类：5</div>
+		<div>采集时间：2023年4月24日17:07:45</div>
 	</div>
 </template>