Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Table/components/dsnl.vue

@@ -114,7 +114,7 @@
 		align-items: center;
 		flex-direction: row;
 		// color: rgba(29,191,205,1);
-		margin-left: 10rem;
+		margin-left: 30rem;
 		margin-top: 20rem;
 	
 		.shape {

src/views/test/components/cqjcyj.vue

@@ -69,8 +69,8 @@
 	.main {
 		margin: 0 15rem;
 		color: rgb(200, 250, 255);
-		font-weight: 700;
-		font-size: 17rem;
+		font-weight: 500;
+		font-size: 16rem;
 		text-align: left;
 	}
 </style>