DESKTOP-GBVU60Q\dell 2 år sedan
förälder
incheckning
8a94498168

+ 11 - 0
src/views/Map3d/components/DataTime.vue

@@ -37,12 +37,23 @@
 </script>
 
 <style scoped>
+	@charset "UTF-8";
+	
+	@font-face {
+		font-family: "TTTGB-Medium";
+		src: url("@/assets/fonts/fonts/TTTGB-Medium.ttf") format("truetype"),
+			url("@/assets/fonts/fonts/TTTGB-Medium.eot") format("embedded-opentype"),
+			url("@/assets/fonts/fonts/TTTGB-Medium.svg") format("svg");
+		font-weight: normal;
+		font-style: normal;
+	}
 	.box {
 		height: 100%;
 		width: 100%;
 		color: #fff;
 		display: flex;
 		align-items: center;
+		font-family: "TTTGB-Medium", sans-serif !important;
 	}
 
 	.boxDay {

+ 18 - 4
src/views/Map3d/components/weather.vue

@@ -2,9 +2,9 @@
 	<div class="box">
 		<p class="boxCity">{{weatcherData.city}}</p>
 		<p class="boxWeather">{{weatcherData.weather}}<br>
-		<label class="boxTemperature">
-			{{weatcherData.temperature_float}}°
-		</label>
+			<label class="boxTemperature">
+				{{weatcherData.temperature_float}}°
+			</label>
 		</p>
 
 
@@ -37,7 +37,7 @@
 						// version: 'v91'
 					}
 				}).then(res => {
-					
+
 					if (res.data.lives) {
 						this.weatcherData = res.data.lives[0];
 					}
@@ -50,6 +50,17 @@
 </script>
 
 <style scoped>
+	@charset "UTF-8";
+	
+	@font-face {
+		font-family: "TTTGB-Medium";
+		src: url("@/assets/fonts/fonts/TTTGB-Medium.ttf") format("truetype"),
+			url("@/assets/fonts/fonts/TTTGB-Medium.eot") format("embedded-opentype"),
+			url("@/assets/fonts/fonts/TTTGB-Medium.svg") format("svg");
+		font-weight: normal;
+		font-style: normal;
+	}
+	
 	.box {
 		display: flex;
 		align-items: center;
@@ -63,16 +74,19 @@
 
 	.boxWeather {
 		font-size: 14rem;
+		font-family: "TTTGB-Medium", sans-serif !important;
 		margin: 0 0 0 15rem;
 	}
 
 	.boxWind {
 		margin: 0 15rem 0 8rem;
+		font-family: "TTTGB-Medium", sans-serif !important;
 		font-size: 14rem;
 
 	}
 
 	.boxCity {
+		font-family: "TTTGB-Medium", sans-serif !important;
 		font-size: 16rem;
 	}
 </style>

+ 1 - 1
src/views/test/components/cqjcyj.vue

@@ -42,7 +42,7 @@
 </script>
 <style scoped>
 	.turntop {
-		margin: 10rem 15rem;
+		margin: 10rem 15rem 0 15rem;
 	}
 
 	.el-carousel::-webkit-scrollbar {