DESKTOP-GBVU60Q\dell 2 жил өмнө
parent
commit
056d13c04a

+ 4 - 3
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;

+ 4 - 3
src/components/jt-popup/jt-popup3.vue

@@ -144,10 +144,11 @@
 	.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;
@@ -211,7 +212,7 @@
 
 		//滚动条一直显示
 		.middle {
-			height: calc(100% - 81rem);
+			height: calc(100% - 50rem);
 			width: 100%;
 			overflow-y: auto;
 			padding: 15rem 0 0 0;

+ 70 - 66
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>