Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Table/components/dsnl.vue

@@ -10,27 +10,27 @@
 					<!-- <span style="color: rgb(200, 250, 255);margin-left: -73rem;">耕地质量</span> -->
 					<div class="shape2">
 						<img src="@/assets/images/dengji1.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;color: rgb(200, 250, 255);">23063</span>
+						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">23063</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 					<div class="shape3">
 						<img src="@/assets/images/dengji2.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;color: rgb(200, 250, 255);">53150</span>
+						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">53150</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 					<div class="shape4">
 						<img src="@/assets/images/dengji3.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;color: rgb(200, 250, 255);">75005</span>
+						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">75005</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 					<div class="shape4">
 						<img src="@/assets/images/dengji4.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;color: rgb(200, 250, 255);">21247</span>
+						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">21247</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 					<div class="shape4">
 						<img src="@/assets/images/dengji5.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 600;font-size: 20rem;color: rgb(200, 250, 255);">3764</span>
+						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">3764</span>
 						<span style="font-size: 10rem;margin-left: 9rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 				</div>
@@ -39,15 +39,15 @@
 		<el-col :span="12">
 			<div class="main2">
 				<div class="shape">
-					<span style="color: rgb(200, 250, 255);margin-left: -73rem;font-size: 25rem;">提升面积</span>
+					<span style="color: rgb(200, 250, 255);margin-left: -73rem;font-size: 25rem;font-weight: 300;">提升面积</span>
 					<div class="shape5">
-						<span style="font-weight: 600;font-size: 30rem;margin-left: -55rem;color: rgb(200, 250, 255);">53</span>
+						<span style="font-weight: 400;font-size: 30rem;margin-left: -55rem;color: rgb(200, 250, 255);">53</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 						<span style="font-size: 10rem;color: rgb(200, 250, 255);">(比上一年)</span>
 					</div>
 					<div class="shape6">
-					<div style="color: rgb(200, 250, 255);margin-left: -73rem;font-size: 25rem;margin-bottom: 6rem;">土地价格</div>
-					<span style="font-weight: 600;font-size: 30rem;margin-left: -48rem;color: rgb(200, 250, 255);">826</span>
+					<div style="color: rgb(200, 250, 255);margin-left: -73rem;font-size: 25rem;margin-bottom: 6rem;font-weight: 300;">土地价格</div>
+					<span style="font-weight: 400;font-size: 30rem;margin-left: -48rem;color: rgb(200, 250, 255);">826</span>
 					<span style="font-size: 10rem;color: rgb(200, 250, 255);">元</span>
 					<span style="font-size: 10rem;color: rgb(200, 250, 255);">(增长15%)</span>
 				</div>

src/views/Table/components/spdgc.vue

@@ -6,29 +6,30 @@
 	<el-row> <el-col :span="13">
 			<div class="main">
 				<div class="shape">
-					<span style="font-size: 20rem;font-weight: 600;color: rgb(200, 250, 255);">变电设施&nbsp;&nbsp;</span>
-					<span style="font-size: 28rem;font-weight: 700;color: rgb(200, 250, 255);;">26</span>
-					<span style="font-weight: 600;color: rgb(200, 250, 255);">套</span>
+					<span style="font-size: 20rem;font-weight: 300;color: rgb(200, 250, 255);">变电设施&nbsp;&nbsp;</span>
+					<span style="font-size: 28rem;font-weight: 400;color: rgb(200, 250, 255);;">26</span>
+					<span style="font-weight: 300;color: rgb(200, 250, 255);">套</span>
 					<div class="shape2">
-						<span style="font-size: 20rem;font-weight: 600;color: rgb(200, 250, 255);">配电设施&nbsp;&nbsp;</span>
-						<span style="font-size: 28rem;font-weight: 700;color: rgb(200, 250, 255);">37</span>
-						<span style="font-weight: 600;color: rgb(200, 250, 255);">套</span>
+						<span style="font-size: 20rem;font-weight: 300;color: rgb(200, 250, 255);">配电设施&nbsp;&nbsp;</span>
+						<span style="font-size: 28rem;font-weight: 400;color: rgb(200, 250, 255);">37</span>
+						<span style="font-weight: 300;color: rgb(200, 250, 255);">套</span>
 					</div>
 					<div class="shape3">
-						<span style="font-size: 20rem;margin-left: 6rem;font-weight: 600;color: rgb(200, 250, 255);">高压线路&nbsp;&nbsp;</span>
-						<span style="font-size: 28rem;font-weight: 700;color: rgb(200, 250, 255);">73</span>
-						<span style="font-weight: 600;color: rgb(200, 250, 255);">km</span>
+						<span style="font-size: 20rem;margin-left: 6rem;font-weight: 300;color: rgb(200, 250, 255);">高压线路&nbsp;&nbsp;</span>
+						<span style="font-size: 28rem;font-weight: 400;color: rgb(200, 250, 255);">73</span>
+						<span style="font-weight: 300;color: rgb(200, 250, 255);">km</span>
 					</div>
 					<div class="shape4">
