Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Table/components/dsnl.vue

@@ -9,27 +9,27 @@
 				<div class="shape">
 					<span style="color: rgba(29,191,205,1);margin-left: -73rem;">耕地质量</span>
 					<div class="shape2">
-						<span style="background-color: red;">一等</span>
+						<span style="background-color: red;color: black;">一等</span>
 						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;">23063</span>
 						<span style="font-size: 10rem;">公顷</span>
 					</div>
 					<div class="shape3">
-						<span style="background-color: orangered">二等</span>
+						<span style="background-color: orangered;color: black;">二等</span>
 						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;">53150</span>
 						<span style="font-size: 10rem;">公顷</span>
 					</div>
 					<div class="shape4">
-						<span style="background-color: yellow;">三等</span>
+						<span style="background-color: yellow;color: black;">三等</span>
 						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;">75005</span>
 						<span style="font-size: 10rem;">公顷</span>
 					</div>
 					<div class="shape4">
-						<span style="background-color: green;">四等</span>
+						<span style="background-color: green;;color: black;">四等</span>
 						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;">21247</span>
 						<span style="font-size: 10rem;">公顷</span>
 					</div>
 					<div class="shape4">
-						<span style="background-color: skyblue;">五等</span>
+						<span style="background-color: skyblue;;color: black;">五等</span>
 						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;">3764</span>
 						<span style="font-size: 10rem;margin-left: 9rem;">公顷</span>
 					</div>

src/views/Table/components/zksb.vue

@@ -62,29 +62,32 @@
 	.number{
 		color: rgba(29,191,205,1);
 		font-weight: 700;
-		margin-top: 15rem;
+		margin-top: 11rem;
 		font-size: 25rem;
+		margin-left: -8rem;
 	}
 	.title{
 		// color: rgba(29,191,205,1);
-		font-size: 13rem;
-		font-weight: 600;
+		font-size: 18rem;
+		font-weight: 700;
 		// text-shadow: 0 0 2rem 2rem rgba(29,191,205,1);
-		margin-top: 11rem;
-		margin-left: 3rem;
+		margin-top: 4rem;
+		margin-left: -9rem;
 	}
 	
 	.main{
-		width:100%;
+		width:90%;
 		height:97%;
 		display:flex;
+		margin-left: 25rem;
+		margin-top: 2rem;
 		flex:2;
 		flex-wrap: wrap;
 		justify-content: space-around;
 		align-items: center;
 		.shape{
 			background:url('@/assets/images/sbbjt.png') no-repeat;
-			background-size:100% 100%;
+			background-size:90% 80%;
 			width: 100rem;
 			height: 56rem;