Merge branch 'ZHNY_DCF' into ZHNY_LHR

src/App.vue

@@ -11,7 +11,7 @@
 
 <style lang="scss">
 	.lk-status-bar{
-		z-index: 11;
+		z-index: 15;
 	}
 	// .lk-status-bar{
 	// 	font-size:16rem !important;

src/components/jt-popup/jt-popup2.vue

@@ -144,10 +144,11 @@
 	.popup-main {
 		position: absolute;
 		left: 10rem;
-		top: 90rem;
+		top: 105rem;
+		margin-top: 15rem;
 		// height: 490rem;
 
-		height: calc((100% - 115rem) / 3);
+		height: calc((100% - 145rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		z-index: 11;
@@ -211,7 +212,7 @@
 
 		//滚动条一直显示
 		.middle {
-			height: calc(100% - 81rem);
+			height: calc(100% - 50rem);
 			width: 100%;
 			overflow-y: auto;
 			padding: 15rem 0 0 0;

src/components/jt-popup/jt-popup3.vue

@@ -144,17 +144,18 @@
 	.popup-main {
 		position: absolute;
 		right: 10rem;
-		top: 90rem;
+		top: 105rem;
+		margin-top: 15rem;
 		// height: 490rem;
 
-		height: calc((100% - 115rem) / 3);
+		height: calc((100% - 145rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		z-index: 11;
 		font-size: 16rem;
 		color: white;
 		user-select: none;
-		animation-name: slide-left;
+		animation-name: slide-right;
 		animation-duration: .8s;
 		// background-color: rgba(5, 45, 115, 0.7) !important;
 
@@ -211,7 +212,7 @@
 
 		//滚动条一直显示
 		.middle {
-			height: calc(100% - 81rem);
+			height: calc(100% - 50rem);
 			width: 100%;
 			overflow-y: auto;
 			padding: 15rem 0 0 0;
@@ -294,10 +295,10 @@
 	// 	animation-duration: .8s;
 	// }
 
-	@keyframes slide-left {
+	@keyframes slide-right {
 		0% {
 			opacity: 0;
-			transform: translateX(-100%)
+			transform: translateX(100%)
 		}
 
 		100% {

src/views/Map3d/components/ggsbtj.vue

@@ -1,132 +0,0 @@
-<script setup>
-	import {
-		inject
-	} from "vue";
-	import html2canvas from 'html2canvas';
-	import {
-		blobToBase64,
-		base64ToBlob
-	} from '@/assets/js/blobtobase64';
-	const getMapInstance = inject("getMapInstance");
-	jt3d = getMapInstance();
-</script>
-
-<template>
-	
-</template>
-
-<script>
-	let jt3d = undefined;
-	export default {
-		data() {
-			return {
-				// viewersName: '', //视角标签名称
-				// ImgurlList: [], //截图地址列表
-			}
-		},
-		methods: {
-			
-		},
-
-		mounted() {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.mainview {
-		width: 100%;
-		height: 100%;
-
-		.header {
-			width: 100%;
-			display: flex;
-
-			input,
-			input:focus {
-				outline: none;
-				width: 185rem !important;
-				border: 1rem solid rgba(255, 255, 255, 0.8);
-				margin-right: 10rem;
-				height: 26rem !important;
-				color: rgba(255, 255, 255, 1);
-				background-color: rgba(255, 255, 255, 0) !important;
-				border-radius: 3rem;
-			}
-		}
-
-		.middleviewer {
-			width: 265rem;
-			height: 100%;
-			margin-left: 7rem;
-
-			.viewer {
-				width: 265rem !important;
-				height: 196rem !important;
-				margin-top: 15rem;
-				border: 1rem solid #ffffff !important;
-				border-radius: 1rem !important;
-
-				.viewertop {
-					width: 265rem !important;
-					height: 166rem !important;
-
-					img {
-						width: 100% !important;
-						height: 100% !important;
-					}
-				}
-
-				.viewerbottom {
-					line-height: 30rem !important;
-					text-align: center !important;
-					width: 265rem !important;
-					height: 30rem !important;
-					position: relative;
-					background-color: rgba(15, 145, 185, 0.7);
-
-					.deleteImg {
-						width: 24rem;
-						height: 24rem;
-						right: 5rem;
-						top: 3rem;
-						position: absolute;
-					}
-				}
-			}
-		}
-	}
-
-	::v-deep .el-input {
-		flex-grow: 0 !important;
-		width: 200rem !important;
-		// display: inline !important;
-		// margin-left: 5rem;
-		margin-right: 10rem;
-		height: 30rem !important;
-	}
-
-	//输入框文字颜色
-	::v-deep .el-input__inner {
-		color: rgba(255, 255, 255, 1)
-	}
-
-	//输入框背景色
-	::v-deep .el-input__wrapper {
-		background-color: rgba(255, 255, 255, 0) !important;
-	}
-
-	::v-deep .el-button {
-		border-radius: 3rem !important;
-
-	}
-
-	::v-deep .el-button--primary {
-		background-color: rgba(64, 158, 255, 0.6) !important;
-	}
-
-	::-webkit-scrollbar {
-		width: 0rem;
-	}
-</style>

src/views/Map3d/components/weather.vue

@@ -1,74 +1,78 @@
 <template>
-   <div class="box">
-	    <p class="boxCity">{{weatcherData.city}}市</p>
-		 <p class="boxWeather">{{weatcherData.wea}}<br> 
-		 <div class="boxTemperature">
-			 {{weatcherData.tem}}°
-		 </div>
-		 </p>
-	  
-     
-    <!--  <p class="boxWind">{{weatcherData.win}}{{weatcherData.win_speed}}</p> -->
-     
-   </div>
+	<div class="box">
+		<p class="boxCity">{{weatcherData.city}}市</p>
+		<p class="boxWeather">{{weatcherData.wea}}<br>
+		<label class="boxTemperature">
+			{{weatcherData.tem}}°
+		</label>
+		</p>
+
+
+		<!--  <p class="boxWind">{{weatcherData.win}}{{weatcherData.win_speed}}</p> -->
+
+	</div>
 </template>
 
 <script>
-import axios from 'axios'
-export default {
-   data(){
-      return{
-         weatcherData:{}
-      }
-   },
-   mounted() {
-      this.getWeather();
-      this.timer = setInterval(() => {
-         this.getWeather();
-      }, 1000 * 60 * 60)	//每小时调用一次	
-   },
-   methods: {
-      getWeather() { // 第三方天气api接口
-         axios.get('https://yiketianqi.com/free/day', {
-            params: {
-               unescape: "1",
-               appid: '66192398',
-               appsecret: 'cqIyJ5ZP',
-               // version: 'v91'
-            }
-         }).then(res => {
-            console.log(res.data);
-            if (res.data) {
-               this.weatcherData = res.data;
-            }
-         }).catch(err => {
-            console.log(err)
-         })
-      }
-   }
-}
+	import axios from 'axios'
+	export default {
+		data() {
+			return {
+				weatcherData: {}
+			}
+		},
+		mounted() {
+			this.getWeather();
+			this.timer = setInterval(() => {
+				this.getWeather();
+			}, 1000 * 60 * 60) //每小时调用一次	
+		},
+		methods: {
+			getWeather() { // 第三方天气api接口
+				axios.get('https://yiketianqi.com/free/day', {
+					params: {
+						unescape: "1",
+						appid: '66192398',
+						appsecret: 'cqIyJ5ZP',
+						// version: 'v91'
+					}
+				}).then(res => {
+					console.log('555', res.data);
+					if (res.data) {
+						this.weatcherData = res.data;
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			}
+		}
+	}
 </script>
 
 <style scoped>
-.box{
-   display: flex;
-   align-items: center;
-   color: #fff;
-   margin-right: 20rem;
-}
-.boxTemperature{
-   font-size: 18rem;
-}
-.boxWeather{
-   font-size: 14rem;
-   margin: 0 0 0 15rem;
-}
-.boxWind{
-   margin: 0 15rem 0 8rem;
-   font-size: 14rem;
-   
-}
-.boxCity{
-   font-size: 16rem;
-}
+	.box {
+		display: flex;
+		align-items: center;
+		color: #fff;
+		margin-right: 20rem;
+	}
+
+	.boxTemperature {
+		font-size: 18rem;
+	}
+
+	.boxWeather {
+		font-size: 14rem;
+		margin: 0 0 0 15rem;
+	}
+
+	.boxWind {
+		margin: 0 15rem 0 8rem;
+		font-size: 14rem;
+
+	}
+
+	.boxCity {
+		font-size: 16rem;
+	}
 </style>