-						<span style="font-size: 20rem;margin-left: 18rem;font-weight: 600;color: rgb(200, 250, 255);">低压线路&nbsp;&nbsp;</span>
-						<span style="font-size: 28rem;font-weight: 700;color: rgb(200, 250, 255);">120</span>
-						<span style="font-weight: 600;color: rgb(200, 250, 255);">km</span>
+						<span style="font-size: 20rem;margin-left: 18rem;font-weight: 300;color: rgb(200, 250, 255);">低压线路&nbsp;&nbsp;</span>
+						<span style="font-size: 28rem;font-weight: 400;color: rgb(200, 250, 255);">120</span>
+						<span style="font-weight: 300;color: rgb(200, 250, 255);">km</span>
 					</div>
 				</div>
 			</div>
 		</el-col> <el-col :span="11">
-			<div style="margin-top: 60rem;"><img src="@/assets/images/jgqpdl.png"/></div>
-			<div style="font-size: 19rem;font-weight: 600;margin-top: 5rem;color: rgb(200, 250, 255);">井灌区配电率</div>
+		    <el-row><el-col :span='24' style="margin-top: 38rem;font-size: 25rem;font-weight: 400;color: rgb(200, 250, 255);">100%</el-col></el-row>
+			<el-row><el-col :span='24' style="margin-top: -26rem;"><img src="@/assets/images/tongda.png"/></el-col></el-row>
+			<el-row><el-col :span='24' style="margin-top: -13rem;font-size: 20rem;font-weight: 300;color: rgb(200, 250, 255);">井灌区配电率</el-col></el-row>
 		</el-col> </el-row>
 	
 </template>
@@ -63,7 +64,7 @@
 		margin-top: 25rem;
 
 		.shape {
-			margin-top: 6rem;
+			margin-top: -10rem;
 
 			.shape2 {
 				margin-top: 10rem;

src/views/Table/components/zksb.vue

@@ -13,7 +13,7 @@
 			<div class="title">灌溉设备</div>
 		</div>
 		<div class="shape">
-			<div class="number">0</div>
+			<div class="number">3</div>
 			<div class="title">环境监测</div>
 		</div>
 		<div class="shape">
@@ -62,17 +62,17 @@
 	.number{
 		// color: rgba(29,191,205,1);
 		color: rgb(200, 250, 255);
-		font-weight: 700;
+		font-weight: 400;
 		margin-top: 11rem;
 		font-size: 25rem;
 		margin-left: -8rem;
 	}
 	.title{
 		color: rgb(200, 250, 255);
-		font-size: 18rem;
-		font-weight: 700;
+		font-size: 15rem;
+		font-weight: 300;
 		// text-shadow: 0 0 2rem 2rem rgba(29,191,205,1);
-		margin-top: 4rem;
+		margin-top: 8rem;
 		margin-left: -9rem;
 	}
 	

src/views/test/components/cqjcyj.vue

@@ -6,7 +6,7 @@
 <template>
 	<!-- <img src="@/assets/images/haichong1.png"/> -->
 	<div class="turntop">
-		<el-carousel :interval="4000" type="card" height="200rem" arrow="never">
+		<el-carousel :interval="4000" type="card" height="200rem" arrow="never" style="overflow: hidden;">
 			<el-carousel-item v-for="(item,index) in imgList" :key="index">
 				<el-image :src='item.imgUrl'></el-image>
 			</el-carousel-item>

src/views/test/components/cqzrqs.vue

@@ -151,11 +151,11 @@
 									y2: 1,
 									colorStops: [{
 											offset: 0,
-											color: "rgba(0, 151, 251, 1)" // 0% 处的颜色
+											color: "rgba(85, 255, 0, 1.0)" // 0% 处的颜色
 										},
 										{
 											offset: 1,
-											color: "rgba(0, 34, 66, 0.2)" // 100% 处的颜色
+											color: "rgba(85, 170, 255, 0.2)" // 100% 处的颜色
 										}
 									],
 									globalCoord: false // 缺省为 false
@@ -185,11 +185,11 @@
 									y2: 1,
 									colorStops: [{
 											offset: 0,
-											color: "rgba(48, 236, 166, 1)" // 0% 处的颜色
+											color: "rgba(255, 255, 0, 1.0)" // 0% 处的颜色
 										},
 										{
 											offset: 1,
-											color: "rgba(0, 34, 66, 0.2)" // 100% 处的颜色
+											color: "rgba(255, 85, 255, 0.2)" // 100% 处的颜色
 										}
 									],
 									globalCoord: false // 缺省为 false